Changeset acf8e4a5 in sasview for test

Timestamp:

Mar 31, 2015 11:52:01 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

4342107f, c971c98

Parents:

6987c8a

Message:

reference BumpsFit? directly and remove fit engine selection layer

Location:

test

Files:

• pr_inversion/test/test_output.txt (modified) (1 diff)
• sasfit/test/batch_fit.py (modified) (4 diffs)
• sasfit/test/utest_fit_cylinder.py (modified) (7 diffs)
• sasfit/test/utest_fit_line.py (modified) (7 diffs)
• sasfit/test/utest_fit_smeared.py (modified) (8 diffs)
• sasfit/test/utest_multiplicative_model.py (modified) (2 diffs)
• sasfit/test/utest_small_test.py (modified) (2 diffs)

test/pr_inversion/test/test_output.txt

@@ -3 +3 @@
 #alpha=0.0007
 #chi2=836.797
-#elapsed=0.000377893
+#elapsed=0.000389099
 #qmin=None
 #qmax=None

test/sasfit/test/batch_fit.py

@@ -3 +3 @@
 import unittest
 from sas.dataloader.loader import Loader
-from sas.fit.Fitting import Fit
+from sas.fit.Fitting import BumpsFit as Fit
 from sas.models.CylinderModel import CylinderModel
 import sas.models.dispersion_models 
@@ -42 +42 @@
         self.qmax = qmax
         
-    def _reset_helper(self, path=None, engine="bumps", npts=NPTS):
+    def _reset_helper(self, path=None, npts=NPTS):
         """
-        Set value to fitter engine and prepare inputs for map function
+        Set value to fitter and prepare inputs for map function
         """
         for i in range(npts):
             data = Loader().load(path)
-            fitter = Fit(engine)
+            fitter = Fit()
             #create model
             model = CylinderModel()
@@ -77 +77 @@
             self.list_of_mapper.append(classMapper)
                    
