Skip to content

Speedup testCMCSingleMuscle #1146

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.

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

Merged
merged 4 commits into from
Aug 18, 2016
Merged

Speedup testCMCSingleMuscle #1146

merged 4 commits into from
Aug 18, 2016

Conversation

aseth1
Copy link
Member

@aseth1 aseth1 commented Jul 29, 2016

Shorten and improve single muscle CMC test, which compares the results from CMC when tracking kinematics of a forward simulation using the same model. The model file version was updated to 3.0 (since test developed in 3.3) and the duration was shortened (5s->0.9s) and the peek excitation was doubled. Movement is more dynamic (faster and more range) and the controls and output forces are now being compared as well as states.

In addition to being a harder test, this should also be at least 5x faster than the previous test case.
On Appveyor 32bit: ~180s to ~14s

aseth1 added 4 commits July 26, 2016 17:28
…ut the duration is shortened and the peek excitation was doubled.

Movement is more dynamic (faster) and the controls are now being compared as well. In addition, this should be 5x faster than the previous test case.
Also added check that forward and CMC run to completion and fail otherwise.
…ing due to stale results in the build directory.

Now that Tool failures cause the test to fail, tests cannot proceed to compare stale results.
Reduced test duration to speedup test further an also avoid problematic region near the end of the motion where muscle is lengthening eccentrically.
@tkuchida
Copy link
Member

tkuchida commented Jul 29, 2016

