Skip to content

Force::isDisabled -->> Force::appliesForce #1407

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 158 commits into from
Dec 14, 2016

Conversation

klshrinidhi
Copy link
Contributor

Addressing #845 only for Force.
Future PRs will address rest.

The challenge here was that the `isList` attribute of Inputs is not preserved
upon deserialization. The temporary solution was to set the default `isList`
value to true for Inputs, and then to re-set its value in
finalizeFromProperties().
This commit reverts the model used in the testStaticOptimization passive force
test to version 30000. Previously, the model was at version 30503, but we
changed the Station connector's name from reference_frame to parent_frame after
30503 was first created.

This commit also adds better exceptions to catch the error that happened. The
new checks make sure that the properties for connectors/inputs are the ones the
component is expecting.
…urce_filename_property' into serialize-inputs
Previously, Marker::updateFromXMLNode() had been invoking
Object::updateFromXMLNode() instead of Super::updateFromXMLNode().
The connectee_name property now lives in the containing Component instead of in the Connector class.
There is a lot left to do, but the tests mostly pass with this commit.
connector_<name>_connectees changed to:

connector_<name>_connectee_name
input_<name>_connectee_name
input_<name>_connectee_names
Delete a bunch of code from the previous implementation of the Connector's connectee_name.

Also updated some comments/doxygen.
Use Component& instead. This required giving out-of-line definitions for some methods.

Still need to figure out what the best solution is with regard to const-correctness.
Also got rid of default constructors for Connectors.
chrisdembia and others added 20 commits December 5, 2016 15:03
Ensure Path::_separator and Path::_isAbsolute are always initialized
Fixed assert_almost_equal where tol was not used
Remove obsolete comment and messages
…macros

Reveal macro-generated Object methods in doxygen.
…rning

Get rid of TwoFrameLinker::scale() warning on clang.
Throw exception when requesting value of unconnected input.
…github.com/opensim-org/opensim-core into issue_845_force_isDisabled_to_appliesForce_aseth

# Conflicts:
#	OpenSim/Common/XMLDocument.cpp
@aseth1
Copy link
Member

aseth1 commented Dec 12, 2016

Appears the diff is with master at the time this PR was opened. Find the current diff with master here. Sorry for the inconvenience.

@chrisdembia
Copy link
Member

In my first review, I asked if the doxygen output for Force looked okay. Here is how it looks:

image

I think this looks a little confusing (it is not clear that the comment refers to the appliesForce property) and messy, and is not what @klshrinidhi intended.

But this is a minor comment, and it can be ignored.

@chrisdembia
Copy link
Member

The XMLDocument number should be 30509; 30508 is from my PR about connector/input serialization.

@aseth1
Copy link
Member

aseth1 commented Dec 14, 2016

@chrisdembia I updated the doxygen and description for the appliesForce property and incremented the version number as suggested. The Travis failure was due a temporary loss of connection.

@chrisdembia chrisdembia merged commit 126319d into master Dec 14, 2016
@chrisdembia chrisdembia deleted the issue_845_force_isDisabled_to_appliesForce branch December 14, 2016 18:23
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.

8 participants