Uniformize imports

src/andromede/expression/degree.py

@@ -11,7 +11,8 @@
 # This file is part of the Antares project.
 
 import andromede.expression.scenario_operator
-from andromede.expression.expression_efficient import (
+
+from .expression_efficient import (
     AdditionNode,
     ComparisonNode,
     ComponentParameterNode,
@@ -30,7 +31,6 @@
     TimeOperatorName,
     TimeOperatorNode,
 )
-
 from .visitor import ExpressionVisitor, T, visit
 
 

src/andromede/expression/evaluate.py

@@ -13,7 +13,7 @@
 from dataclasses import dataclass, field
 from typing import Dict
 
-from andromede.expression.expression_efficient import (
+from .expression_efficient import (
     ComparisonNode,
     ComponentParameterNode,
     ExpressionNodeEfficient,
@@ -25,12 +25,7 @@
     TimeAggregatorNode,
     TimeOperatorNode,
 )
-from andromede.expression.value_provider import (
-    TimeScenarioIndex,
-    TimeScenarioIndices,
-    ValueProvider,
-)
-
+from .value_provider import TimeScenarioIndex, TimeScenarioIndices, ValueProvider
 from .visitor import ExpressionVisitorOperations, visit
 
 

src/andromede/expression/evaluate_parameters_efficient.py

@@ -14,7 +14,7 @@
 from dataclasses import dataclass, field
 from typing import Callable, Dict, List
 
-from andromede.expression.expression_efficient import (
+from .expression_efficient import (
     AdditionNode,
     ComparisonNode,
     ComponentParameterNode,
@@ -36,13 +36,8 @@
     TimeOperatorName,
     TimeOperatorNode,
 )
-from andromede.expression.indexing_structure import RowIndex
-from andromede.expression.value_provider import (
-    TimeScenarioIndex,
-    TimeScenarioIndices,
-    ValueProvider,
-)
-
+from .indexing_structure import RowIndex
+from .value_provider import TimeScenarioIndex, TimeScenarioIndices, ValueProvider
 from .visitor import ExpressionVisitor, visit
 
 

src/andromede/expression/indexing.py

@@ -12,7 +12,7 @@
 
 from abc import ABC, abstractmethod
 
-from andromede.expression.indexing_structure import IndexingStructure
+from .indexing_structure import IndexingStructure
 
 
 class IndexingStructureProvider(ABC):

src/andromede/expression/linear_expression_efficient.py

@@ -29,13 +29,13 @@
     overload,
 )
 
-from andromede.expression.context_adder import add_component_context
-from andromede.expression.equality import expressions_equal
-from andromede.expression.evaluate_parameters_efficient import (
+from .context_adder import add_component_context
+from .equality import expressions_equal
+from .evaluate_parameters_efficient import (
     check_resolved_expr,
     resolve_coefficient,
 )
-from andromede.expression.expression_efficient import (
+from .expression_efficient import (
     ExpressionNodeEfficient,
     ExpressionRange,
     InstancesTimeIndex,
@@ -53,19 +53,19 @@
     literal,
     wrap_in_node,
 )
-from andromede.expression.indexing import IndexingStructureProvider
-from andromede.expression.indexing_structure import IndexingStructure, RowIndex
-from andromede.expression.port_operator import PortAggregator, PortSum
-from andromede.expression.print import print_expr
-from andromede.expression.scenario_operator import Expectation, ScenarioAggregator
-from andromede.expression.time_operator import (
+from .indexing import IndexingStructureProvider
+from .indexing_structure import IndexingStructure, RowIndex
+from .port_operator import PortAggregator, PortSum
+from .print import print_expr
+from .scenario_operator import Expectation, ScenarioAggregator
+from .time_operator import (
     TimeAggregator,
     TimeEvaluation,
     TimeOperator,
     TimeShift,
     TimeSum,
 )
-from andromede.expression.value_provider import (
+from .value_provider import (
     TimeScenarioIndex,
     TimeScenarioIndices,
     ValueProvider,

src/andromede/expression/visitor.py

@@ -16,26 +16,7 @@
 from abc import ABC, abstractmethod
 from typing import Generic, Protocol, TypeVar
 
-# from andromede.expression.expression import (
-#     AdditionNode,
-#     ComparisonNode,
-#     ComponentParameterNode,
-#     ComponentVariableNode,
-#     DivisionNode,
-#     ExpressionNode,
-#     LiteralNode,
-#     MultiplicationNode,
-#     NegationNode,
-#     ParameterNode,
-#     PortFieldAggregatorNode,
-#     PortFieldNode,
-#     ScenarioOperatorNode,
-#     SubstractionNode,
-#     TimeAggregatorNode,
-#     TimeOperatorNode,
-#     VariableNode,
-# )
-from andromede.expression.expression_efficient import (
+from .expression_efficient import (
     AdditionNode,
     ComparisonNode,
     ComponentParameterNode,

src/andromede/simulation/benders_decomposed.py

@@ -18,22 +18,20 @@
 import pathlib
 from typing import Any, Dict, List, Optional
 
-from andromede.simulation.optimization import OptimizationProblem, build_problem
-from andromede.simulation.optimization_context import BlockBorderManagement
-from andromede.simulation.output_values import (
+from andromede.study.data import DataBase
+from andromede.study.network import Network
+from andromede.utils import read_json, serialize, serialize_json
+
+from .optimization import OptimizationProblem, build_problem
+from .optimization_context import BlockBorderManagement
+from .output_values import (
     BendersDecomposedSolution,
     BendersMergedSolution,
     BendersSolution,
 )
-from andromede.simulation.runner import BendersRunner, MergeMPSRunner
-from andromede.simulation.strategy import (
-    InvestmentProblemStrategy,
-    OperationalProblemStrategy,
-)
-from andromede.simulation.time_block import TimeBlock
-from andromede.study.data import DataBase
-from andromede.study.network import Network
-from andromede.utils import read_json, serialize, serialize_json
+from .runner import BendersRunner, MergeMPSRunner
+from .strategy import InvestmentProblemStrategy, OperationalProblemStrategy
+from .time_block import TimeBlock
 
 
 class BendersDecomposedProblem:

src/andromede/simulation/linear_expression.py

@@ -20,7 +20,6 @@
 from andromede.expression.indexing_structure import IndexingStructure
 from andromede.expression.scenario_operator import ScenarioAggregator
 from andromede.expression.time_operator import TimeAggregator, TimeOperator
-from andromede.model.model import PortFieldId
 
 T = TypeVar("T")
 

src/andromede/simulation/linear_expression_resolver.py

@@ -24,7 +24,7 @@
     LinearExpressionEfficient,
     TermEfficient,
 )
-from andromede.expression.resolved_linear_expression import (
+from .resolved_linear_expression import (
     ResolvedLinearExpression,
     ResolvedTerm,
 )
@@ -35,7 +35,7 @@
     TimeScenarioIndices,
     ValueProvider,
 )
-from andromede.simulation.optimization_context import OptimizationContext
+from .optimization_context import OptimizationContext
 
 
 @dataclass