Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #214

Merged
merged 90 commits into from
Jun 15, 2023
Merged

Dev #214

merged 90 commits into from
Jun 15, 2023

Conversation

cvhammond
Copy link
Member

No description provided.

MarlenyVega and others added 30 commits May 15, 2023 18:24
@MarlenyVega
Added metabolic cost calculation
0118772
@MarlenyVega
Added ability to include metabolic cost as a cost term
c9025c6
@SpencerTWilliams
Fix preprocessing file manipulation
d4c5e75
@SpencerTWilliams
Account for extra EMG columns in MTP, "_moment" suffix in ID
d02741f
@SpencerTWilliams
Fix saving MTP results to .osimx
572c04f
@cvhammond
changed cost term format
d080cb7
@cvhammond
fixed TO inputs cost term
4716dd0
@cvhammond
fixed cost term inputs
9a5673d
@cvhammond
changed cost terms
5e7ccab
@cvhammond
added user_defined cost term
adcbcf6
@SpencerTWilliams
Make parsing MTP results in NCP optional, fix updating values from pr…
aa5c3cd 
…ecal
@cvhammond
implement initial user_defined
f84bc6e
@SpencerTWilliams
Save optimized max isometric stress from MTP, account for turning off…
fc539fa 
… some design variables in saving
@SpencerTWilliams
Fix length scale factors, max isometric force importing from MTP
8ef0b1f
@SpencerTWilliams
Fix NCP with no MTP results, save NCP precal to osimx
9996bd3
@SpencerTWilliams
Save GCP kinematics with correct column names, start implementing app…
e198e08 
…ending to osimx
@cvhammond
separated design variable parts in xml
9b8585b
@SpencerTWilliams
Fix prepareGCPInputs arguments
2c79282
@cvhammond
added manual scaling
bb87ca0
@SpencerTWilliams
Update GCP osimx
c11debe
@cvhammond
consolidated report fn
76f9878
@cvhammond
consolidated tool input generation
786b58b
@cvhammond
consolidated values struct creation
93f7ad0
@cvhammond
update DO integrand calc
f7c4b4f
@cvhammond
moved cost terms to separate fn
e0ffc57
@cvhammond
Merge branch 'consolidateTreatmentOptimizationTools' into ExpansionCo…
461c4e6 
…stTerms
@cvhammond
Merge pull request #195 from rcnl-org/ExpansionCostTerms
67ac1c3 
Bring metabolic cost to updated treatment optimization
@cvhammond
merged metabolic cost in
2649f6f
@SpencerTWilliams
Fix saving contact surface to osimx when a surface already exists in …
c6c678f 
…file
@cvhammond
fix small no-arg issues
17e35c6
MarlenyVega and others added 29 commits June 5, 2023 12:16
@MarlenyVega
Fixed minor syntax errors
3660531
@MarlenyVega
Updated integrand calculation
03d4af7
@SpencerTWilliams
Merge pull request #204 from rcnl-org/dev
10f5d1d 
Update merging branch from dev
@SpencerTWilliams
Fix merge conflicts
d4ad602
@SpencerTWilliams
Fix integrand merge conflict
1aa2376
@SpencerTWilliams
Restore TO integrand
6c44c21
@SpencerTWilliams
Merge branch 'Merging-parpool-mex-into-dev' into parallel-pool-mex-al…
b3e1f70 
…ternative
@SpencerTWilliams
Merge pull request #205 from rcnl-org/parallel-pool-mex-alternative
85d52fb 
Parallel pool mex alternative
@SpencerTWilliams
Fix residual SynX activation allowable error
989c808
@MarlenyVega
Fixed free final time formulation
46f1d95
@cvhammond
Merge pull request #202 from rcnl-org/FixedSynergyDrivenFormulation
96f8d52 
Fixed minor syntax errors
@cvhammond
Merge pull request #206 from rcnl-org/Merging-parpool-mex-into-dev
8d482e4 
Parallel pool alternatives to mex functions
@MarlenyVega
Merge branch 'FreeFinalTime' into FixFreeFinalTime
c1429ed
@MarlenyVega
Merge pull request #209 from rcnl-org/FixFreeFinalTime
25c7f62 
Fix free final time branch
@MarlenyVega
Updated variable names in mex/matlab functions
7d38f24
@SpencerTWilliams
Update SynX bounds
a2111ac
@SpencerTWilliams
Fix constraints for multiple trials
e18e260
@MarlenyVega
Fixed ValueStruct
cb392aa
@SpencerTWilliams
Fix saving MTP without precal
dc16caa
@SpencerTWilliams
Use excitation penalty
89844ce
@cvhammond
fixed exception on NCP parse
fd378e6
@MarlenyVega
Quick fix to free final time range setup
c9c8943
@MarlenyVega
Merge branch 'FreeFinalTime' of https://github.com/rcnl-org/nmsm-core …
eeaefed 
…into FreeFinalTime
@MarlenyVega
Fixed reporting of userDefinedVariables
07a5694
@MarlenyVega
Fixed experimentalTime
8c8c515
@MarlenyVega
Fixed maxIntegral in VerificationOptimization
ab77936
@cvhammond
Merge pull request #207 from rcnl-org/FreeFinalTime
b55942d 
Added free final time formulation
@SpencerTWilliams
Excitation cost allowable error and error center from xml
5cac387
@cvhammond
Merge pull request #213 from rcnl-org/debug-mtp
0d70c90 
Debug MTP cost terms
@cvhammond cvhammond merged commit 0d105f3 into candidate Jun 15, 2023
0 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@cvhammond @MarlenyVega @SpencerTWilliams