-    def reset_value(self, engine='bumps'):
+    def reset_value(self):
         """
         Initialize inputs for the map function
@@ -88 +88 @@
 
         path = "testdata_line3.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "testdata_line.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "SILIC010_noheader.DAT"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "cyl_400_20.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "sphere_80.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "PolySpheres.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "latex_qdev.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "latex_qdev2.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         
       

test/sasfit/test/utest_fit_cylinder.py

@@ -7 +7 @@
 
 from sas.fit.AbstractFitEngine import Model
-from sas.fit.Fitting import Fit
+from sas.fit.BumpsFitting import BumpsFit as Fit
 from sas.dataloader.loader import Loader
 
@@ -15 +15 @@
         """ initialize data"""
         self.data = Loader().load("cyl_400_20.txt")
-        # Create model that fitting engine understands
+        # Create model that fitter understands
         from sas.models.CylinderModel import CylinderModel
         self.model  = CylinderModel()
@@ -27 +27 @@
         self.pars1 =['length','radius','scale']
         
-    def _fit(self, name="bumps"):
-        """ return fit result """
-        fitter = Fit(name)
+    def test_fit(self):
+        """Simple cylinder model fit"""
+        fitter = Fit()
         fitter.set_data(self.data,1)
         fitter.set_model(self.model,1,self.pars1)
@@ -43 +43 @@
         self.assertTrue( math.fabs(result1.pvec[2]-1.0)/3.0   < result1.stderr[2] )
         self.assertTrue( result1.fitness < 1.0 )
-
-
-    def test_bumps(self):
-        """ Simple cylinder model fit """
-        self._fit("bumps")
 
 
@@ -82 +77 @@
     def test_constrained_bumps(self):
         """ Simultaneous cylinder model fit  """
-        self._run_fit(Fit('bumps'))
+        self._run_fit(Fit())
 
     #@unittest.skip("")
@@ -92 +87 @@
 
         for n, v, dv in zip(result1.param_list, result1.pvec, result1.stderr):
-            #print "%s M1.%s = %s +/- %s"%(fitter._engine.__class__.__name__,n,v,dv)
             if n == "length":
                 self.assertTrue( math.fabs(v-400.0)/3.0 < dv )
@@ -100 +94 @@
                 self.assertTrue( math.fabs(v-1.0)/3.0 < dv )
         for n, v, dv in zip(result2.param_list, result2.pvec, result2.stderr):
-            #print "%s M2.%s = %s +/- %s"%(fitter._engine.__class__.__name__,n,v,dv)
             if n=='radius':
                 self.assertTrue( math.fabs(v-40.0)/3.0 < dv )

test/sasfit/test/utest_fit_line.py

@@ -8 +8 @@
 from sas.fit.AbstractFitEngine import Model, FitHandler
 from sas.dataloader.loader import Loader
-from sas.fit.Fitting import Fit
+from sas.fit.BumpsFitting import BumpsFit as Fit
 from sas.models.LineModel import LineModel
 from sas.models.Constant import Constant
@@ -16 +16 @@
 
     def test_bad_pars(self):
-        fitter = Fit('bumps')
+        fitter = Fit()
 
         data = Loader().load("testdata_line.txt")
@@ -34 +34 @@
             raise AssertionError("No error raised for fitting with wrong parameters name to fit")
 
-    def fit_single(self, fitter_name, isdream=False):
-        fitter = Fit(fitter_name)
+    def fit_single(self, isdream=False):
+        fitter = Fit()
 
         data = Loader().load("testdata_line.txt")
@@ -74 +74 @@
         #print "fitting",alg,opts
         #kprint "options",fitters.FIT_OPTIONS[alg].__dict__
-        self.fit_single('bumps', isdream=(alg=='dream'))
+        self.fit_single(isdream=(alg=='dream'))
 
     def test_bumps_de(self):
@@ -102 +102 @@
      
         #Importing the Fit module
-        fitter = Fit('bumps')
+        fitter = Fit()
         # Receives the type of model for the fitting
         model11  = LineModel()
@@ -161 +161 @@
         
         #Importing the Fit module
-        fitter = Fit('bumps')
+        fitter = Fit()
         fitter.set_data(data1,1)
         fitter.set_model(model1,1,pars1)
@@ -194 +194 @@
         #Importing the Fit module
 
-        fitter = Fit('bumps')
+        fitter = Fit()
         fitter.set_data(data1,1,qmin=0, qmax=7)
         fitter.set_model(model,1,pars1)

test/sasfit/test/utest_fit_smeared.py

@@ -8 +8 @@
 import numpy
 from sas.fit.AbstractFitEngine import Model
-from sas.fit.Fitting import Fit
+from sas.fit.BumpsFitting import BumpsFit as Fit
 from sas.dataloader.loader import Loader
 from sas.models.qsmearing import smear_selection
@@ -24 +24 @@
         #out.dy = out.y
         
-        fitter = Fit('bumps')
+        fitter = Fit()
         fitter.set_data(out,1)
         
@@ -62 +62 @@
         #fitters.FIT_OPTIONS[alg].options.update(opts)
         fitters.FIT_OPTIONS[alg].options.update(monitors=[])
-        self._dispersion(fitter = Fit('bumps'))
+        self._dispersion(fitter = Fit())
 
     def _dispersion(self, fitter):
@@ -94 +94 @@
         #import time; T0 = time.time()
         result1, = fitter.fit()
-        #print "time",time.time()-T0,fitter._engine.__class__.__name__
-        
+
         self.assert_(result1)
         self.assertTrue(len(result1.pvec)>0)
@@ -137 +136 @@
 
         # Fit
-        fitter = Fit('bumps')
+        fitter = Fit()
         
         # Data: right now this is the only way to set the smearer object
@@ -143 +142 @@
         # data for a given fit.
         fitter.set_data(self.data_res,1)
-        fitter._engine.fit_arrange_dict[1].data_list[0].smearer = smear
+        fitter.fit_arrange_dict[1].data_list[0].smearer = smear
 
         # Model: maybe there's a better way to do this.
@@ -169 +168 @@
         #self.assertEqual(smear.__class__.__name__, 'PySmearer')
 
-        fitter = Fit('bumps')
+        fitter = Fit()
         
         # Data: right now this is the only way to set the smearer object
@@ -175 +174 @@
         # data for a given fit.
         fitter.set_data(self.data_slit,1)
-        fitter._engine.fit_arrange_dict[1].data_list[0].smearer = smear
-        fitter._engine.fit_arrange_dict[1].data_list[0].qmax = 0.003
+        fitter.fit_arrange_dict[1].data_list[0].smearer = smear
+        fitter.fit_arrange_dict[1].data_list[0].qmax = 0.003
         
         # Model

test/sasfit/test/utest_multiplicative_model.py

@@ -8 +8 @@
 from sas.dataloader.data_info import Data1D 
 from sas.fit.AbstractFitEngine import Model,FitData1D
-from sas.fit.Fitting import Fit
+from sas.fit.BumpsFitting import BumpsFit as Fit
 from sas.dataloader.loader import Loader
 from sas.models.MultiplicationModel import MultiplicationModel
@@ -38 +38 @@
     
         pars1 =['length','radius','scale_factor']
-        fitter = Fit('bumps')
+        fitter = Fit()
         fitter.set_data(data,1)
         fitter.set_model(model,1,pars1)

test/sasfit/test/utest_small_test.py

@@ -4 +4 @@
 import unittest
 import math
-from sas.fit.Fitting import Fit
+from sas.fit.BumpsFitting import BumpsFit as Fit
 from sas.dataloader.loader import Loader
 import bumps.fitters
@@ -16 +16 @@
         out= Loader().load("cyl_400_20.txt")
        
-        fitter = Fit('bumps')
+        fitter = Fit()
         # Receives the type of model for the fitting
         from sas.models.CylinderModel import CylinderModel