👍 LGTM. This is a great way to speed up the tests (some were probably designed years ago when we relied on nightly builds, where speed wasn't a concern). However, I think tests like this should use models generated programmatically rather than storing and maintaining model files; separate tests should exercise model file loading and compare rigorously to ensure all properties are read in correctly, for example.

@aseth1
Copy link
Member Author

aseth1 commented Aug 1, 2016

I think tests like this should use models generated programmatically rather than storing and maintaining model files; separate tests should exercise model file loading and compare rigorously to ensure all properties are read in correctly

I agree. In this case building the model (programmatically) would be straightforward but setting up the CMCTool could be troublesome, since the Tools were never designed to be called directly from the API. I would prefer not to convert this test, but require that future tests (e.g. for a replacement for CMC and new solvers) have separate tests for performance, implementation correctness and de/serialization.

Moving forward with new components, testing serialization, cloning, connectors and availability of outputs, can be tested by a generic set of cases as part of testComponents. So we can continue to reduce the dependency on setup and model files for testing core functionality as more functionality is encompassed by Components. As for Tools, I think it is just easier to include the setup files until we can deprecate them altogether (after 4.0), but that could also be a long time.

I could also attempt to setup the Forward and CMC Tools programmatically for this test. What is your preference for this PR?

@tkuchida
Copy link
Member

tkuchida commented Aug 1, 2016

What is your preference for this PR?

No need to hold up this PR. I suggest opening a new issue for (1) generating models (and setup files, wherever possible) programmatically rather than loading them from xml, and (2) creating a new test focusing on serialization/deserialization that includes loading models saved in each supported version.

@aseth1
Copy link
Member Author

aseth1 commented Aug 1, 2016

Sounds good.

(2) creating a new test focusing on serialization/deserialization that includes loading models saved in each supported version.

There are existing tests, in particular, testSerializeOpenSimObjects and testComponents that test serialization and deserialization and equality of models. However, testSerializeOpenSimObjects appears to be limited to ModelComponents which makes it far from being complete for testing OpenSim "Objects". I added an issue #1150 about this. There is an open issue for model conversion testing, #206.

(1) generating models (and setup files, wherever possible) programmatically rather than loading them from xml

I opened an issue, #1151, to propose adding a new guideline to our CONTRIBUTING.md to avoid the use of files (model or otherwise) for unit and functional testing (unless of course its function is to read/write data) and promote the use of short integration and regression tests.

If this is satisfactory please feel free to merge.

@tkuchida
Copy link
Member

tkuchida commented Aug 1, 2016

If this is satisfactory please feel free to merge.

LGTM. This PR exceeds what is covered by Rule 5; by Rule 6, a second reviewer needs to merge.

@aseth1
Copy link
Member Author

aseth1 commented Aug 1, 2016

@klshrinidhi please give this a quick review when you have the opportunity. Thanks.

@klshrinidhi
Copy link
Contributor

If possible, it would be good to not add any more code that uses OpenSim::Array and use std::vector instead.

Other than that, I don't see any problem. 👍

@aseth1
Copy link
Member Author

aseth1 commented Aug 2, 2016

Thanks @klshrinidhi. I agree with your request. The added OpenSim::Arrays are used to define the tolerances as expected by CHECK_STORAGE_AGAINST_STANDARD() and updating that method would impact numerous test cases. Making that update perhaps should wait until we are closer to eliminating OpenSim::Array altogether. Otherwise, if we decide to back OpenSim::Array with std::vector, this might not be an issue either. A good discussion perhaps for a future PR?

@aseth1
Copy link
Member Author

aseth1 commented Aug 18, 2016

@tkuchida @klshrinidhi merge?

@tkuchida
Copy link
Member

tkuchida commented Aug 18, 2016

A good discussion perhaps for a future PR?

Have you created an issue, or is it covered by an existing one?

@aseth1
Copy link
Member Author

aseth1 commented Aug 18, 2016

@tkuchida I just added #1194

@tkuchida tkuchida merged commit c745827 into master Aug 18, 2016
@tkuchida tkuchida deleted the speedup_single_muscle_CMC_test branch August 18, 2016 01:16
chrisdembia added a commit that referenced this pull request Sep 1, 2016
Squashed commit of the following:

commit 175f1383da87724c6e8bc139be882016782024e2
Merge: 065a246 c67dfc1
Author: Christopher Dembia <[email protected]>
Date:   Wed Aug 31 20:02:29 2016 -0700

    Merge branch 'master' of github.com:opensim-org/opensim-core into cli-docopt-with-superbuild

commit 065a246331e9fb43ce94d0db23aad8f3d77c6735
Author: Christopher Dembia <[email protected]>
Date:   Wed Aug 31 20:01:39 2016 -0700

    Make docopt an external dependency.

commit c67dfc14512ed0ff37836894dd6b7c8df1c4ee87
Merge: 9b01842 43dbc56
Author: Ajay Seth <[email protected]>
Date:   Wed Aug 31 17:17:43 2016 -0700

    Merge pull request #1201 from opensim-org/tkuchida-throwExceptionOnMuscleEquilibrateFail

    Throw exceptions if muscles cannot compute equilibrium

commit 9b0184247e8a79335f04504a5fd1a198c5b27e82
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 31 13:43:07 2016 -0700

    Added changes to Joint's CoordinateSet and exceptions now thrown by muscle models. [ci skip]

commit 4896489a43ee57a79e552ffcd589c415376638df
Merge: ae356c7 b4e0ad4
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 31 10:30:41 2016 -0700

    Merge pull request #1217 from opensim-org/check_storage_against_standard-use_vector

    use std::vector with CHECK_STORAGE_AGAINST_STANDARD

commit b4e0ad4d6bb8337b75e44f15cf77952740fe732b
Author: carmichaelong <[email protected]>
Date:   Wed Aug 31 09:28:25 2016 -0700

    pass string's by const reference

commit a8cd697c3fa662018b68ced676b980e139d0f1e9
Author: carmichaelong <[email protected]>
Date:   Tue Aug 30 14:50:12 2016 -0700

    changes as per PR review. const methods in Storage. clean up comments.

commit ae356c74c26fc82c1a5d788afc997d3fd64648cd
Merge: 431df3a 4aaad8d
Author: Ayman Habib <[email protected]>
Date:   Tue Aug 30 13:24:25 2016 -0700

    Merge pull request #1210 from opensim-org/tkuchida-changeJointCoordinateSetToListProperty

    Changed Joint's CoordinateSet to "coordinates" list property

commit 4c416d4d000e4cfcbbe59b64f40c6f4140359076
Author: carmichaelong <[email protected]>
Date:   Mon Aug 29 17:16:22 2016 -0700

    use std::vector in Storage::compareWithStandard

commit 4a3765d6d29fd6beecab7c5946392affcbb8d3c0
Author: carmichaelong <[email protected]>
Date:   Mon Aug 29 15:34:33 2016 -0700

    change CHECK_STORAGE_AGAINST_STANDARD() so that tolerances are passed by a std::vector

commit 43dbc56294edb2827a61559016ad6416b4e4e817
Author: Tom Uchida <[email protected]>
Date:   Mon Aug 29 02:58:19 2016 -0700

    Replaced snprintf with ostringstream.

commit 0877a98296b2068f238ed64e39aafb006bf7e41e
Author: Tom Uchida <[email protected]>
Date:   Mon Aug 29 02:37:57 2016 -0700

    Changed return type of initMuscleState() and estimateMuscleFiberState() to a std::pair consisting of the status flag (enum) and a std::map that holds the calculated values.

commit 52431e23415ac471806f4f1a2625fb5e203b7d74
Merge: a8615a3 431df3a
Author: Tom Uchida <[email protected]>
Date:   Mon Aug 29 00:39:50 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into tkuchida-throwExceptionOnMuscleEquilibrateFail

commit 431df3a363b916fea46605c380995cb0f38075ee
Merge: c7871be 201ea19
Author: Christopher Dembia <[email protected]>
Date:   Fri Aug 26 13:12:46 2016 -0700

    Merge pull request #1211 from opensim-org/add_designdoc_folder

    Add a place for design documents. Include a template.

commit 201ea1902af8c7b6543d00b27c5b965b16af93ab
Author: Shrinidhi KL <[email protected]>
Date:   Fri Aug 26 13:02:29 2016 -0700

    Add section for 'Potential roadblocks'. [skip ci]

commit bf3ae480b8670cd3e44a683e8d03eb0c8aa3c46e
Author: Shrinidhi KL <[email protected]>
Date:   Thu Aug 25 18:15:56 2016 -0700

    80-char limit

commit dbe47c022ca0f478e1f56318b03dd2c83683401d
Author: Shrinidhi KL <[email protected]>
Date:   Thu Aug 25 18:12:37 2016 -0700

    Update title. [skip ci]

commit 7debd389b30b0f64460bcaa52fca0800e840b309
Author: Shrinidhi KL <[email protected]>
Date:   Thu Aug 25 18:10:17 2016 -0700

    Update section title. [skip ci]

commit c7871bea6eee05f75dbc1a586eda77ec67882755
Merge: 421eebb bda6740
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 25 18:02:29 2016 -0700

    Merge pull request #1213 from opensim-org/tkuchida-improveReadmeInstructionsForVisualStudio

    Improve README instructions for Visual Studio

commit 2c5a2ab2db5488d3e1a82714684cf32f715aa795
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 25 17:37:52 2016 -0700

    Delete extra "For example"

    [ci skip]

commit 4aaad8d338fd25d99fa075de45d050fc2d1049a7
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 25 17:28:44 2016 -0700

    Improved robustness of updateFromXMLNode script.

commit 7d73f10bc4215d975be37b30742855a8ef2c0bbe
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 25 16:37:17 2016 -0700

    Incremented LatestVersion.

commit 11185ffc224a571172a20d90faea6167b4363828
Author: Shrinidhi KL <[email protected]>
Date:   Thu Aug 25 16:29:48 2016 -0700

    Update overview section. [skip ci]

commit b810201574554c868dc1e7fefae50e238a45d33a
Author: Shrinidhi KL <[email protected]>
Date:   Thu Aug 25 16:20:08 2016 -0700

    Add file size limit. [skip ci]

commit bda674023e3b7a2ec7c0320a5a00ed04572bb967
Author: tkuchida <[email protected]>
Date:   Thu Aug 25 16:03:14 2016 -0700

    Fixed formatting [ci skip]

commit c7e94a9b21511af8d609bcdfe8faee747b43df5c
Author: tkuchida <[email protected]>
Date:   Thu Aug 25 16:00:28 2016 -0700

    Added alternative instructions for adding C++ support to an existing Visual Studio installation.

commit 614a05619d672a4bc9ae9e9c2010f736bcf1bcd3
Author: Shrinidhi KL <[email protected]>
Date:   Thu Aug 25 15:05:20 2016 -0700

    Change examples to suit opensim. [skip ci]

commit 48474e89e98874045afb65c074d0d0cdf1bd77b5
Author: Shrinidhi KL <[email protected]>
Date:   Thu Aug 25 14:34:58 2016 -0700

    Use "Development Proposals" instead of "Desgin Document". [skip ci]

commit 93f194640805893f1d4ac6aa6e53c049e2341b78
Author: Shrinidhi KL <[email protected]>
Date:   Thu Aug 25 13:58:59 2016 -0700

    Update template. [skip ci]

commit cacf2f2ff2f0d9d714e1c09b72c286709a4caa9e
Author: Shrinidhi KL <[email protected]>
Date:   Thu Aug 25 13:47:10 2016 -0700

    Update Readme. [skip ci]

commit e6bf79dcff8f02e071c4029125ff45b11523a03e
Author: Shrinidhi KL <[email protected]>
Date:   Thu Aug 25 13:24:41 2016 -0700

    Place for design proposals to live. Initial commit.

commit cfc92845eb4cedc9fd042369053ed59b5ac292f7
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 25 01:40:09 2016 -0700

    Change CoordinateSet to coordinate for Joints.

commit 9453e8e6b4ab9cc0eb540e1b601235f382994798
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 25 01:37:21 2016 -0700

    Removed ASSERT that was originally checking a == a (numCoordinates() == get_CoordinateSet().getSize()). Changing this to numCoordinates() == getNumMobilities<T>(simtkBody) does not work for CustomJoints.

commit f62c9533bb8257fe4c093891a19a6c51e6809e84
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 24 20:59:59 2016 -0700

    Fixed typo.

commit 14da4671457d29b4570ae717d1db55cc6667320b
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 24 19:46:53 2016 -0700

    Corrected variable declaration.

commit 21cc58348ffad48c733f1b4bf997484b0508fdf9
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 24 19:04:32 2016 -0700

    Replaced references to Joint's CoordinateSet with new "coordinates" list property. Fixed bug in Joint.h (ASSERT was checking that a == a).

commit f23319746ef7d0eef11ccfb8a1b70e37a9ec4e35
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 24 18:36:53 2016 -0700

    Replaced references to Joint's CoordinateSet with new "coordinates" list property.

commit 4005d27c1b6edc7592182feb3eee25bdde1a6657
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 24 18:09:20 2016 -0700

    Added updateFromXMLNode code to replace "CoordinateSet" element with "coordinates" element.

commit 714aa1a66cdc5f2f7d08cf984655d047c1c11cde
Merge: 3291dde 421eebb
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 24 10:38:36 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into tkuchida-changeJointCoordinateSetToListProperty

commit 3291dde863c20852f30a880d5e65e8036b834d03
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 24 04:32:10 2016 -0700

    Changed Joint's CoordinateSet to a list property. Addresses part of #1066.

commit 421eebbb9b653699ccaa68b708bb06ad392ee340
Merge: de2af49 eeea401
Author: Christopher Dembia <[email protected]>
Date:   Tue Aug 23 22:33:24 2016 -0700

    Merge pull request #1207 from opensim-org/doxyfile_add_btk

    Added BTK preprocessor macro in Doxyfiles

commit eeea401ea4d0c2a85677353a503bf8732b2c921a
Author: jimmyDunne <[email protected]>
Date:   Tue Aug 23 16:56:52 2016 -0700

    Added BTK preprocessor macro in Doxyfiles

commit de2af4972216cdc692f6d6bd416a2f40751d8ee4
Merge: 50b1615 324396a
Author: Ajay Seth <[email protected]>
Date:   Mon Aug 22 15:38:09 2016 -0700

    Merge pull request #1116 from opensim-org/tkuchida-addCoordinateAccessors

    Add convenience accessors to underlying Coordinates

commit a8615a368b41de5216b4a78ed0307e69af40f502
Merge: 5854dc2 7e7cc6c
Author: Tom Uchida <[email protected]>
Date:   Sat Aug 20 01:39:23 2016 -0700

    Merge branch 'tkuchida-throwExceptionOnMuscleEquilibrateFail' of https://github.com/opensim-org/opensim-core into tkuchida-throwExceptionOnMuscleEquilibrateFail

commit 5854dc235e7ade7238191bb6e0685107940265db
Author: Tom Uchida <[email protected]>
Date:   Sat Aug 20 01:36:42 2016 -0700

    Changed enum class to enum because SWIG 3.0.6 (the most recent version on chocolatey) does not support private enum classes.

commit 7e7cc6c8f09ded2f9d73aecbb47f835f53fe696f
Author: Tom Uchida <[email protected]>
Date:   Sat Aug 20 01:36:42 2016 -0700

    Changing SWIG version back to 3.0.6 because that is the most recent version supported by chocolatey.

commit d2e31c69ec397e3b222f51d858f85b6420961818
Author: Tom Uchida <[email protected]>
Date:   Sat Aug 20 01:14:19 2016 -0700

    Upgrade swig version from 3.0.6 to 3.0.9. Enum classes that are private in a class do not work in 3.0.8 and earlier. See the issue [here](https://github.com/swig/swig/issues/594) and the fix [here](https://github.com/swig/swig/commit/1d6279092816cb3e0a47254d9db545ce3e447f95).

commit 6811bdad84e2ca665faf1b537919392be4c91235
Merge: 738da8c 50b1615
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 19 20:50:10 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into tkuchida-throwExceptionOnMuscleEquilibrateFail

commit 738da8c049401188b3e7096d68ea75ec4e0ca267
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 19 20:15:22 2016 -0700

    Added exception testing to testMuscles for Thelen2003Muscle and Millard2012EquilibriumMuscle.

commit dc3ac2bff181f3774818287a3bed30db1c289a83
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 19 18:47:34 2016 -0700

    initMuscleState() now returns its status as an enum to avoid the possibility of encountering an unhandled flag in the caller; removed "InvalidFlag" exception.

commit 6e592d746da331c2da206c7d09e2a99c9d58ff81
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 19 18:46:11 2016 -0700

    Added comments indicating that an Exception can be thrown from computeInitialFiberEquilibrium() and computeFiberEquilibriumAtZeroVelocity().

commit 2f3dcd19a1f431992f8b714e5d593face8d7456e
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 19 18:41:01 2016 -0700

    Corrected comment.

commit e8b90d741ec0e1c5620e867d4dca67238e1f8829
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 19 18:19:21 2016 -0700

    estimateMuscleFiberState() now returns its status as an enum to avoid the possibility of encountering an unhandled flag in the caller; removed "InvalidFlag" exception.

commit 43f0c47e9b22788d637d664b80495a435f7c9df2
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 19 18:15:50 2016 -0700

    Comment formatting only.

commit 1a09c8cc69399f07811a6ac9b7b3f040598e30b0
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 19 17:46:02 2016 -0700

    Rearranged argument list for private initMuscleState() method to be consistent with analogous method in Millard2012EquilibriumMuscle (estimateMuscleFiberState(), whose last argument has a default value).

commit 09882595a7d749df4070311111690d5b6ebcf787
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 19 17:21:08 2016 -0700

    initMuscleState() now returns its status as an enum to avoid the possibility of encountering an unhandled flag in the caller.

commit 50b16157a1ab78c6a3d68d7dcf8fef8320c71df3
Merge: b2f44a8 7555e4d
Author: Ajay Seth <[email protected]>
Date:   Fri Aug 19 17:17:26 2016 -0700

    Merge pull request #1120 from stavness/fix_marksubprop_bug

    Fix markPropertiesAsSubcomponents invalidate bug

commit 9f5313621e7ba8c49fb7b9b31ee3977b06f15393
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 19 17:00:35 2016 -0700

    Added "detail" string argument to MuscleCannotEquilibrate exception.

commit b2f44a8b35596cb050f0f586800f9a2715b48f69
Merge: 5d7a1b1 03b1c6a
Author: Ajay Seth <[email protected]>
Date:   Fri Aug 19 16:17:45 2016 -0700

    Merge pull request #1077 from opensim-org/updinput

    convenience method to simplify updInput() for Reporter

commit 7555e4dd5fb097cc4671347f17b084308b4b255d
Author: Ajay Seth <[email protected]>
Date:   Fri Aug 19 14:38:45 2016 -0700

    Remove unnecessary check that _propertySubcomponents is empty

commit 5d7a1b12d04a3f8a19bc05101dbf2fef27e85972
Merge: 93d1f39 34a9a15
Author: Ajay Seth <[email protected]>
Date:   Fri Aug 19 14:13:09 2016 -0700

    Merge pull request #1198 from opensim-org/tkuchida-avoidUnsignedIntWrapThroughZero3

    Prevent wrap through zero when subtracting unsigned ints

commit 6332f0e6cdfc92110929d29d3ff8c2cda03b14d9
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 18 19:25:07 2016 -0700

    Throw an exception if Thelen2003Muscle cannot equilibrate. Currently displays a warning and quietly sets activation to zero and fiber length to optimal, which could go unnoticed. Fixes #1195.

commit 589a8eef8c2e072fa283d22978e6d61cef32a842
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 18 19:23:03 2016 -0700

    Add missing cerrs to report internal variables on error.

commit b41ec272be20398a1c601318c4e427a65df5dcbc
Merge: 563e934 93d1f39
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 18 18:26:36 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into tkuchida-throwExceptionOnMuscleEquilibrateFail

commit 34a9a1569d341339476a2cbb10a165fa43fdcb3b
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 18 14:15:55 2016 -0700

    Avoid unsigned int wrap through zero. Fixes #1196

commit 93d1f39c3c95cb6eaa96f4530c299f48eaa94d43
Merge: 0cec93a 9f31b80
Author: Ajay Seth <[email protected]>
Date:   Thu Aug 18 12:30:05 2016 -0700

    Merge pull request #1181 from opensim-org/componentMethodCleanup

    Remove "find" functionality from getOutput, getInput, and getConnector

commit 0cec93a1007a6d18cef88f3bd986e03cf1e36f92
Merge: c745827 3e873cf
Author: Ayman Habib <[email protected]>
Date:   Thu Aug 18 01:12:50 2016 -0700

    Merge pull request #1193 from opensim-org/modelLoadFix

    fix model load from file with missing <VisibleObject> or <WrapObjectSet> tags

commit 563e934901730c7f3f6ee12d5c66ba8bd6f38915
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 17 18:36:44 2016 -0700

    Moved Exception from derived classes to base class.

commit 8a824de496384024d03952afc304f79ca578c6f0
Merge: ba2e0a3 c745827
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 17 18:20:17 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into tkuchida-throwExceptionOnMuscleEquilibrateFail

commit c745827fb3e09d787a3101ecb9e2f0e980953b35
Merge: dfba851 113bab7
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 17 18:16:40 2016 -0700

    Merge pull request #1146 from opensim-org/speedup_single_muscle_CMC_test

    Speedup testCMCSingleMuscle

commit 324396a7339ce237bcf874ae7bd99c5413877842
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 17 17:47:51 2016 -0700

    Updated comment for Joint::constructCoordinate() and changed the name of the Exception that is thrown if a Coordinate is requested from a Joint that has no Coordinates.

commit dfba851a280ecb3abe5f15d42ada5c4364a9083f
Merge: 7cf6e20 55e5d39
Author: Ajay Seth <[email protected]>
Date:   Wed Aug 17 17:24:18 2016 -0700

    Merge pull request #1163 from opensim-org/fix-manager-constructor-default-integrator

    Restore internally-managed integrator to Manager, for use in MATLAB/Python

commit aee9d2bc5769e7a94539327c419361073a50d4cd
Merge: 88c2188 7cf6e20
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 17 17:13:46 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into tkuchida-addCoordinateAccessors

commit 9f31b80c31ef2131c6decb2ce5575d3eda29ec86
Author: carmichaelong <[email protected]>
Date:   Wed Aug 17 16:20:59 2016 -0700

    improve Exception names and update testComponentInterface

commit 7cf6e2034b22a17a5faabb857c4bce9782b938c3
Merge: e103a5b cea0d7a
Author: Ajay Seth <[email protected]>
Date:   Wed Aug 17 16:20:57 2016 -0700

    Merge pull request #1177 from opensim-org/tkuchida-fixGenerateDecorationsBug

    Fix to GeometryPath for MovingPathPoints

commit 3e873cfca1e9142a910199fbac47daf1a52c4286
Author: carmichaelong <[email protected]>
Date:   Wed Aug 17 15:34:07 2016 -0700

    fix to allow a model to load if a Body does not have a VisibleObject or WrapObjectSet element in the xml file

commit e103a5b5ce14bd473ae671cf631a1dec3ab3c356
Merge: efa4196 43e851d
Author: Ayman Habib <[email protected]>
Date:   Wed Aug 17 08:53:09 2016 -0700

    Merge pull request #1122 from opensim-org/visualize_wrap_contact

    Visualize wrap objects and contact geometry

commit 43e851dfbc57ea6d79da3c2537bda6748cee8399
Author: Ayman Habib <[email protected]>
Date:   Wed Aug 17 08:48:31 2016 -0700

    Update comments per PR [ci skip]

commit 7e91f83b0d38067146ffd9325321ea9a212c7b46
Author: carmichaelong <[email protected]>
Date:   Tue Aug 16 10:26:00 2016 -0700

    clarify Output documentation [ci skip]

commit efa4196095e8e5c28ef13c0a9ea19c2921c69658
Merge: 8352472 8400bd3
Author: Christopher Dembia <[email protected]>
Date:   Tue Aug 16 09:49:06 2016 -0700

    Merge pull request #1183 from wagglefoot/patch-1

    Simple Python API example (take two)

commit ba2e0a36da9ae5db3e5e7a61cff5858d2778dae2
Author: Tom Uchida <[email protected]>
Date:   Tue Aug 16 04:39:07 2016 -0700

    The Millard2012AccelerationMuscle test now fails in testStaticOptimization. This is the only test that fails and the failure is not caught by a unit test. Commenting out the test because many changes have been made to EquilibriumMuscle that have not been propagated to AccelerationMuscle, and repairing AccelerationMuscle is not on the critical path for 4.0. See #1185.

commit 7023530003ec4361340bb89fae2bcc472fe0da2b
Author: Tom Uchida <[email protected]>
Date:   Tue Aug 16 02:49:11 2016 -0700

    Throw an exception if Millard2012EquilibriumMuscle or Millard2012AccelerationMuscle equilibrium fails. Currently displays a warning and quietly sets activation to zero and fiber length to optimal, which could go unnoticed. Fixes #391

commit 8352472ed1f81476e96b2d048ac72293d9edf17d
Merge: 1a1f75a bf3e916
Author: carmichaelong <[email protected]>
Date:   Mon Aug 15 23:06:08 2016 -0700

    Merge pull request #1176 from opensim-org/tkuchida-patchMillardAccelerationMuscle

    Fix to Millard2012AccelerationMuscle initialization method

commit 1a1f75a3c9073e954825a40cd9a1aa52e5fd02ae
Merge: ab7e9cc 5b74e70
Author: Christopher Dembia <[email protected]>
Date:   Mon Aug 15 19:02:35 2016 -0700

    Merge pull request #1171 from opensim-org/calcResidual_bindings

    [bindings] Test SimbodyMatterSubsystem::calcResidualForce()

commit ab7e9cc50bce2b1fc1ec7725779edf5d7f97ae96
Merge: 755aa99 f43b7e9
Author: Tom Uchida <[email protected]>
Date:   Mon Aug 15 17:39:46 2016 -0700

    Merge pull request #1178 from opensim-org/bindings_prescribeControlForActuator

    Fix python memory management for prescribeControlForActuator.

commit 8400bd36d9db36b7b8568c612cb460ab2ce8ace9
Author: Neil Dhir <[email protected]>
Date:   Mon Aug 15 23:32:45 2016 +0100

    updated with suggested improvements

commit a2d2883c0ccbd4d356d06b10da3e0684513cbb66
Author: Neil Dhir <[email protected]>
Date:   Mon Aug 15 23:30:21 2016 +0100

    updated with suggested improvements

commit e9be683d8b02373ff518599e163bfd280f563c93
Author: Ayman Habib <[email protected]>
Date:   Mon Aug 15 13:16:30 2016 -0700

    Disable live visuals, used for debugging only.

commit f43b7e95f7ce057762a3c7a5a3e699315512cc91
Author: Christopher Dembia <[email protected]>
Date:   Mon Aug 15 12:33:28 2016 -0700

    getCoordinateSet() -> get_CoordinateSet().

commit 5b74e70de9616118d35d05916e6dd8101c9e184d
Author: Christopher Dembia <[email protected]>
Date:   Mon Aug 15 12:07:23 2016 -0700

    Improve docs for testSimbody, etc; capitalize Jacobian

commit 43031ef58f49e6d37f3bd9b29dd1333bf6a7d095
Merge: 8745741 755aa99
Author: Ayman Habib <[email protected]>
Date:   Mon Aug 15 11:51:26 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into visualize_wrap_contact

    Conflicts:
    	OpenSim/Simulation/Model/ContactGeometry.h

commit 480888a8c7a46a25288e3885c82846531d90b744
Author: Neil Dhir <[email protected]>
Date:   Mon Aug 15 15:11:51 2016 +0100

    modified CONTRUTING.md, created python examples folder and added simple arm example

commit 522f7cfe0a2686f6ed9e6ba53929ed899e3e5de0
Author: carmichaelong <[email protected]>
Date:   Sun Aug 14 14:43:45 2016 -0700

    clarify variable to deviceControllerOutputs

commit d7bc2411144c62a8d8d36ff0942954ed65e244be
Author: carmichaelong <[email protected]>
Date:   Sun Aug 14 14:38:33 2016 -0700

    added specific Exceptions if getOutput, getInput, or getConnector fails. added tests to trigger new Exceptions

commit 13fe6ed13b34297ddf8ee7ea976747d2d0bd7949
Author: carmichaelong <[email protected]>
Date:   Fri Aug 12 17:23:24 2016 -0700

    update comments in Component and in hopper example

commit 755aa99d0694454c726d896b782096be27c8331e
Merge: 7e49380 44e0895
Author: Jen Hicks <[email protected]>
Date:   Fri Aug 12 14:39:01 2016 -0700

    Merge pull request #1173 from opensim-org/remove_undistributable_c3d_files

    Remove undistributable c3d files.

commit bfa65c1b8b1cb46a1b400b788202c9f2c62d74f0
Author: carmichaelong <[email protected]>
Date:   Fri Aug 12 11:56:15 2016 -0700

    doxygen update

commit be45ee7dea68b777026f037762104ee25b8d750e
Author: carmichaelong <[email protected]>
Date:   Fri Aug 12 11:36:34 2016 -0700

    update comments in Component.h. update hopper device example to be consistent with changes to answers

commit 7c52e9c82c8c9537ab1f99e74e21823504ad52bc
Merge: 387933a 7e49380
Author: carmichaelong <[email protected]>
Date:   Fri Aug 12 10:25:13 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into componentMethodCleanup

commit 55e5d3908c298f41703bc59a06861432c37517db
Author: Christopher Dembia <[email protected]>
Date:   Fri Aug 12 07:56:37 2016 -0700

    Add missing include, resulting from Carmichael's cleanup.

commit cdceec645f717b841348297c99b75ac8e094e554
Merge: 33d5129 7e49380
Author: Christopher Dembia <[email protected]>
Date:   Fri Aug 12 07:51:07 2016 -0700

    Merge branch 'master' of github.com:opensim-org/opensim-core into fix-manager-constructor-default-integrator

commit fbea14c177f7f77f8a1d5e6d2ac61241b654dfba
Author: Christopher Dembia <[email protected]>
Date:   Fri Aug 12 07:45:00 2016 -0700

    Check size in calcResidualForce() test in scripting.

commit a35534c61bdc4fed1908b0cecacf8e3d47df6217
Author: Christopher Dembia <[email protected]>
Date:   Fri Aug 12 07:40:41 2016 -0700

    Add quantitative tests to calcResidualForce().

    Also updated CHANGELOG to mention that SimbodyMatterSubsystem is now available
    in scripting.

commit 7e4938071d3b2754420e35d4ccc09738e41e0075
Merge: 414c687 0c89d93
Author: Christopher Dembia <[email protected]>
Date:   Fri Aug 12 06:02:08 2016 -0700

    Merge pull request #1180 from opensim-org/tkuchida-fixHopperExampleInclude

    Added missing #include to hopper example

commit 387933ac03b5df5fea77bb7156ef7cbe32bbde83
Author: carmichaelong <[email protected]>
Date:   Thu Aug 11 17:10:53 2016 -0700

    update hopper example after changes to getOutput, getInput, getConnector

commit 874574109f85f4f2aaa9d382650dc08d0628bce2
Author: Ayman Habib <[email protected]>
Date:   Thu Aug 11 15:41:41 2016 -0700

    Images from API visualizer, default view (obtained by uncommenting two lines at the top of testVisModel function

commit 1dee0bcdcff254e02967c9d733fd9d88bf650272
Author: carmichaelong <[email protected]>
Date:   Thu Aug 11 15:28:22 2016 -0700

    make testComponentInterface.cpp use testInputOutputConnections. add a test that exception is thrown for getOutput if searching was needed

commit 0c89d939794e7ad7346dbb0f0f3b28c2a10a4961
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 11 14:50:05 2016 -0700

    Added missing #include resulting from #1145. [ci skip]

commit bd797767f82606551644a3b4d8e5dfaec668a190
Merge: e026347 414c687
Author: carmichaelong <[email protected]>
Date:   Thu Aug 11 13:49:38 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into componentMethodCleanup

    Conflicts:
    	OpenSim/Common/Component.h

commit e026347027e3bad2a09605ab03a4e4cb0526ac25
Author: carmichaelong <[email protected]>
Date:   Thu Aug 11 13:35:24 2016 -0700

    propagate the "find" part of getOutput to findAndConnect, fixes a test in testComponentInterface when connect() was called

commit 33d5129146571c9f64a4d665295d3e34a7dafca0
Merge: 930285f 414c687
Author: Christopher Dembia <[email protected]>
Date:   Thu Aug 11 13:27:04 2016 -0700

    Merge branch 'master' of github.com:opensim-org/opensim-core into fix-manager-constructor-default-integrator

commit 414c6877d22c206d3c7d34adaeabf7f0c5252163
Merge: 8253767 c3249c7
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 11 13:16:37 2016 -0700

    Merge pull request #1145 from opensim-org/iwyu

    clean up header includes and forward declarations

commit 44e0895cea770f69680c35c0b2b3bc4fae76ecd3
Author: Shrinidhi KL <[email protected]>
Date:   Thu Aug 11 13:06:36 2016 -0700

    Fix python tests.

commit 8253767ae639d3fd31bd5d3726865674180be2a0
Merge: 825c4c6 39c4a91
Author: Christopher Dembia <[email protected]>
Date:   Thu Aug 11 07:59:06 2016 -0700

    Merge pull request #1143 from opensim-org/implicit_pseudocode

    [sandbox] Pseudocode for implicit dynamics.

commit 2dc1299b6fe5b7fc322b1acf20405ac4b0595e9d
Author: Christopher Dembia <[email protected]>
Date:   Thu Aug 11 07:52:43 2016 -0700

    Fix python memory management for prescribeControlForActuator.

    Also improved the exceptions thrown by the method.

commit 825c4c66d480079d88bed466eac30d638751a9a2
Merge: 70707a0 581174f
Author: Christopher Dembia <[email protected]>
Date:   Thu Aug 11 06:09:57 2016 -0700

    Merge pull request #1168 from opensim-org/tkuchida-improveMusclePassiveForceReporting

    Improved muscle passive fiber force reporting

commit cea0d7afea74d68755f1f50a06a1e44dc057b53a
Author: Tom Uchida <[email protected]>
Date:   Thu Aug 11 03:07:50 2016 -0700

    MovingPathPoint::getLocation(state) should be called rather than get_location() (the latter returns the MovingPathPoint's unused "location" property). Fixes #1104

commit bf3e9166061b970089ed208227485896b07f0776
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 10 21:46:57 2016 -0700

    Set guess for initial fiber lengths to optimal fiber lengths. The same line was added to the analogous method in Millard2012EquilibriumMuscle at some point. Fixes #399

commit 934841e53137a3a3098a1b92f1a99dcd957365ee
Author: carmichaelong <[email protected]>
Date:   Wed Aug 10 17:10:06 2016 -0700

    remove findConnector method, make sure getConnector cannot do a path search

commit 581174f265c0c23a8c9e9fe634c0519ae299faf8
Merge: 0bb5c42 70707a0
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 10 15:09:29 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into tkuchida-improveMusclePassiveForceReporting

commit 70707a0af2a10b58dcb2e999a52d7802dfa1b584
Merge: e3b1495 dd9b83a
Author: Christopher Dembia <[email protected]>
Date:   Wed Aug 10 14:16:29 2016 -0700

    Merge pull request #1174 from opensim-org/tkuchida-fixDoxygenWarning

    [doxygen] Added missing escapes to `<` and `>`

commit dd9b83a3f0c789c941d699cd739ee95d63dbe880
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 10 14:11:39 2016 -0700

    Added missing escapes to doxygen. [ci skip]

commit e3b1495eb9d1aff219f1c64ecff3d7283e61e164
Merge: 724b426 f07b07d
Author: carmichaelong <[email protected]>
Date:   Wed Aug 10 14:02:54 2016 -0700

    Merge pull request #1155 from opensim-org/tkuchida-avoidUnsignedIntWrapThroughZero2

    Catch unsigned int wrap through zero following initSystem test in testComponents

commit 88c2188c04ebca44975c7907bd82ac687e24bcc4
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 10 13:59:50 2016 -0700

    Improved doxygen for getCoordinate() method in each derived class.

commit 5a66b03f7c1b1e4ebbe5777e26548c6dd5042133
Author: carmichaelong <[email protected]>
Date:   Wed Aug 10 13:17:32 2016 -0700

    remove "path searching" for getInput and getOutput methods

commit 724b42634513c2e9ebde27260d851e28a9b7dee1
Merge: 8cf1edb 98e2cdb
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 10 13:13:49 2016 -0700

    Merge pull request #1169 from opensim-org/jenhicks-update-notice

    Update grant numbers and year in NOTICE

commit 0bb5c42f5eb0ce5a47a813178b4bb244ea848bd9
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 10 12:43:42 2016 -0700

    Clarified doxygen for new accessors.

commit ac69d086c2e22f08709b33d7d3d00d05d5de8d0c
Merge: 689edc6 8cf1edb
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 10 12:33:58 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into tkuchida-improveMusclePassiveForceReporting

commit af8a4b29e59bf82102b48b9de4686059df289702
Author: Shrinidhi KL <[email protected]>
Date:   Wed Aug 10 11:59:12 2016 -0700

    Remove undistributable c3d files.

commit 854cc5b9651c059ddc967072155cd38ba29c7ee7
Merge: 860154f 76a2af0
Author: Christopher Dembia <[email protected]>
Date:   Wed Aug 10 10:18:12 2016 -0700

    Merge branch 'cli-docopt' of github.com:opensim-org/opensim-core into cli-docopt-with-superbuild

commit c3d42e02794c47f357ce3ea8ee06e2982277e4fc
Merge: 53875b5 8cf1edb
Author: Christopher Dembia <[email protected]>
Date:   Wed Aug 10 09:44:56 2016 -0700

    Merge branch 'master' of github.com:opensim-org/opensim-core into calcResidual_bindings

commit 76a2af09735f71a7323978dba9d42fd242d132ea
Author: Christopher Dembia <[email protected]>
Date:   Wed Aug 10 09:31:22 2016 -0700

    Address @tkuchida's feedback.

    1. print-xml: case-insensitive tool names.
    2. CHANGELOG.md: mentioned how to transition to the new command line tool.

    Also improved the documentation for print-xml and run-tool, including a
    description of the common Tools.

commit 98e2cdb4b3ea5d21dc0e3d880a73793e97b03a61
Author: Jen Hicks <[email protected]>
Date:   Wed Aug 10 08:41:47 2016 -0700

    Update grant numbers and year in NOTICE

    Fixes #672

commit 930285f0c4daf2c03ef20646d91dc1713b69258e
Merge: 5b5ac0f 8cf1edb
Author: Christopher Dembia <[email protected]>
Date:   Wed Aug 10 08:38:06 2016 -0700

    Merge branch 'master' of github.com:opensim-org/opensim-core into fix-manager-constructor-default-integrator

commit 5b5ac0f7423cea62b23ddfc354bbd9b16857fc59
Author: Christopher Dembia <[email protected]>
Date:   Wed Aug 10 08:37:22 2016 -0700

    Delete copy constructor for Manager.

commit 8cf1edbdf3c4f8cae2558802ebc1510451a589e2
Merge: c0f547f 4a34189
Author: Christopher Dembia <[email protected]>
Date:   Wed Aug 10 05:07:31 2016 -0700

    Merge pull request #1167 from opensim-org/tkuchida-testAppVeyorPlatform

    Switch to "Visual Studio 2015" AppVeyor image

commit 689edc65ea172574f85f399826c50ccf66ade4a9
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 10 03:26:22 2016 -0700

    Millard2012EquilibriumMuscle includes both conservative (elastic) and non-conservative (damping) terms when reporting passive fiber force. Improved documentation for Muscle::getPassiveFiberForce() and Muscle::getPassiveFiberForceAlongTendon(), and added outputs to Millard2012EquilibriumMuscle for reporting elastic and damping terms separately. Fixes #835

commit 29740a26f039f60d4d3f0d833b5f9ea191256232
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 10 00:47:20 2016 -0700

    Switch to "Visual Studio 2015" AppVeyor image

    See #1167. The "Previous Visual Studio 2015" image failed on #1116 and "Visual Studio 2015" passed on master (#1167); trying "Visual Studio 2015" on #1116.

commit 4a3418923c74c9d868d3b7b9f9ba107db0dd045b
Author: Tom Uchida <[email protected]>
Date:   Tue Aug 9 23:29:32 2016 -0700

    AppVeyor has been failing recently. Testing to see whether today's platform update helps.

commit b77dd4cfd51f860710326689534714fd239091f8
Author: Christopher Dembia <[email protected]>
Date:   Tue Aug 9 22:37:27 2016 -0700

    Remove ambiguous comparison operation.

commit 7c1587c7ef2a77049fae99ecb273d0846a78ca7b
Author: Christopher Dembia <[email protected]>
Date:   Tue Aug 9 22:35:54 2016 -0700

    Fix deprecated warning for ReferencePtr().

commit 485982b0a48c563173342f7f075f7271f44d7a42
Author: Tom Uchida <[email protected]>
Date:   Tue Aug 9 22:11:09 2016 -0700

    Removed single-argument version of Joint::constructCoordinate() to ensure the enum index is always confirmed to agree with the corresponding CoordinateIndex. Propagated to all joint types and added tests in testJoints.

commit 860154f5249d0a3875427725085fb1f60646ac32
Author: Shrinidhi KL <[email protected]>
Date:   Tue Aug 9 19:49:01 2016 -0700

    Upgrade travis cmake to 3.1.

commit 109f544424d2f0f691686598aaf73f00e29bbd1d
Author: Shrinidhi KL <[email protected]>
Date:   Tue Aug 9 18:20:08 2016 -0700

    Bump up cmake version requirement and add find_package.

commit 20272d2cd146985c97e9055a4ba849a721dd1bc9
Author: Shrinidhi KL <[email protected]>
Date:   Tue Aug 9 18:18:13 2016 -0700

    Add docopt to superbuild. [skip ci]

commit 21773bc91c89c27b6bebd030b235648955d7698d
Author: Tom Uchida <[email protected]>
Date:   Tue Aug 9 17:23:19 2016 -0700

    Joint::constructCoordinate() now takes an unsigned int as a second argument to verify that Coordinates are stored in the same order as the "Coord" enums are defined.

commit 2103480441fe6fd0ec2e990358e7ae2cb182e4ad
Author: Christopher Dembia <[email protected]>
Date:   Tue Aug 9 12:09:22 2016 -0700

    Reestore internally-managed integrator to Manager.

    We used to have a constructor to Manager that created an Integrator internally.
    This had been done in a way that led to memory leaks. We fixed the leak but
    removed the functionality where the Manager could create an Integrator
    internally. That's fine for C++ users, but this meant that MATLAB/Python users
    could no longer use the Manager. In this commit, the Manager can create its
    own internal integrator and also avoid leaks.

commit 935e2223e801884d75a40d8ea8a5ea3f559b4358
Merge: 3451f9d c0f547f
Author: Ayman Habib <[email protected]>
Date:   Mon Aug 8 16:21:37 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into visualize_wrap_contact

commit 3451f9de8a00cbe142f1a9ae0f6b4782cbb01867
Author: Ayman Habib <[email protected]>
Date:   Mon Aug 8 16:17:56 2016 -0700

    Avoid reusing model variable to attempt fixing test cass that fails in debug mode on one platform.

commit a1037fbfad60420744f8eb7d91a818ee92824db6
Author: Ayman Habib <[email protected]>
Date:   Mon Aug 8 11:48:40 2016 -0700

    Avoid creating .osim file to test appearance and use the model created programmatically directly

commit 780d88710eeb98f1acbe05323c430115b490dbcf
Merge: 8ed5688 5ce9696
Author: Ayman Habib <[email protected]>
Date:   Mon Aug 8 10:20:16 2016 -0700

    Merge branch 'master' into visualize_wrap_contact

commit c0f547ff7c78a8d1d3d920980433733f78a5d56f
Merge: d989989 c339522
Author: Christopher Dembia <[email protected]>
Date:   Mon Aug 8 07:44:29 2016 -0700

    Merge pull request #1157 from opensim-org/tkuchida-addLinkInContributingMd

    Link to "Guide to Building Doxygen" was missing

commit d989989957f0d939b0dd54881f2acfe0e726e950
Merge: 50369ea da2db75
Author: Ajay Seth <[email protected]>
Date:   Fri Aug 5 18:52:26 2016 -0700

    Merge pull request #1156 from opensim-org/tkuchida-ensureInitSystemHasBeenCalled

    Throw exception if user forgot to call initSystem()

commit da2db759a447412204219a8b64f46730167e1af1
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 5 14:39:17 2016 -0700

    Improved readability of test code.

commit c37ee4eea3811c83ef1068b65f628fe4b2864faf
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 5 14:27:49 2016 -0700

    Replaced OPENSIM_THROW_IF with OPENSIM_THROW_IF_FRMOBJ to (i) also report the concrete class name and (ii) avoid having to pass in the Component's name.

commit cc5700261b27ff31c29c7a9fa656546c79b79a8b
Author: Tom Uchida <[email protected]>
Date:   Fri Aug 5 13:50:34 2016 -0700

    Removed an unused member variable in PointKinematics. Memory for this variable was being allocated by calling Component::getNumStateVariables() from PointKinematics::setModel(), which occurred before Model::initSystem() had been called and was therefore throwing the new exception.

commit c339522ebf64acd92dbb2bdaf3806027fea4a295
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 3 21:49:33 2016 -0700

    Link to "Guide to Building Doxygen" was missing

    Added link. [ci skip]

commit fc6e1979ca2aa0135786f51f9bb154e543f55ae6
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 3 19:13:21 2016 -0700

    Repaired 2 of 4 broken test cases.

commit 1e32e8827a2261148c604c9c085902850478af37
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 3 16:28:02 2016 -0700

    Added throw to setStateVariableValue() and removed from setStateVariableDerivativeValue().

commit c061d652977049a0c91ae48721cc2ec10f2e69ba
Author: Tom Uchida <[email protected]>
Date:   Wed Aug 3 16:04:56 2016 -0700

    Added checks to ensure initSystem() has been called before attempting to access state, discrete, or cache variables owned by a Component or its descendants. An exception will be thrown that instructs the user to call initSystem() first (rather than reporting that the specified state variable was not found, for example). Added tests to testComponentInterface.cpp. Fixes #729

commit 50369ea26651d6257dc1574a13685590a2ba645d
Merge: 90168f8 0fcb525
Author: Ayman Habib <[email protected]>
Date:   Tue Aug 2 10:13:13 2016 -0700

    Merge pull request #1154 from opensim-org/tkuchida-deleteStaleCommentsInIKTool

    Deleted stale comments

commit f07b07d88c8cebc317a6497c0c7d8cb27ddcebd4
Author: Tom Uchida <[email protected]>
Date:   Mon Aug 1 21:49:11 2016 -0700

    Catch unsigned int wrap through zero following initSystem test; analogous to #1020 for copy/delete test. Now calling getCurrentRSS() only once when calculating increase in memory to guarantee that wrapping through zero is impossible. Updated messages in test 10 to match test 11. Fixes #1152

commit 0fcb5252e42309437b9f5bf3863e39260e5ecb7e
Author: Tom Uchida <[email protected]>
Date:   Mon Aug 1 21:29:06 2016 -0700

    Deleted stale comments. Fixes #1148 [ci skip]

commit 8ed5688beb1fb5d4ea6ecbbff2e58750213fba4d
Author: Ayman Habib <[email protected]>
Date:   Mon Aug 1 11:13:34 2016 -0700

    Change parameter name from body to frame in setFrame method declaration. Remaining references to body were intentionally left by previous PR and marked as deprecated for backward compatibility.

commit 113bab780c951059bd53e8ae61e5900f9f9ff23e
Author: Ajay Seth <[email protected]>
Date:   Fri Jul 29 10:40:00 2016 -0700

    Fixed comment typose

    [CI skip]

commit 8cac012245537093323381de8d34c5d3ca0575dd
Merge: 1f60baf 90168f8
Author: Ian Stavness <[email protected]>
Date:   Fri Jul 29 10:21:55 2016 -0600

    Merge remote-tracking branch 'upstream' into fix_marksubprop_bug

commit 3e02d6b8e7e86c44598c3b09d62b562161962bd3
Author: Ajay Seth <[email protected]>
Date:   Thu Jul 28 19:03:04 2016 -0700

    Turns out that CMC was failing close to the end locally, but was passing due to stale results in the build directory.
    Now that Tool failures cause the test to fail, tests cannot proceed to compare stale results.
    Reduced test duration to speedup test further an also avoid problematic region near the end of the motion where muscle is lengthening eccentrically.

commit 614c905c4dcaf96e7349cc56ffa88fde162779ee
Author: Ajay Seth <[email protected]>
Date:   Thu Jul 28 18:57:52 2016 -0700

    Added comparison of the muscle force between forward and CMC.
    Also added check that forward and CMC run to completion and fail otherwise.

commit c3249c7d83b5ead75836ba279cd40932da18713e
Merge: 64ad69e 90168f8
Author: carmichaelong <[email protected]>
Date:   Thu Jul 28 14:04:22 2016 -0700

    Merge branch 'master' into iwyu

commit 09def692e496c5eea7af7616a650abd82e380620
Author: Ayman Habib <[email protected]>
Date:   Thu Jul 28 13:10:21 2016 -0700

    Beef up test case for testVisualization to test the Color, Opacity and Representation settings.

commit 64ad69e4ff32b33adadba212362994b60ffd002d
Author: carmichaelong <[email protected]>
Date:   Wed Jul 27 23:05:34 2016 -0700

    iwyu Tools

commit e768991cb1897ca88336176cb6f705bd2c1ac71d
Author: carmichaelong <[email protected]>
Date:   Wed Jul 27 15:16:41 2016 -0700

    iwyu Analyses

commit 39c4a91956ddf723a83d71eb059b84c4dcc52f60
Author: Christopher Dembia <[email protected]>
Date:   Wed Jul 27 12:56:41 2016 -0700

    Pseudocode for implicit form.

commit b3229cadcf43061d8f758d246fbe8b91999e48dc
Author: carmichaelong <[email protected]>
Date:   Tue Jul 26 19:46:15 2016 -0700

    iwyu Manager

commit 54c08aa0a0398cc4c4e267a79827b52660b63ce1
Author: carmichaelong <[email protected]>
Date:   Tue Jul 26 17:30:42 2016 -0700

    iwyu Probe's

commit 3615406c736ab628e10383d7abe22163d1b41d53
Author: Ajay Seth <[email protected]>
Date:   Tue Jul 26 17:28:24 2016 -0700

    Shorten and improve single muscle CMC test. The same model is used, but the duration is shortened and the peek excitation was doubled.
    Movement is more dynamic (faster) and the controls are now being compared as well. In addition, this should be 5x faster than the previous test case.

commit 25354d6a67706c8303978a757f0d5c1ea3be18b2
Author: carmichaelong <[email protected]>
Date:   Tue Jul 26 16:29:40 2016 -0700

    iwyu complete simbodyengine

commit ec945534dfdc6c33809d8923870153169c6fc363
Author: carmichaelong <[email protected]>
Date:   Tue Jul 26 15:04:35 2016 -0700

    iwyu finish WrapMath and Simulation/Control

commit 2edc34f0b3bc807a9bde6a977749f6e4cc7e42ac
Author: Ayman Habib <[email protected]>
Date:   Tue Jul 26 14:46:32 2016 -0700

    Use SimTK colors (White, Cyan) instead of RGB values

commit fa8e539d6a7d8c06b51d8b2c3dc67c64fadcc301
Author: Tom Uchida <[email protected]>
Date:   Mon Jul 25 23:37:59 2016 -0700

    Updated enum names.

commit daadd6e663db2def33545b76ec23c507facae1b1
Merge: 2f7835e 90168f8
Author: Tom Uchida <[email protected]>
Date:   Mon Jul 25 22:47:15 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into tkuchida-addCoordinateAccessors

commit 90168f8d0abf32c7ff75c58a5ea5404e795ceafc
Merge: 5ce9696 a52bf7d
Author: Tom Uchida <[email protected]>
Date:   Mon Jul 25 22:34:45 2016 -0700

    Merge pull request #1141 from opensim-org/id_ik_tools_throw_for_empty_model_filename

    ID and IK Tools throw for empty model filename

commit 76cd07461d8edaa93c6eb3a35dcf4e02bc1df9b6
Author: carmichaelong <[email protected]>
Date:   Mon Jul 25 17:21:00 2016 -0700

    remove simtkcommon.h include from AbstractDataTable.h

commit a52bf7d0499bf2cdb20fdb17afd25434604b9ad8
Author: Ajay Seth <[email protected]>
Date:   Mon Jul 25 16:58:58 2016 -0700

    Remove namespace notation in error messages

commit ca80cae7887b6b0ae88bd7fc1742b9a3692a44bd
Author: carmichaelong <[email protected]>
Date:   Mon Jul 25 16:43:00 2016 -0700

    remove SimTKCommon.h include from PropertyDblVec.h

commit 5353827a5e15258d16efebfb89e0b58bf650d67f
Author: carmichaelong <[email protected]>
Date:   Mon Jul 25 15:41:13 2016 -0700

    finish iwyu on Force's

commit 7b86524b01f8060bffbbfe61dc4f64e601c649b4
Author: carmichaelong <[email protected]>
Date:   Mon Jul 25 15:19:24 2016 -0700

    start iwyu on remaining Force's. also clean up FunctionThresholdCondition

commit 900432a4064f80cb5761e9d0aba1938d825e9b61
Author: carmichaelong <[email protected]>
Date:   Mon Jul 25 14:39:49 2016 -0700

    iwyu Simulation/Wrap

commit a87b00cd8f4f0cad11c942ebac3427d248772cfc
Author: Ayman Habib <[email protected]>
Date:   Mon Jul 25 12:28:08 2016 -0700

    Beef up test case to include ContactMesh. Verified both visually and in text form that ContactMesh shows in correct location, appearance. Updated standard. Needed to update model version to latest and added some debugging code to test case to help visual debugging.

commit 1f60bafda1d60e72ed99de2c27d205367cadd90c
Author: aseth1 <[email protected]>
Date:   Mon Jul 25 10:17:17 2016 -0700

    Force SimTK::Array::push_back to use move constructor for SimTK::ReferencePtr and avoid the copy constructor which was resetting the Component pointer to null and causing downstream failures.

commit 1aece73388882097ab0b705c2598e08e7c517d84
Merge: e3de2e6 dae0563
Author: aseth1 <[email protected]>
Date:   Mon Jul 25 02:33:33 2016 -0700

    Merge branch 'fix_marksubprop_bug' of https://github.com/stavness/opensim-core into fix_marksubcomponent_invalidates

commit 2a359c1453211a964e80eb992db8ffb0031e149f
Author: carmichaelong <[email protected]>
Date:   Sun Jul 24 19:27:41 2016 -0700

    remove SimTKSimbody.h include from Model.h and fix downstream problems

commit 5ce969666e9ea92ab6d01798421e37b7c5a9758c
Merge: 44464d4 1ac6e13
Author: Christopher Dembia <[email protected]>
Date:   Sun Jul 24 16:17:23 2016 -0700

    Merge pull request #1131 from opensim-org/speed_up_testCMCEMGDrivenArm

    Split testCMCEMGDrivenArm into two to speed it up

commit 4973bc588d2821c99ea84f60bab2c908ade05c09
Author: carmichaelong <[email protected]>
Date:   Sun Jul 24 15:16:02 2016 -0700

    iwyu Marker and MarkerSet

commit 88086c443c7d847bf74ca9afb525b26ea1e8cbb4
Author: carmichaelong <[email protected]>
Date:   Sun Jul 24 14:13:13 2016 -0700

    iwyu through ContactGeometrySet and Force's dependent on ContactGeometry. update Station and PathPoint

commit b40cb7ac4e25f76a33e9e31c602c6d8fa1d2726c
Author: carmichaelong <[email protected]>
Date:   Sat Jul 23 20:14:27 2016 -0700

    push include of SimTKsimbody.h from ContactGeometry.h to ModelVisualizer.h

commit ecb87eed2967cce6f533928ee1d48b73c57fc3f6
Merge: 63292a0 44464d4
Author: Ajay Seth <[email protected]>
Date:   Sat Jul 23 12:54:45 2016 -0700

    Merge branch 'master' into tools_throw_for_empty_model_filename

commit 47787ef78ea670ef2c737b0d0feea045fe1ff9c7
Merge: e1e80bd 44464d4
Author: Christopher Dembia <[email protected]>
Date:   Sat Jul 23 12:01:50 2016 -0700

    Merge branch 'master' of github.com:opensim-org/opensim-core into cli-docopt

commit e1e80bdacaf6c0b8446ee965e3406b49143938c0
Author: Christopher Dembia <[email protected]>
Date:   Sat Jul 23 10:37:53 2016 -0700

    Cleanup in prep for PR (comments, cmake, etc.).

commit 0d1c33ca96f33b8dc01abd335598ace974ae0328
Author: Christopher Dembia <[email protected]>
Date:   Sat Jul 23 10:05:37 2016 -0700

    Improve CHANGELOG message about command-line tool.

commit 151f68d8777b87c3ec001ca8007e166540465cda
Author: carmichaelong <[email protected]>
Date:   Fri Jul 22 12:09:32 2016 -0700

    iwyu finish Constraint's

commit 57f1fbf4c97e1ea70c783898b8e8d7c4dacec53a
Author: carmichaelong <[email protected]>
Date:   Fri Jul 22 00:39:56 2016 -0700

    iwyu on some of Simulation/Model and most of Constraint's

commit 44464d4874fe70086e43a637affa4c058779a29d
Merge: e3de2e6 0ab6bdc
Author: Christopher Dembia <[email protected]>
Date:   Thu Jul 21 16:53:26 2016 -0700

    Merge pull request #1125 from opensim-org/implicit_proposal

    Proposal and thoughts about an interface for implicit form of dynamics.

commit 351d1e3ae9f44a19c520e4fdc39f65afe32da7ee
Author: carmichaelong <[email protected]>
Date:   Thu Jul 21 16:29:23 2016 -0700

    unnecessary include in Geometry

commit 30d354f65466aefab8696aaf4f0d5ab9d50f9d79
Author: carmichaelong <[email protected]>
Date:   Thu Jul 21 16:22:24 2016 -0700

    iwyu Coordinate and Frame + children of Frame

commit 760c224bb15fde5fe6f941a87d7f4260fe50d1e7
Author: carmichaelong <[email protected]>
Date:   Thu Jul 21 16:05:05 2016 -0700

    iwyu Joint's

commit 8efb6fe7d6422553c9075350104ca6264a647935
Author: carmichaelong <[email protected]>
Date:   Thu Jul 21 15:40:34 2016 -0700

    iwyu: some work on Probes and SegementedFunctions. Start on Joint

commit dfc7ad794ee3883ebe28a6b0c7de43d0ad8179ad
Author: carmichaelong <[email protected]>
Date:   Thu Jul 21 13:40:05 2016 -0700

    iwyu finish actuators

commit a0329558bfbfde6d06883a215c39de5ea4d00169
Author: carmichaelong <[email protected]>
Date:   Thu Jul 21 13:03:50 2016 -0700

    iwyu through Muscle classes and related classes

commit d3a80894e5fee1eed30e42bd4026d808e3d3be79
Author: carmichaelong <[email protected]>
Date:   Wed Jul 20 16:21:40 2016 -0700

    iwyu for PathActuator and derived classes

commit a2146bc722912a8650008cda8b2ca82d85bd3ede
Author: carmichaelong <[email protected]>
Date:   Wed Jul 20 15:31:59 2016 -0700

    iwyu path, pathpoint, pathwrap

commit 1bb7a4707e20388ed93e310e0c15545a72bb16c9
Author: carmichaelong <[email protected]>
Date:   Wed Jul 20 13:53:22 2016 -0700

    gcc fixes

commit 17395bb82456685f0112192a369077ff0e6b7711
Author: carmichaelong <[email protected]>
Date:   Wed Jul 20 12:01:31 2016 -0700

    add <fstream> to simmfilewriterdll files

commit 640b9ebb7a2eeb73891ea507356da7fe7ed8b068
Author: carmichaelong <[email protected]>
Date:   Wed Jul 20 11:03:12 2016 -0700

    remove include of Simbody.h from ComponentConnector.h and fix subsequent issues

commit 4721ee5b6ba602456aa02b5cd6f690d9c326f5fe
Author: carmichaelong <[email protected]>
Date:   Wed Jul 20 10:14:53 2016 -0700

    start working through actuators, geometry, and frames

commit e3de2e6ec1d8dfe8d6b4ff02383ba714776f54fa
Merge: 9ed9637 d790c9a
Author: Tom Uchida <[email protected]>
Date:   Wed Jul 20 00:31:53 2016 -0700

    Merge pull request #1127 from opensim-org/speed_up_testCMCArm26

    Split testCMCArm26 into two to speed it up.

commit d790c9ab3924c0e969b1ed12ead0268ae0fa5758
Author: Shrinidhi KL <[email protected]>
Date:   Tue Jul 19 19:03:40 2016 -0700

    Change "testARM..." to "testCMCARM..." to be consistent with filename.

commit 63292a0b841f89bd05e99cdb504b12b44f785145
Author: Ajay Seth <[email protected]>
Date:   Tue Jul 19 17:27:01 2016 -0700

    Add explicit check for empty (unspecified) model file in the InverseKinematicsTool and indicate in Exception message that model file name was not provided.

commit 0ddab776824765836ac58fee130a0aef43b311d4
Author: carmichaelong <[email protected]>
Date:   Tue Jul 19 13:34:35 2016 -0700

    continue iwyu on simulation. start work on solver, actuator, model, simbodyengine

commit 1ac6e13a7391addd508e5b07179a1c3afba43c52
Author: Shrinidhi KL <[email protected]>
Date:   Tue Jul 19 13:24:57 2016 -0700

    Correction -- 'testEMG...' to 'testCMCEMG...'.

commit 3bf6c757861693b35193bec5e6fd46aca20dd68f
Author: Shrinidhi KL <[email protected]>
Date:   Tue Jul 19 13:15:03 2016 -0700

    Split test into two files so ctest can run them in parallel.

commit 0466a6ce3235a8e1d2971650f062f2de7c596e8b
Author: Shrinidhi KL <[email protected]>
Date:   Tue Jul 19 11:03:05 2016 -0700

    Correct file header. Correct output string.

commit 0c015a079f5087166d533f56e82df60751caca2f
Author: Shrinidhi KL <[email protected]>
Date:   Tue Jul 19 00:39:48 2016 -0700

    Rename test file to be consistent with other one with same prefix.

commit a27b7114bccc8c70f0c8b68fe0dec98e3f4996bc
Author: Shrinidhi KL <[email protected]>
Date:   Mon Jul 18 17:17:58 2016 -0700

    Remove unnecessary string replacement.

commit 4e7ba72c4b4d0383de9d918a27a15bc28a59d716
Author: carmichaelong <[email protected]>
Date:   Mon Jul 18 15:57:54 2016 -0700

    iwyu ModelComponent, ModelComponentSet, Force, ForceSet

commit 234b9c61135242c8d3d0de9647a009be3f048e53
Author: Shrinidhi KL <[email protected]>
Date:   Mon Jul 18 15:10:54 2016 -0700

    Remove unncessary checking. Result of copy paste.

commit 3f4516ef2773fa7d24d5a270a35abb831e9ba80e
Author: Shrinidhi KL <[email protected]>
Date:   Mon Jul 18 15:07:08 2016 -0700

    Update copyright and file name in headers.

commit 595a3a39e5da76e58c400c447f0badf22fd6d6a1
Author: Shrinidhi KL <[email protected]>
Date:   Mon Jul 18 14:58:50 2016 -0700

    Split testCMCArm26 into two to speed it up.

commit 8376b01692da87dd79a1f0132d60fe50d897cad1
Author: carmichaelong <[email protected]>
Date:   Mon Jul 18 14:07:57 2016 -0700

    iwyu AbstractTool and ModelComponent

commit 9ed9637bf0dbd1fb6abbc4d8175fd2a2f1e6f657
Merge: d10cfd7 5b4eefe
Author: Ayman Habib <[email protected]>
Date:   Mon Jul 18 13:27:11 2016 -0700

    Merge pull request #1126 from opensim-org/fix_Mat_bindings

    Allow SWIG to recognize that Mat33, etc is wrapped.

commit e80fa005f224f4c3589739f370f2cee3de85eabf
Author: carmichaelong <[email protected]>
Date:   Mon Jul 18 11:41:48 2016 -0700

    finish iwyu through osimCommon

commit ada336d1d551cb8fb2220523211f6a2e52e553f0
Author: carmichaelong <[email protected]>
Date:   Sat Jul 16 16:33:59 2016 -0700

    cleanup headers in Adapter's

commit 4724505efd211138c81ff38e9ace112b2d23ed66
Author: carmichaelong <[email protected]>
Date:   Sat Jul 16 16:17:09 2016 -0700

    FunctionAdapter, IO, MarkerData, MarkerFrame, Mtx, Signal, SimmIO

commit 8b0d7faa87588bb4c4a5d58998c439af419f6963
Author: carmichaelong <[email protected]>
Date:   Sat Jul 16 15:33:59 2016 -0700

    VectorFunction and VectorFunctionUncoupledNxN

commit 18edf7e3f70ffeaf6436a3299a390e9536a6cca6
Author: carmichaelong <[email protected]>
Date:   Sat Jul 16 15:27:14 2016 -0700

    XYFunctionInterface fwd-decls

commit 09c35e9dd95ec8959e5f826a5dac24c05c65f91a
Author: carmichaelong <[email protected]>
Date:   Sat Jul 16 15:20:20 2016 -0700

    different types of Function and SimmSpline

commit d1c0cbc2cdb02b51a3281fce7f04a10f5faeb2b4
Author: carmichaelong <[email protected]>
Date:   Sat Jul 16 14:53:42 2016 -0700

    DebugUtilities, GCVSplineSet, Storage, Units, XMLDocument

commit 58cdb156084957bdbb67e9b60d1e22c4ea8bddb6
Author: carmichaelong <[email protected]>
Date:   Sat Jul 16 12:18:10 2016 -0700

    clean up Constant, FunctionSet, GCVSpline

commit 6cde3df15521dec2a87dc45e6a6cdc1667eee70a
Author: carmichaelong <[email protected]>
Date:   Sat Jul 16 12:00:08 2016 -0700

    remove unnecessary includes in Function.h and Function.cpp. trouble with replacing include of SimTKmath.h with more specific headers

commit b7dfa903d45a601f6dcdb5bdd2b2f17dd4b04cf7
Author: Christopher Dembia <[email protected]>
Date:   Fri Jul 15 20:27:24 2016 -0700

    Fix bug with chDir in Object::makeObjectFromFile().

commit a77abf0f0d969e873326c2b1a408fd57abf7037e
Merge: d060b7b d10cfd7
Author: Christopher Dembia <[email protected]>
Date:   Fri Jul 15 20:06:48 2016 -0700

    Merge branch 'master' of github.com:opensim-org/opensim-core into cli-docopt

commit 5b4eefee73503d0f171580189b4e1cb1631c0f24
Author: Christopher Dembia <[email protected]>
Date:   Fri Jul 15 20:02:38 2016 -0700

    Allow SWIG to recognize that Mat33, etc is wrapped.

    Previously, SWIG did not know about the Mat33 typedef, so if SWIG saw
    Mat33 in a header file, it would not know that it was the same type that it
    had already wrapped.

commit da12aec88343fbeed80b4e53372626fc7d73584f
Author: carmichaelong <[email protected]>
Date:   Fri Jul 15 14:44:28 2016 -0700

    cleanup Property* and fix other compile errors

commit a9d08e43d2a9263573304d4bd87c1301155d733c
Author: carmichaelong <[email protected]>
Date:   Fri Jul 15 12:09:35 2016 -0700

    cleanup Object and ObjectGroup

commit a962088bb0eb54658f7e1d9eaaeef65cc858061d
Author: carmichaelong <[email protected]>
Date:   Thu Jul 14 17:14:40 2016 -0700

    remove XMLDocument.h from Object.h and fix compile errors from it

commit 21ebf915fb5caf8c0f6cdefd3ce5fcbb73b84ab1
Author: carmichaelong <[email protected]>
Date:   Thu Jul 14 16:36:08 2016 -0700

    cleanup Component and ComponentList

commit 927e1a52c925972224cd04ebfdb99b7dca5ba634
Author: carmichaelong <[email protected]>
Date:   Thu Jul 14 16:03:00 2016 -0700

    clean includes on Property.h and Property.cpp. fix export issue with AbstractProperty.h

commit 0e2951479e0ad55def5de0bdf7c604bf1cce5066
Author: carmichaelong <[email protected]>
Date:   Thu Jul 14 14:35:21 2016 -0700

    remove unnecessary includes from About.cpp

commit d10cfd7f8cb7eb406d200d13f2dcab2e09418755
Merge: 4399a79 2aa43a5
Author: Ajay Seth <[email protected]>
Date:   Thu Jul 14 13:33:25 2016 -0700

    Merge pull request #972 from opensim-org/loadlibrary-exactpath

    Add LoadOpenSimLibraryExact()

commit a315fdc879489bc14473678661a4214f7cdb64b1
Merge: 5fac3b9 f80ad5a
Author: Ayman Habib <[email protected]>
Date:   Thu Jul 14 10:56:43 2016 -0700

    Merge branch 'visualize_wrap_contact' of https://github.com/opensim-org/opensim-core into visualize_wrap_contact

commit 5fac3b9a74089bb90e269361569524b3743db8b5
Author: Ayman Habib <[email protected]>
Date:   Mon Jun 20 00:21:05 2016 -0700

    Implement ContactMesh::generateDecorations

commit ddbd991458e4f282c21c15e9377ce46bcdf799a5
Author: Ayman Habib <[email protected]>
Date:   Mon Jun 20 00:20:03 2016 -0700

    Replace color and representation properties with a full Appearance object

commit 752d04a4ebd46bf143e5a48981c4aad77a22e6d5
Author: Ayman Habib <[email protected]>
Date:   Mon Jun 20 00:17:47 2016 -0700

    Replace color and display_preference wityh an Appearance object.

commit 4257e876406f5297dc3cbff3b0ffc495a7edf393
Author: Ayman Habib <[email protected]>
Date:   Mon Jun 20 00:16:32 2016 -0700

    Remove CurveProperties until needed, change texture into a name rather than file name to give freedom to visualizer.

commit 0ab6bdccc6b593234a65d0652584c75fcce0826e
Author: Christopher Dembia <[email protected]>
Date:   Wed Jul 13 16:32:00 2016 -0700

    Add parts of Scheme B.

commit 4399a7962e72215a74a93aa2eb7b206de86d5382
Merge: 8a3b417 0337d54
Author: Christopher Dembia <[email protected]>
Date:   Wed Jul 13 14:50:56 2016 -0700

    Merge pull request #1103 from opensim-org/doubleconst_swig

    Fix gcc 5.2 error about "duplicate const" in bindings.

commit dae056385743af0b41e8806cb15b813c4ff60713
Author: Ian Stavness <[email protected]>
Date:   Tue Jul 12 20:22:44 2016 -0600

    removed test case

commit 074d509785f9febc54125fc3779ce4ce5d38024c
Author: Ian Stavness <[email protected]>
Date:   Tue Jul 12 20:21:46 2016 -0600

    replaced tab char with spaces

commit f3b33cf36beced7ca3b7584523d6c82bc1945b8d
Merge: 333d93c 8a3b417
Author: Ian Stavness <[email protected]>
Date:   Tue Jul 12 20:16:42 2016 -0600

    Merge remote-tracking branch 'upstream/master' into fix_marksubprop_bug

commit 8a3b4171db7e8a0081610358ab8320d23875418e
Merge: a51f567 c7a31a9
Author: Christopher Dembia <[email protected]>
Date:   Mon Jul 11 16:34:30 2016 -0700

    Merge pull request #1102 from opensim-org/remove_testComponents_limit_to_ModelComponent

    Update testComponents to use addComponent

commit 849c5aa8c99fb37a7808b9e9f28cf2f21e9256f6
Author: Ajay Seth <[email protected]>
Date:   Mon Jul 11 15:00:31 2016 -0700

    Update Object exception when XMLDocument name is empty.
    Add explicit check in InverseDynamicsTool so that empty filename error is completely obvious and appears in the out.log.

commit a51f567107131f4760c76a726a602c1aae349634
Merge: 2009aa5 7cb0900
Author: Christopher Dembia <[email protected]>
Date:   Mon Jul 11 14:40:52 2016 -0700

    Merge pull request #1106 from opensim-org/gitignore-clion-settings

    [gitignore] Ignore settings directory from CLion IDE

commit 2f7835ed9109a2fd2773fda86de4d448061f4eb2
Author: Tom Uchida <[email protected]>
Date:   Thu Jul 7 00:54:29 2016 -0700

    Improved doxygen and added comment to "using Joint::getCoordinate;" line.

commit d32378d4e162280ce2915c4fbe2acd9767e6a65c
Author: Christopher Dembia <[email protected]>
Date:   Thu Jul 7 00:03:11 2016 -0700

    Add ImplicitDifferentialEquations proposal to sandbox.

commit 3903c4dd63961c7bda4b9bc3b9cb8b6a447f1f97
Author: Tom Uchida <[email protected]>
Date:   Wed Jul 6 15:56:39 2016 -0700

    Added to test.

commit f7e8b5fc87df8bce6c11ebf53dec212b6dac11ed
Merge: 61aabba 2009aa5
Author: Tom Uchida <[email protected]>
Date:   Wed Jul 6 15:39:15 2016 -0700

    Merge branch 'master' of https://github.com/opensim-org/opensim-core into tkuchida-addCoordinateAccessors

commit 03b1c6a58e2e21ccd413164217975d823352841c
Author: carmichaelong <[email protected]>
Date:   Wed Jul 6 10:28:53 2016 -0700

    update comments for doxygen

commit 2009aa5673dbf932bc3b107041ccd614a77983fc
Merge: 72fb99d 5d4e77e
Author: Christopher Dembia <[email protected]>
Date:   Wed Jul 6 10:11:59 2016 -0700

    Merge pull request #1078 from opensim-org/tkuchida-updateHopperExample

    Improvements to hopper example

commit 72fb99d0091be57e58db90c4b18011e972a73af8
Merge: bbe565c c38c540
Author: Tom Uchida <[email protected]>
Date:   Tue Jul 5 19:41:21 2016 -0700

    Merge pull request #1115 from opensim-org/appveor-previous-msvc2015

    [appveyor] Workaround for MSVC Update 3 bug

commit 61aabba0c5b4664c5b3d97831c0d2405df310b05
Author: Shrinidhi KL <[email protected]>
Date:   Tue Jul 5 18:27:27 2016 -0700

    Fix names in tests.

commit b8c8c468cd2b1f54ec0a531e6d016e207f30f39d
Author: Shrinidhi KL <[email protected]>
Date:   Tue Jul 5 18:27:01 2016 -0700

    Pull previously hidden base class methods. Rename enum to be short.

commit 81fab4419cfd4cb915a9fef5394f1e553fc47aae
Author: Shrinidhi KL <[email protected]>
Date:   Tue Jul 5 18:25:31 2016 -0700

    Change implementations so one calls the other and also use more specific exceptions.

commit 360ebc489438a478874d92d7fd50b9795514de06
Author: Shrinidhi KL <[email protected]>
Date:   Tue Jul 5 18:24:45 2016 -0700

    Add exception to mean "empty coordinate set".

commit c38c540ff6bc26b681fe5faf6a6a49e9c897cebc
Author: Christopher Dembia <[email protected]>
Date:   Tue Jul 5 16:42:46 2016 -0700

    [appveyor] Workaround for MSVC Update 3 bug

    Update 3 to MSVC 2015 might be causing "internal compiler errors."

    Thanks @carmichaelong for the detective work.

    https://www.appveyor.com/updates
    https://connect.microsoft.com/VisualStudio/Feedback/Details/2896447
    https://connect.microsoft.com/VisualStudio/feedback/details/2869042/new-internal-compiler-error-only-in-vs2015-update-3

commit ec27de606683b013e42478553ec8ccbe6b4b50e1
Author: Tom Uchida <[email protected]>
Date:   Tue Jul 5 14:54:17 2016 -0700

    Addresses part of #1066. Work in progress. [ci skip]

commit c7a31a96a34d5e1542b52b3d9412b2d0500e255…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants