Rule of five; more code clean up

opensim-org · Aug 30, 2023 · c383f64 · c383f64
1 parent ce3b0c4
commit c383f64
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 12 deletions.
diff --git a/OpenSim/Actuators/ModelFactory.cpp b/OpenSim/Actuators/ModelFactory.cpp
@@ -173,8 +173,7 @@ void ModelFactory::replaceMusclesWithPathActuators(OpenSim::Model &model) {
         model.addForce(actu);
 
         // Copy the muscle's path.
-        AbstractPath& path = musc.updPath();
-        if (auto* pGeometryPath = dynamic_cast<GeometryPath*>(&path)) {
+        if (auto* pGeometryPath = musc.tryUpdPath<GeometryPath>()) {
             GeometryPath& thisGeometryPath = actu->initGeometryPath();
 
             // For the connectee names in the PathPoints to be correct, we must

diff --git a/OpenSim/Simulation/Model/AbstractPath.cpp b/OpenSim/Simulation/Model/AbstractPath.cpp
@@ -40,6 +40,10 @@ AbstractPath::~AbstractPath() noexcept = default;
 
 AbstractPath& AbstractPath::operator=(const AbstractPath&) = default;
 
+AbstractPath::AbstractPath(AbstractPath&& other) noexcept = default;
+
+AbstractPath& AbstractPath::operator=(AbstractPath&& other) noexcept = default;
+
 // DEFAULTED METHODS
 const SimTK::Vec3& AbstractPath::getDefaultColor() const
 {
@@ -61,4 +65,4 @@ void AbstractPath::setPreScaleLength(const SimTK::State&,
         double preScaleLength)
 {
     _preScaleLength = preScaleLength;
-}
+}
diff --git a/OpenSim/Simulation/Model/AbstractPath.h b/OpenSim/Simulation/Model/AbstractPath.h
@@ -77,10 +77,13 @@ OpenSim_DECLARE_ABSTRACT_OBJECT(AbstractPath, ModelComponent);
 // METHODS
 //=============================================================================
     AbstractPath();
-    AbstractPath(const AbstractPath&);
     ~AbstractPath() noexcept;
-
+
+    AbstractPath(const AbstractPath&);
     AbstractPath& operator=(const AbstractPath&);
+
+    AbstractPath(AbstractPath&& other) noexcept;
+    AbstractPath& operator=(AbstractPath&& other) noexcept;
 
     // INTERFACE METHODS
     //

diff --git a/OpenSim/Simulation/Model/Blankevoort1991Ligament.h b/OpenSim/Simulation/Model/Blankevoort1991Ligament.h
@@ -236,7 +236,7 @@ OpenSim_DECLARE_CONCRETE_OBJECT(Blankevoort1991Ligament, Force)
         double linear_stiffness, double slack_length);
 
     // Path
-    bool hasPath() const override { return true;};
+    bool hasPath() const override { return true; };
 
     AbstractPath& updPath() { return upd_path(); }
     const AbstractPath& getPath() const { return get_path(); }

diff --git a/OpenSim/Simulation/Model/Ligament.h b/OpenSim/Simulation/Model/Ligament.h
@@ -74,7 +74,7 @@ OpenSim_DECLARE_CONCRETE_OBJECT(Ligament, Force);
     //--------------------------------------------------------------------------
     // PATH
     //--------------------------------------------------------------------------
-    bool hasPath() const override { return true;};
+    bool hasPath() const override { return true; };
 
     AbstractPath& updPath() { return upd_path(); }
     const AbstractPath& getPath() const { return get_path(); }

diff --git a/OpenSim/Simulation/Model/Muscle.h b/OpenSim/Simulation/Model/Muscle.h
@@ -430,7 +430,7 @@ OpenSim_DECLARE_ABSTRACT_OBJECT(Muscle, PathActuator);
 
     /** Potential energy stored by the muscle */
     double computePotentialEnergy(const SimTK::State& state) const override;
-    
+
     /** Override PathActuator virtual to calculate a preferred color for the 
     muscle path based on activation. **/
     SimTK::Vec3 computePathColor(const SimTK::State& state) const override;
@@ -440,7 +440,7 @@ OpenSim_DECLARE_ABSTRACT_OBJECT(Muscle, PathActuator);
     void extendAddToSystem(SimTK::MultibodySystem& system) const override;
     void extendSetPropertiesFromState(const SimTK::State &s) override;
     void extendInitStateFromProperties(SimTK::State& state) const override;
-
+    
     // Update the display geometry attached to the muscle
     virtual void updateGeometry(const SimTK::State& s);
     // End of Interfaces imposed by parent classes.

diff --git a/OpenSim/Simulation/Model/PathActuator.h b/OpenSim/Simulation/Model/PathActuator.h
@@ -66,7 +66,7 @@ class OSIMSIMULATION_API PathActuator : public ScalarActuator {
     // GET AND SET
     //--------------------------------------------------------------------------
     // Path
-    bool hasPath() const override { return true;};
+    bool hasPath() const override { return true; };
 
     AbstractPath& updPath() { return upd_path(); }
     const AbstractPath& getPath() const { return get_path(); }

diff --git a/OpenSim/Simulation/Model/PathSpring.h b/OpenSim/Simulation/Model/PathSpring.h
@@ -117,7 +117,7 @@ OpenSim_DECLARE_CONCRETE_OBJECT(PathSpring, Force);
     void setDissipation(double dissipation);
 
     /** get/set the path object */
-    bool hasPath() const override { return true;};
+    bool hasPath() const override { return true; };
 
     AbstractPath& updPath() { return upd_path(); }
     const AbstractPath& getPath() const { return get_path(); }

diff --git a/OpenSim/Tests/Wrapping/testWrapCylinder.cpp b/OpenSim/Tests/Wrapping/testWrapCylinder.cpp
@@ -452,7 +452,7 @@ namespace {
         // Trigger computing the wrapping path (realizing the state will not).
         model.getComponent<PathSpring>("spring").getLength(state);
         const WrapResult wrapResult = model.getComponent<PathSpring>("spring")
-                .getPath<GeometryPath>()
+                .getGeometryPath()
                 .getWrapSet()
                 .get("pathwrap")
                 .getPreviousWrap();