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

Candidate #215

Merged
merged 91 commits into from
Jun 15, 2023
Merged

Candidate #215

merged 91 commits into from
Jun 15, 2023

Commits on May 15, 2023

  1. Added metabolic cost calculation

    @MarlenyVega
    MarlenyVega committed May 15, 2023
    Configuration menu
    Copy the full SHA
    0118772 View commit details
    Browse the repository at this point in the history

  2. Added ability to include metabolic cost as a cost term

    @MarlenyVega
    MarlenyVega committed May 15, 2023
    Configuration menu
    Copy the full SHA
    c9025c6 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Fix preprocessing file manipulation

    @SpencerTWilliams
    SpencerTWilliams committed May 16, 2023
    Configuration menu
    Copy the full SHA
    d4c5e75 View commit details
    Browse the repository at this point in the history

  2. Account for extra EMG columns in MTP, "_moment" suffix in ID

    @SpencerTWilliams
    SpencerTWilliams committed May 16, 2023
    Configuration menu
    Copy the full SHA
    d02741f View commit details
    Browse the repository at this point in the history

  3. Fix saving MTP results to .osimx

    @SpencerTWilliams
    SpencerTWilliams committed May 16, 2023
    Configuration menu
    Copy the full SHA
    572c04f View commit details
    Browse the repository at this point in the history

  4. changed cost term format

    @cvhammond
    cvhammond committed May 16, 2023
    Configuration menu
    Copy the full SHA
    d080cb7 View commit details
    Browse the repository at this point in the history

  5. fixed TO inputs cost term

    @cvhammond
    cvhammond committed May 16, 2023
    Configuration menu
    Copy the full SHA
    4716dd0 View commit details
    Browse the repository at this point in the history

  6. fixed cost term inputs

    @cvhammond
    cvhammond committed May 16, 2023
    Configuration menu
    Copy the full SHA
    9a5673d View commit details
    Browse the repository at this point in the history

  7. changed cost terms

    @cvhammond
    cvhammond committed May 16, 2023
    Configuration menu
    Copy the full SHA
    5e7ccab View commit details
    Browse the repository at this point in the history

  8. added user_defined cost term

    @cvhammond
    cvhammond committed May 16, 2023
    Configuration menu
    Copy the full SHA
    adcbcf6 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Make parsing MTP results in NCP optional, fix updating values from pr… 

    …ecal
    @SpencerTWilliams
    SpencerTWilliams committed May 17, 2023
    Configuration menu
    Copy the full SHA
    aa5c3cd View commit details
    Browse the repository at this point in the history

  2. implement initial user_defined

    @cvhammond
    cvhammond committed May 17, 2023
    Configuration menu
    Copy the full SHA
    f84bc6e View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. Save optimized max isometric stress from MTP, account for turning off… 

    … some design variables in saving
    @SpencerTWilliams
    SpencerTWilliams committed May 18, 2023
    Configuration menu
    Copy the full SHA
    fc539fa View commit details
    Browse the repository at this point in the history

  2. Fix length scale factors, max isometric force importing from MTP

    @SpencerTWilliams
    SpencerTWilliams committed May 18, 2023
    Configuration menu
    Copy the full SHA
    8ef0b1f View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. Fix NCP with no MTP results, save NCP precal to osimx

    @SpencerTWilliams
    SpencerTWilliams committed May 19, 2023
    Configuration menu
    Copy the full SHA
    9996bd3 View commit details
    Browse the repository at this point in the history

  2. Save GCP kinematics with correct column names, start implementing app… 

    …ending to osimx
    @SpencerTWilliams
    SpencerTWilliams committed May 19, 2023
    Configuration menu
    Copy the full SHA
    e198e08 View commit details
    Browse the repository at this point in the history

  3. separated design variable parts in xml

    @cvhammond
    cvhammond committed May 19, 2023
    Configuration menu
    Copy the full SHA
    9b8585b View commit details
    Browse the repository at this point in the history

  4. Fix prepareGCPInputs arguments

    @SpencerTWilliams
    SpencerTWilliams committed May 19, 2023
    Configuration menu
    Copy the full SHA
    2c79282 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2023

  1. added manual scaling

    @cvhammond
    cvhammond committed May 20, 2023
    Configuration menu
    Copy the full SHA
    bb87ca0 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Update GCP osimx

    @SpencerTWilliams
    SpencerTWilliams committed May 22, 2023
    Configuration menu
    Copy the full SHA
    c11debe View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. consolidated report fn

    @cvhammond
    cvhammond committed May 23, 2023
    Configuration menu
    Copy the full SHA
    76f9878 View commit details
    Browse the repository at this point in the history

  2. consolidated tool input generation

    @cvhammond
    cvhammond committed May 23, 2023
    Configuration menu
    Copy the full SHA
    786b58b View commit details
    Browse the repository at this point in the history

  3. consolidated values struct creation

    @cvhammond
    cvhammond committed May 23, 2023
    Configuration menu
    Copy the full SHA
    93f7ad0 View commit details
    Browse the repository at this point in the history

  4. update DO integrand calc

    @cvhammond
    cvhammond committed May 23, 2023
    Configuration menu
    Copy the full SHA
    f7c4b4f View commit details
    Browse the repository at this point in the history

  5. moved cost terms to separate fn

    @cvhammond
    cvhammond committed May 23, 2023
    Configuration menu
    Copy the full SHA
    e0ffc57 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'consolidateTreatmentOptimizationTools' into ExpansionCo… 

    …stTerms
    @cvhammond
    cvhammond committed May 23, 2023
    Configuration menu
    Copy the full SHA
    461c4e6 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #195 from rcnl-org/ExpansionCostTerms 

    Bring metabolic cost to updated treatment optimization
    @cvhammond
    cvhammond committed May 23, 2023
    Configuration menu
    Copy the full SHA
    67ac1c3 View commit details
    Browse the repository at this point in the history

  8. merged metabolic cost in

    @cvhammond
    cvhammond committed May 23, 2023
    Configuration menu
    Copy the full SHA
    2649f6f View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Fix saving contact surface to osimx when a surface already exists in … 

    …file
    @SpencerTWilliams
    SpencerTWilliams committed May 24, 2023
    Configuration menu
    Copy the full SHA
    c6c678f View commit details
    Browse the repository at this point in the history

  2. fix small no-arg issues

    @cvhammond
    cvhammond committed May 24, 2023
    Configuration menu
    Copy the full SHA
    17e35c6 View commit details
    Browse the repository at this point in the history

  3. fixed formatting

    @cvhammond
    cvhammond committed May 24, 2023
    Configuration menu
    Copy the full SHA
    a0317c5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #196 from rcnl-org/UserDefinedStaticParameterWithS… 

    …caling

