Skip to content

Commit

Permalink
relative path review
Browse files Browse the repository at this point in the history
  • Loading branch information
Ipuch committed Nov 3, 2023
1 parent 5d0c543 commit b45a891
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
Empty file.
7 changes: 4 additions & 3 deletions bioptim/optimization/solution/simplified_objects.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from casadi import vertcat, Function
import numpy as np

from bioptim.optimization.non_linear_program import NonLinearProgram
from bioptim.optimization.optimization_variable import OptimizationVariableList, OptimizationVariable
from bioptim.misc.enums import (
from ...misc.enums import (
ControlType,
Shooting,
)
from ..non_linear_program import NonLinearProgram
from ..optimization_variable import OptimizationVariableList, OptimizationVariable

from .utils import concatenate_optimization_variables


Expand Down
13 changes: 7 additions & 6 deletions bioptim/optimization/solution/solution.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
from casadi import vertcat, DM, Function
from matplotlib import pyplot as plt

from bioptim.limits.objective_functions import ObjectiveFcn
from bioptim.limits.path_conditions import InitialGuess, InitialGuessList
from bioptim.misc.enums import (
from ...limits.objective_functions import ObjectiveFcn
from ...limits.path_conditions import InitialGuess, InitialGuessList
from ...misc.enums import (
ControlType,
CostType,
Shooting,
Expand All @@ -20,9 +20,10 @@
QuadratureRule,
PhaseDynamics,
)
from bioptim.optimization.optimization_vector import OptimizationVectorHelper
from bioptim.dynamics.ode_solver import OdeSolver
from bioptim.interfaces.solve_ivp_interface import solve_ivp_interface, solve_ivp_bioptim_interface
from ...dynamics.ode_solver import OdeSolver
from ...interfaces.solve_ivp_interface import solve_ivp_interface, solve_ivp_bioptim_interface

from ..optimization_vector import OptimizationVectorHelper

from .utils import concatenate_optimization_variables_dict, concatenate_optimization_variables
from .simplified_objects import SimplifiedOCP
Expand Down

0 comments on commit b45a891

Please sign in to comment.