use OPENSIM_ASSERT instead of SimTK_ASSERT

opensim-org · Dec 15, 2023 · fe280e9 · fe280e9
1 parent 971f018
commit fe280e9
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 22 deletions.
diff --git a/OpenSim/Actuators/ActiveForceLengthCurve.cpp b/OpenSim/Actuators/ActiveForceLengthCurve.cpp
@@ -153,24 +153,26 @@ void ActiveForceLengthCurve::setMinValue(double minimumValue)
 //==============================================================================
 double ActiveForceLengthCurve::calcValue(double normFiberLength) const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "ActiveForceLengthCurve: Curve is not up-to-date with its properties");
     return m_curve.calcValue(normFiberLength);
 }
 
 SmoothSegmentedFunction::ValueAndDerivative ActiveForceLengthCurve::
     calcValueAndDerivative(double normFiberLength) const
 {
-    SimTK_ASSERT(
-        isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "ActiveForceLengthCurve: Curve is not up-to-date with its properties");
     return m_curve.calcValueAndFirstDerivative(normFiberLength);
 }
 
 double ActiveForceLengthCurve::calcDerivative(double normFiberLength,
                                               int order) const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "ActiveForceLengthCurve: Curve is not up-to-date with its properties");
     SimTK_ERRCHK1_ALWAYS(order >= 0 && order <= 2,
         "ActiveForceLengthCurve::calcDerivative",
@@ -188,7 +190,8 @@ double ActiveForceLengthCurve::
 
 SimTK::Vec2 ActiveForceLengthCurve::getCurveDomain() const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "ActiveForceLengthCurve: Curve is not up-to-date with its properties");
 
     return m_curve.getCurveDomain();

diff --git a/OpenSim/Actuators/FiberForceLengthCurve.cpp b/OpenSim/Actuators/FiberForceLengthCurve.cpp
@@ -214,24 +214,26 @@ void FiberForceLengthCurve::setOptionalProperties(double aStiffnessAtLowForce,
 //==============================================================================
 double FiberForceLengthCurve::calcValue(double normFiberLength) const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "FiberForceLengthCurve: Curve is not up-to-date with its properties");
     return m_curve.calcValue(normFiberLength);
 }
 
 SmoothSegmentedFunction::ValueAndDerivative FiberForceLengthCurve::
     calcValueAndDerivative(double normFiberLength) const
 {
-    SimTK_ASSERT(
-        isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "FiberForceLengthCurve: Curve is not up-to-date with its properties");
     return m_curve.calcValueAndFirstDerivative(normFiberLength);
 }
 
 double FiberForceLengthCurve::calcDerivative(double normFiberLength,
                                              int order) const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "FiberForceLengthCurve: Curve is not up-to-date with its properties");
     SimTK_ERRCHK1_ALWAYS(order >= 0 && order <= 2,
         "FiberForceLengthCurve::calcDerivative",
@@ -249,7 +251,8 @@ double FiberForceLengthCurve::
 
 double FiberForceLengthCurve::calcIntegral(double normFiberLength) const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "FiberForceLengthCurve: Curve is not up-to-date with its properties");
 
     if(!m_curve.isIntegralAvailable()) {
@@ -263,7 +266,8 @@ double FiberForceLengthCurve::calcIntegral(double normFiberLength) const
 
 SimTK::Vec2 FiberForceLengthCurve::getCurveDomain() const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "FiberForceLengthCurve: Curve is not up-to-date with its properties");
     return m_curve.getCurveDomain();
 }

diff --git a/OpenSim/Actuators/ForceVelocityCurve.cpp b/OpenSim/Actuators/ForceVelocityCurve.cpp
@@ -171,24 +171,26 @@ void ForceVelocityCurve::setEccentricCurviness(double aEccentricCurviness)
 //==============================================================================
 double ForceVelocityCurve::calcValue(double normFiberVelocity) const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "ForceVelocityCurve: Curve is not up-to-date with its properties");
     return m_curve.calcValue(normFiberVelocity);
 }
 
 SmoothSegmentedFunction::ValueAndDerivative ForceVelocityCurve::
     calcValueAndDerivative(double normFiberVelocity) const
 {
-    SimTK_ASSERT(
-        isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "ForceVelocityCurve: Curve is not up-to-date with its properties");
     return m_curve.calcValueAndFirstDerivative(normFiberVelocity);
 }
 
 double ForceVelocityCurve::calcDerivative(double normFiberVelocity,
                                           int order) const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "ForceVelocityCurve: Curve is not up-to-date with its properties");
     SimTK_ERRCHK1_ALWAYS(order >= 0 && order <= 2,
         "ForceVelocityCurve::calcDerivative",
@@ -206,7 +208,8 @@ double ForceVelocityCurve::
 
 SimTK::Vec2 ForceVelocityCurve::getCurveDomain() const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "ForceVelocityCurve: Curve is not up-to-date with its properties");
     return m_curve.getCurveDomain();
 }

diff --git a/OpenSim/Actuators/TendonForceLengthCurve.cpp b/OpenSim/Actuators/TendonForceLengthCurve.cpp
@@ -218,24 +218,26 @@ SimTK::Function* TendonForceLengthCurve::createSimTKFunction() const
 //==============================================================================
 double TendonForceLengthCurve::calcValue(double aNormLength) const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "TendonForceLengthCurve: Tendon is not up-to-date with its properties");
     return m_curve.calcValue(aNormLength);
 }
 
 SmoothSegmentedFunction::ValueAndDerivative TendonForceLengthCurve::
     calcValueAndDerivative(double aNormLength) const
 {
-    SimTK_ASSERT(
-        isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "TendonForceLengthCurve: Tendon is not up-to-date with its properties");
     return m_curve.calcValueAndFirstDerivative(aNormLength);
 }
 
 double TendonForceLengthCurve::calcDerivative(double aNormLength,
                                               int order) const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "TendonForceLengthCurve: Tendon is not up-to-date with its properties");
     SimTK_ERRCHK1_ALWAYS(order >= 0 && order <= 2,
         "TendonForceLengthCurve::calcDerivative",
@@ -253,7 +255,8 @@ double TendonForceLengthCurve::
 
 double TendonForceLengthCurve::calcIntegral(double aNormLength) const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "TendonForceLengthCurve: Tendon is not up-to-date with its properties");
 
     if (!m_curve.isIntegralAvailable()) {
@@ -267,7 +270,8 @@ double TendonForceLengthCurve::calcIntegral(double aNormLength) const
 
 SimTK::Vec2 TendonForceLengthCurve::getCurveDomain() const
 {
-    SimTK_ASSERT(isObjectUpToDateWithProperties(),
+    OPENSIM_ASSERT(
+        isObjectUpToDateWithProperties() &&
         "TendonForceLengthCurve: Tendon is not up-to-date with its properties");
     return m_curve.getCurveDomain();
 }