Undo binding of model getCoordinatesInMultibodyTreeOrder and introduc… #3666
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#3656) * Undo binding of model getCoordinatesInMultibodyTreeOrder and introduce getCoordinateNamesInMultibodyTreeOrder for scripting users * Fix dereferencing the ReferencePtr and exercise in test case * Fix compilation warnings/errors on linux and call site to index the SimTKArray * Fix int/size_t mixup that causes compilation errors on linux * Update CHANGELOG.md Use updated function name * Address feedback on PR in test, changelog language
* Add missing types * Add tests to check BufferedOrientationReference * Update CHANGELOG * Add test case for appending data to oRefs Co-authored-by: Zach Strout <[email protected]>
adamkewley
reviewed
Jan 11, 2024
| @@ -79,19 +79,19 @@ class OSIMSIMULATION_API BufferedOrientationsReference | |||
| SimTK::Array_<SimTK::Rotation_<double>>& values) const override; | |||
|
|
|||
| /** add passed in values to data procesing Queue */ | |||
| void putValues(double time, const SimTK::RowVector_<SimTK::Rotation>& dataRow); | |||
| void putValues(double time, const SimTK::RowVector_<SimTK::Rotation_<double>>& dataRow); | |||
There was a problem hiding this comment.
Isn't SimTK::Rotation an alias for SimTK::Rotation_<SimTK::Real>, with SimTK::Real usually being an alias for double (i.e. the before and after are equivalent for OpenSim)?
| @@ -943,6 +943,14 @@ OpenSim_OBJECT_NONTEMPLATE_DEFS(Model, ModelComponent); | |||
| std::vector<SimTK::ReferencePtr<const OpenSim::Coordinate>> | |||
| getCoordinatesInMultibodyTreeOrder() const; | |||
|
|
|||
| /** A variant of getCoordinatesInMultibodyTreeOrder that returns names for Scripting users */ | |||
| SimTK::Array_<std::string> getCoordinateNamesInMultibodyTreeOrder() { | |||
There was a problem hiding this comment.
Imo, should be in .cpp file - there's no upside to inlining it (it's not templated, and it's doing a fairly large amount of work)
| /** A variant of getCoordinatesInMultibodyTreeOrder that returns names for Scripting users */ | ||
| SimTK::Array_<std::string> getCoordinateNamesInMultibodyTreeOrder() { | ||
| SimTK::Array_<std::string> namesArray; | ||
| auto coords = getCoordinatesInMultibodyTreeOrder(); |
There was a problem hiding this comment.
coords is a std::vector<T>, so this can be rewritten as:
const auto coords = getCoordinatesInMultibodyTreeOrder();
SimTK::Array_<std::string> namesArray;
namesArray.reserve(coords.size()); // prevent a reallocation
for (const auto& coord : coords) {
namesArray.push_back(coord.getName());
}
|
@aymanhab, are the changes here included in the OpenSim 4.5 release? If so, we should get them merged in soon. |
|
Yes, changes were made in 4.5 and backported to main so closing. Thanks @nickbianco |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…… (#3656)
Undo binding of model getCoordinatesInMultibodyTreeOrder and introduce getCoordinateNamesInMultibodyTreeOrder for scripting users
Fix dereferencing the ReferencePtr and exercise in test case
Fix compilation warnings/errors on linux and call site to index the SimTKArray
Fix int/size_t mixup that causes compilation errors on linux
Update CHANGELOG.md
Use updated function name
Fixes issue #<issue_number>
Brief summary of changes
Testing I've completed
Looking for feedback on...
CHANGELOG.md (choose one)
This change is