Fitting preparation

README.md

@@ -35,6 +35,6 @@ Documentation can be found at:
 We absolutely welcome contributions. **EasyScience** is maintained by the ESS and on a volunteer basis and thus we need to foster a community that can support user questions and develop new features to make this software a useful tool for all users while encouraging every member of the community to share their ideas.
 
 ## License
-While **EasyScience** is under the BSD-3 license, DFO_LS is subject to the GPL license.
+While **EasyScience** is under the BSD-3 license, DFO-LS is subject to the GPL license.
 
 

examples_old/example1.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter
 

examples_old/example1_dream.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter
 

examples_old/example2.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter
 

examples_old/example3.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter
 

examples_old/example4.py

@@ -10,7 +10,7 @@
 import numpy as np
 
 from easyscience import borg
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.core import ComponentSerializer
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter

examples_old/example5_broken.py

@@ -9,7 +9,7 @@
 import numpy as np
 
 from easyscience import borg
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.Base import BaseObj
 from easyscience.Objects.Base import Parameter
 from easyscience.Objects.core import ComponentSerializer

examples_old/example6_broken.py

@@ -9,7 +9,7 @@
 import numpy as np
 
 from easyscience import borg
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.Base import BaseObj
 from easyscience.Objects.Base import Parameter
 from easyscience.Objects.core import ComponentSerializer

examples_old/example_dataset2.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 from easyscience.Datasets.xarray import xr
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter
 

examples_old/example_dataset2pt2.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 from easyscience.Datasets.xarray import xr
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter
 
@@ -39,7 +39,7 @@ def fit_fun(x, *args, **kwargs):
 f.initialize(b, fit_fun)
 
 fig, ax = plt.subplots(2, 3, sharey='row')
-for idx, minimizer in enumerate(['lmfit', 'bumps', 'DFO_LS']):
+for idx, minimizer in enumerate(['lmfit', 'bumps', 'dfo_ls']):
 
     b.m = m_starting_point
     b.c = c_starting_point

examples_old/example_dataset2pt2_broken.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 from easyscience.Datasets.xarray import xr
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.Base import BaseObj
 from easyscience.Objects.Base import Parameter
 
@@ -39,7 +39,7 @@ def fit_fun(x, *args, **kwargs):
 f.initialize(b, fit_fun)
 
 fig, ax = plt.subplots(2, 3, sharey='row')
-for idx, minimizer in enumerate(['lmfit', 'bumps', 'DFO_LS']):
+for idx, minimizer in enumerate(['lmfit', 'bumps', 'dfo_ls']):
 
     b.m = m_starting_point
     b.c = c_starting_point

examples_old/example_dataset3.py

@@ -7,7 +7,7 @@
 
 import numpy as np
 from easyscience.Datasets.xarray import xr
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter
 

examples_old/example_dataset3pt2.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 from easyscience.Datasets.xarray import xr
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter
 
@@ -41,7 +41,7 @@ def fit_fun(x, *args, **kwargs):
 cbar_ax1 = fig.add_axes([0.85, 0.15, 0.05, 0.3])
 cbar_ax2 = fig.add_axes([0.85, 0.60, 0.05, 0.3])
 
-for idx, minimizer in enumerate(['lmfit', 'bumps', 'DFO_LS']):
+for idx, minimizer in enumerate(['lmfit', 'bumps', 'dfo_ls']):
     b.s_off = s_off_start_point
     b.c_off = c_off_start_point
 

examples_old/example_dataset4.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 from easyscience.Datasets.xarray import xr
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter
 

examples_old/example_dataset4_2.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 from easyscience.Datasets.xarray import xr
-from easyscience.Fitting.Fitting import Fitter
+from easyscience.Fitting import Fitter
 from easyscience.Objects.ObjectClasses import BaseObj
 from easyscience.Objects.ObjectClasses import Parameter
 

src/easyscience/Datasets/xarray.py

@@ -20,7 +20,7 @@
 import xarray as xr
 
 from easyscience import ureg
-from easyscience.Fitting.fitting_template import FitResults
+from easyscience.Fitting import FitResults
 
 T_ = TypeVar('T_')
 

src/easyscience/Fitting/__init__.py

@@ -1,35 +1,3 @@
-#  SPDX-FileCopyrightText: 2023 EasyScience contributors  <core@easyscience.software>
-#  SPDX-License-Identifier: BSD-3-Clause
-#  © 2021-2023 Contributors to the EasyScience project <https://github.com/easyScience/easyscience
-
-__author__ = "github.com/wardsimon"
-__version__ = "0.1.0"
-
-import warnings
-
-imported = -1
-try:
-    from easyscience.Fitting.lmfit import lmfit  # noqa: F401, E402
-
-    imported += 1
-except ImportError:
-    # TODO make this a proper message (use logging?)
-    warnings.warn("lmfit has not been installed.", ImportWarning, stacklevel=2)
-try:
-    from easyscience.Fitting.bumps import bumps  # noqa: F401, E402
-
-    imported += 1
-except ImportError:
-    # TODO make this a proper message (use logging?)
-    warnings.warn("bumps has not been installed.", ImportWarning, stacklevel=2)
-try:
-    from easyscience.Fitting.DFO_LS import DFO  # noqa: F401, E402
-
-    imported += 1
-except ImportError:
-    # TODO make this a proper message (use logging?)
-    warnings.warn("dfo-ls has not been installed.", ImportWarning, stacklevel=2)
-
-from easyscience.Fitting.fitting_template import FittingTemplate  # noqa: E402
-
-engines: list = FittingTemplate._engines
+from .fitter import Fitter  # noqa: F401, E402
+from .minimizers.minimizer_base import FitResults  # noqa: F401, E402
+from .multi_fitter import MultiFitter  # noqa: F401, E402