added manual scaling
    @cvhammond
    cvhammond committed May 24, 2023
    Configuration menu
    Copy the full SHA
    c86527a View commit details
    Browse the repository at this point in the history

  5. Delete reportDesignOptimizationResults.m

    @cvhammond
    cvhammond committed May 24, 2023
    Configuration menu
    Copy the full SHA
    2758807 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #197 from rcnl-org/UserDefinedStaticParameter 

    User defined static parameter
    @cvhammond
    cvhammond committed May 24, 2023
    Configuration menu
    Copy the full SHA
    afed629 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #199 from rcnl-org/consolidateTreatmentOptimizatio… 

    …nTools

Consolidate treatment optimization tools
    @cvhammond
    cvhammond committed May 24, 2023
    Configuration menu
    Copy the full SHA
    77c7f09 View commit details
    Browse the repository at this point in the history

  8. Point kinematics mex alternative

    @SpencerTWilliams
    SpencerTWilliams committed May 24, 2023
    Configuration menu
    Copy the full SHA
    eaee26c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'parallel-pool-mex-alternative' into merging-dev-parpool

    @SpencerTWilliams
    SpencerTWilliams committed May 24, 2023
    Configuration menu
    Copy the full SHA
    57da189 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #200 from rcnl-org/merging-dev-parpool 

    Update parallel pool branch from dev
    @SpencerTWilliams
    SpencerTWilliams committed May 24, 2023
    Configuration menu
    Copy the full SHA
    ec9c6aa View commit details
    Browse the repository at this point in the history

  11. Fix result reporting

    @SpencerTWilliams
    SpencerTWilliams committed May 24, 2023
    Configuration menu
    Copy the full SHA
    e8b7d66 View commit details
    Browse the repository at this point in the history

  12. Parallelize inverse dynamics

    @SpencerTWilliams
    SpencerTWilliams committed May 24, 2023
    Configuration menu
    Copy the full SHA
    a619905 View commit details
    Browse the repository at this point in the history

  13. Use persistent variables for speed

    @SpencerTWilliams
    SpencerTWilliams committed May 24, 2023
    Configuration menu
    Copy the full SHA
    131934b View commit details
    Browse the repository at this point in the history

  14. Fix parallelized functions

    @SpencerTWilliams
    SpencerTWilliams committed May 24, 2023
    Configuration menu
    Copy the full SHA
    91cd2a2 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Fix coordinate constraint indexing

    @SpencerTWilliams
    SpencerTWilliams committed May 25, 2023
    Configuration menu
    Copy the full SHA
    fee56c0 View commit details
    Browse the repository at this point in the history

  2. Fix integrand for models with fewer IK columns than coordinates

    @SpencerTWilliams
    SpencerTWilliams committed May 25, 2023
    Configuration menu
    Copy the full SHA
    7580a30 View commit details
    Browse the repository at this point in the history

  3. Update terminal constraint type names

    @SpencerTWilliams
    SpencerTWilliams committed May 25, 2023
    Configuration menu
    Copy the full SHA
    19ca347 View commit details
    Browse the repository at this point in the history

  4. Use mex pointKinematics and ID for Windows, Matlab parallel otherwise

    @SpencerTWilliams
    SpencerTWilliams committed May 25, 2023
    Configuration menu
    Copy the full SHA
    7a1840c View commit details
    Browse the repository at this point in the history

  5. Move pointKinematics, ID to core treatment optimization folder

    @SpencerTWilliams
    SpencerTWilliams committed May 25, 2023
    Configuration menu
    Copy the full SHA
    8f20fb6 View commit details
    Browse the repository at this point in the history

  6. Preallocate Matlab implementation outputs for speed

    @SpencerTWilliams
    SpencerTWilliams committed May 25, 2023
    Configuration menu
    Copy the full SHA
    810f5f9 View commit details
    Browse the repository at this point in the history

  7. Account for mex/Matlab switch in integrand

    @SpencerTWilliams
    SpencerTWilliams committed May 25, 2023
    Configuration menu
    Copy the full SHA
    47dff56 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2023

  1. Move ID/point kinematics persistent clear for speed

    @SpencerTWilliams
    SpencerTWilliams committed May 26, 2023
    Configuration menu
    Copy the full SHA
    d99dd20 View commit details
    Browse the repository at this point in the history

  2. Initialize mex and Matlab parallel for TO, VO, DO

    @SpencerTWilliams
    SpencerTWilliams committed May 26, 2023
    Configuration menu
    Copy the full SHA
    299baf9 View commit details
    Browse the repository at this point in the history

  3. Preallocation for speed

    @SpencerTWilliams
    SpencerTWilliams committed May 26, 2023
    Configuration menu
    Copy the full SHA
    8048b7a View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. updated VO and TO cost terms

    @cvhammond
    cvhammond committed May 30, 2023
    Configuration menu
    Copy the full SHA
    63694b1 View commit details
    Browse the repository at this point in the history

  2. Fixed calcMetabolicCost function

    @MarlenyVega
    MarlenyVega committed May 30, 2023
    Configuration menu
    Copy the full SHA
    33f6ee7 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Fix EMG processing

    @SpencerTWilliams
    SpencerTWilliams committed May 31, 2023
    Configuration menu
    Copy the full SHA
    44db0b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. New linear inequality constraints for MTP SynX

    @SpencerTWilliams
    SpencerTWilliams committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    f0b64e1 View commit details
    Browse the repository at this point in the history

  2. Updated formulation for free final time

    @MarlenyVega
    MarlenyVega committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    02debea View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Parse NCP symmetry as toggle

    @SpencerTWilliams
    SpencerTWilliams committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    0b7f1ff View commit details
    Browse the repository at this point in the history

  2. Merge pull request #201 from rcnl-org/TOXMLUpdate 

    updated VO and TO cost terms
    @cvhammond
    cvhammond committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    3ca0553 View commit details
    Browse the repository at this point in the history

  3. Finished up changes for free final time formulation

    @MarlenyVega
    MarlenyVega committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    3a7f719 View commit details
    Browse the repository at this point in the history

  4. Add lower inequality constraint to MTP SynX

    @SpencerTWilliams
    SpencerTWilliams committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    ee59064 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. Fixed minor syntax errors

    @MarlenyVega
    MarlenyVega committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    3660531 View commit details
    Browse the repository at this point in the history

  2. Updated integrand calculation

    @MarlenyVega
    MarlenyVega committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    03d4af7 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Merge pull request #204 from rcnl-org/dev 

    Update merging branch from dev
    @SpencerTWilliams
    SpencerTWilliams committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    10f5d1d View commit details
    Browse the repository at this point in the history

  2. Fix merge conflicts

    @SpencerTWilliams
    SpencerTWilliams committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    d4ad602 View commit details
    Browse the repository at this point in the history

  3. Fix integrand merge conflict

    @SpencerTWilliams
    SpencerTWilliams committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    1aa2376 View commit details
    Browse the repository at this point in the history

  4. Restore TO integrand

    @SpencerTWilliams
    SpencerTWilliams committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    6c44c21 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'Merging-parpool-mex-into-dev' into parallel-pool-mex-al… 

    …ternative
    @SpencerTWilliams
    SpencerTWilliams committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    b3e1f70 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #205 from rcnl-org/parallel-pool-mex-alternative 

    Parallel pool mex alternative
    @SpencerTWilliams
    SpencerTWilliams committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    85d52fb View commit details
    Browse the repository at this point in the history

  7. Fix residual SynX activation allowable error

    @SpencerTWilliams
    SpencerTWilliams committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    989c808 View commit details
    Browse the repository at this point in the history

  8. Fixed free final time formulation

    @MarlenyVega
    MarlenyVega committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    46f1d95 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Merge pull request #202 from rcnl-org/FixedSynergyDrivenFormulation 

    Fixed minor syntax errors
    @cvhammond
    cvhammond committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    96f8d52 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #206 from rcnl-org/Merging-parpool-mex-into-dev 

    Parallel pool alternatives to mex functions
    @cvhammond
    cvhammond committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    8d482e4 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Merge branch 'FreeFinalTime' into FixFreeFinalTime

    @MarlenyVega
    MarlenyVega committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    c1429ed View commit details
    Browse the repository at this point in the history

  2. Merge pull request #209 from rcnl-org/FixFreeFinalTime 

    Fix free final time branch
    @MarlenyVega
    MarlenyVega committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    25c7f62 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2023

  1. Updated variable names in mex/matlab functions

    @MarlenyVega
    MarlenyVega committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    7d38f24 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Update SynX bounds

    @SpencerTWilliams
    SpencerTWilliams committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    a2111ac View commit details
    Browse the repository at this point in the history

  2. Fix constraints for multiple trials

    @SpencerTWilliams
    SpencerTWilliams committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    e18e260 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Fixed ValueStruct

    @MarlenyVega
    MarlenyVega committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    cb392aa View commit details
    Browse the repository at this point in the history

  2. Fix saving MTP without precal

    @SpencerTWilliams
    SpencerTWilliams committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    dc16caa View commit details
    Browse the repository at this point in the history

  3. Use excitation penalty

    @SpencerTWilliams
    SpencerTWilliams committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    89844ce View commit details
    Browse the repository at this point in the history

  4. fixed exception on NCP parse

    @cvhammond
    cvhammond committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    fd378e6 View commit details
    Browse the repository at this point in the history

  5. Quick fix to free final time range setup

    @MarlenyVega
    MarlenyVega committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    c9c8943 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'FreeFinalTime' of https://github.com/rcnl-org/nmsm-core … 

    …into FreeFinalTime
    @MarlenyVega
    MarlenyVega committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    eeaefed View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Fixed reporting of userDefinedVariables

    @MarlenyVega
    MarlenyVega committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    07a5694 View commit details
    Browse the repository at this point in the history

  2. Fixed experimentalTime

    @MarlenyVega
    MarlenyVega committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    8c8c515 View commit details
    Browse the repository at this point in the history

  3. Fixed maxIntegral in VerificationOptimization

    @MarlenyVega
    MarlenyVega committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    ab77936 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #207 from rcnl-org/FreeFinalTime 

    Added free final time formulation
    @cvhammond
    cvhammond committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    b55942d View commit details
    Browse the repository at this point in the history

  5. Excitation cost allowable error and error center from xml

    @SpencerTWilliams
    SpencerTWilliams committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    5cac387 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. Merge pull request #213 from rcnl-org/debug-mtp 

    Debug MTP cost terms
    @cvhammond
    cvhammond committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    0d70c90 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #214 from rcnl-org/dev 

    Dev
    @cvhammond
    cvhammond committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    0d105f3 View commit details
    Browse the repository at this point in the history