Merge pull request #35 from pybop-team/develop

Alignment for #28, fix build error
pybop-team · Sep 14, 2023 · 0d89b26 · 0d89b26
2 parents 0530d11 + 6d20181
commit 0d89b26
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/pybop/__init__.py b/pybop/__init__.py
@@ -56,7 +56,9 @@
 #
 # Optimisation class
 #
-from .optimisation import *
+from .optimisation import BaseOptimisation
+from .optimisation.NLoptOptimize import NLoptOptimize
+from .optimisation.SciPyMinimize import SciPyMinimize
 
 #
 # Remove any imported modules, so we don't expose them as part of pybop

diff --git a/pybop/optimisation/base_optimisation.py → pybop/optimisation/BaseOptimisation.py b/pybop/optimisation/base_optimisation.py → pybop/optimisation/BaseOptimisation.py
@@ -1,7 +1,7 @@
 import pybop
 
 
-class BaseOptimisation(object):
+class BaseOptimisation:
     """
 
     Base class for the optimisation methods.

diff --git a/pybop/optimisation/nlopt_opt.py → pybop/optimisation/NLoptOptimize.py b/pybop/optimisation/nlopt_opt.py → pybop/optimisation/NLoptOptimize.py
@@ -1,8 +1,9 @@
 import pybop
 import nlopt
+from .BaseOptimisation import BaseOptimisation
 
 
-class NLoptOptimize(pybop.BaseOptimisation):
+class NLoptOptimize(BaseOptimisation):
     """
     Wrapper class for the NLOpt optimisation class. Extends the BaseOptimisation class.
     """

diff --git a/pybop/optimisation/scipy_opt.py → pybop/optimisation/SciPyMinimize.py b/pybop/optimisation/scipy_opt.py → pybop/optimisation/SciPyMinimize.py
@@ -1,8 +1,9 @@
 import pybop
 from scipy.optimize import minimize
+from .BaseOptimisation import BaseOptimisation
 
 
-class ScipyMinimize(pybop.BaseOptimisation):
+class SciPyMinimize(BaseOptimisation):
     """
     Wrapper class for the Scipy optimisation class. Extends the BaseOptimisation class.
     """