Made sure drive is in capital letter on Windows for the tests

pyomeca · Feb 24, 2025 · 39af5f2 · 39af5f2
1 parent 8fc90d3
commit 39af5f2
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 19 deletions.
diff --git a/bioptim/__init__.py b/bioptim/__init__.py
@@ -167,7 +167,7 @@
 from .dynamics.fatigue.fatigue_dynamics import FatigueList
 from .dynamics.fatigue.michaud_fatigue import MichaudFatigue, MichaudTauFatigue
 from .dynamics.fatigue.xia_fatigue import XiaFatigue, XiaTauFatigue, XiaFatigueStabilized
-from .dynamics.ode_solver import OdeSolver, OdeSolverBase
+from .dynamics.ode_solvers import OdeSolver, OdeSolverBase
 from .gui.online_callback_server import PlottingServer
 from .gui.plot import CustomPlot
 from .interfaces import Solver, CasadiFunctionInterface

diff --git a/tests/shard1/test_biorbd_model_holonomic.py b/tests/shard1/test_biorbd_model_holonomic.py
@@ -1,9 +1,9 @@
+from bioptim import HolonomicBiorbdModel, HolonomicConstraintsFcn, HolonomicConstraintsList, Solver, SolutionMerge
+from casadi import DM, MX
 import numpy as np
 import numpy.testing as npt
 import pytest
-from casadi import DM, MX
 
-from bioptim import HolonomicBiorbdModel, HolonomicConstraintsFcn, HolonomicConstraintsList, Solver, SolutionMerge
 from ..utils import TestUtils
 
 

diff --git a/tests/shard1/test_prepare_all_examples.py b/tests/shard1/test_prepare_all_examples.py
@@ -1,7 +1,7 @@
+from bioptim import InterpolationType, PhaseDynamics, OdeSolver
 import numpy as np
 import pytest
 
-from bioptim import InterpolationType, PhaseDynamics, OdeSolver
 from ..utils import TestUtils
 
 

diff --git a/tests/shard3/test_global_torque_driven_ocp.py b/tests/shard3/test_global_torque_driven_ocp.py
@@ -4,17 +4,7 @@
 
 import platform
 
-from bioptim import (
-    OdeSolver,
-    ConstraintList,
-    ConstraintFcn,
-    Node,
-    DefectType,
-    Solver,
-    BiorbdModel,
-    PhaseDynamics,
-    SolutionMerge,
-)
+from bioptim import OdeSolver, ConstraintList, ConstraintFcn, Node, Solver, BiorbdModel, PhaseDynamics, SolutionMerge
 from bioptim.models.biorbd.viewer_utils import _prepare_tracked_markers_for_animation
 import numpy.testing as npt
 import numpy as np
@@ -291,6 +281,35 @@ def test_track_marker_2D_pendulum(ode_solver, phase_dynamics):
     if platform.system() == "Windows":
         return
 
+    bioptim_folder = TestUtils.module_folder(ocp_module)
+
+    ode_solver_orig = ode_solver
+    ode_solver = ode_solver()
+
+    # Define the problem
+    model_path = bioptim_folder + "/models/pendulum.bioMod"
+    bio_model = BiorbdModel(model_path)
+
+    final_time = 2
+    n_shooting = 30
+
+    # Generate data to fit
+    np.random.seed(42)
+    markers_ref = np.random.rand(3, 2, n_shooting + 1)
+    tau_ref = np.random.rand(2, n_shooting)
+
+    if isinstance(ode_solver, OdeSolver.IRK):
+        tau_ref = tau_ref * 5
+
+    ocp = ocp_module.prepare_ocp(
+        bio_model,
+        final_time,
+        n_shooting,
+        markers_ref,
+        tau_ref,
+        ode_solver=ode_solver,
+        expand_dynamics=ode_solver_orig != OdeSolver.IRK,
+    )
     sol = ocp.solve()
 
     # Check constraints

diff --git a/tests/shard3/test_initial_condition.py b/tests/shard3/test_initial_condition.py
@@ -1,9 +1,5 @@
 import re
 
-import numpy as np
-import numpy.testing as npt
-import pytest
-
 from bioptim import (
     InterpolationType,
     Solution,
@@ -20,6 +16,10 @@
     SolutionMerge,
 )
 from bioptim.limits.path_conditions import InitialGuess
+import numpy as np
+import numpy.testing as npt
+import pytest
+
 from ..utils import TestUtils