Restructure optimagic.

OpenSourceEconomics · Jul 11, 2024 · 192f072 · 192f072
1 parent 8cf6ad9
commit 192f072
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 10 deletions.
diff --git a/src/estimagic/visualization/estimation_table.py b/src/estimagic/visualization/estimation_table.py
@@ -3,7 +3,7 @@
 from functools import partial
 from pathlib import Path
 from warnings import warn
-from optimagic.compat import pd_df_map
+from optimagic.shared.compat import pd_df_map
 
 import numpy as np
 import pandas as pd

diff --git a/src/optimagic/algorithms.py b/src/optimagic/algorithms.py
@@ -5,18 +5,18 @@
     scipy_optimizers,
     bhhh,
     neldermead,
-    fides_optimizers,
+    fides,
     tao_optimizers,
     nag_optimizers,
-    cyipopt_optimizers,
+    ipopt,
     pygmo_optimizers,
     nlopt_optimizers,
     tranquilo,
 )
 
 MODULES = [
-    cyipopt_optimizers,
-    fides_optimizers,
+    ipopt,
+    fides,
     nag_optimizers,
     nlopt_optimizers,
     pygmo_optimizers,

diff --git a/src/optimagic/optimization/optimize.py b/src/optimagic/optimization/optimize.py
@@ -29,7 +29,7 @@
     get_converter,
 )
 from optimagic.parameters.nonlinear_constraints import process_nonlinear_constraints
-from optimagic.process_user_function import process_func_of_params
+from optimagic.shared.process_user_function import process_func_of_params
 
 
 def maximize(

diff --git a/src/optimagic/optimization/optimize_result.py b/src/optimagic/optimization/optimize_result.py
@@ -5,7 +5,7 @@
 import pandas as pd
 
 from optimagic.utilities import to_pickle
-from optimagic.compat import pd_df_map
+from optimagic.shared.compat import pd_df_map
 
 
 @dataclass

diff --git a/src/optimagic/optimizers/fides_optimizers.py → src/optimagic/optimizers/fides.py b/src/optimagic/optimizers/fides_optimizers.py → src/optimagic/optimizers/fides.py
diff --git a/...ptimagic/optimizers/cyipopt_optimizers.py → src/optimagic/optimizers/ipopt.py b/...ptimagic/optimizers/cyipopt_optimizers.py → src/optimagic/optimizers/ipopt.py
diff --git a/src/optimagic/shared/__init__.py b/src/optimagic/shared/__init__.py
diff --git a/src/optimagic/compat.py → src/optimagic/shared/compat.py b/src/optimagic/compat.py → src/optimagic/shared/compat.py
diff --git a/src/optimagic/process_user_function.py → ...optimagic/shared/process_user_function.py b/src/optimagic/process_user_function.py → ...optimagic/shared/process_user_function.py
diff --git a/tests/optimagic/optimization/test_fides_options.py b/tests/optimagic/optimization/test_fides_options.py
@@ -6,7 +6,7 @@
 from numpy.testing import assert_array_almost_equal as aaae
 
 if IS_FIDES_INSTALLED:
-    from optimagic.optimizers.fides_optimizers import fides
+    from optimagic.optimizers.fides import fides
     from fides.hessian_approximation import FX, SR1, Broyden
 else:
     FX = lambda: None

diff --git a/tests/optimagic/optimization/test_ipopt_options.py b/tests/optimagic/optimization/test_ipopt_options.py
@@ -3,7 +3,7 @@
 import numpy as np
 import pytest
 from optimagic.config import IS_CYIPOPT_INSTALLED
-from optimagic.optimizers.cyipopt_optimizers import ipopt
+from optimagic.optimizers.ipopt import ipopt
 from numpy.testing import assert_array_almost_equal as aaae
 
 test_cases = [

diff --git a/tests/optimagic/test_process_function.py b/tests/optimagic/test_process_function.py
@@ -1,6 +1,6 @@
 import pytest
 from optimagic.exceptions import InvalidKwargsError
-from optimagic.process_user_function import process_func_of_params
+from optimagic.shared.process_user_function import process_func_of_params
 
 
 def test_process_func_of_params():