Changeset 386ffe1 in sasview for test

Timestamp:

Feb 20, 2015 5:02:38 AM (9 years ago)

Author:

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:

cda1cf8

Parents:

018582f

Message:

remove scipy levenburg marquardt and park from ui

Location:

test

Files:

• park_integration/test/batch_fit.py (modified) (2 diffs)
• park_integration/test/utest_fit_cylinder.py (modified) (5 diffs)
• park_integration/test/utest_fit_line.py (modified) (10 diffs)
• park_integration/test/utest_fit_smeared.py (modified) (6 diffs)
• park_integration/test/utest_park_scipy.py (deleted)
• park_integration/test/utest_small_test.py (modified) (3 diffs)
• pr_inversion/test/test_output.txt (modified) (1 diff)
• sasmodels/test/utest_models.py (modified) (1 diff)

test/park_integration/test/batch_fit.py

@@ -42 +42 @@
         self.qmax = qmax
         
-    def _reset_helper(self, path=None, engine="scipy", npts=NPTS):
+    def _reset_helper(self, path=None, engine="bumps", npts=NPTS):
         """
         Set value to fitter engine and prepare inputs for map function
@@ -77 +77 @@
             self.list_of_mapper.append(classMapper)
                    
-    def reset_value(self, engine='scipy'):
+    def reset_value(self, engine='bumps'):
         """
         Initialize inputs for the map function

test/park_integration/test/utest_fit_cylinder.py

@@ -27 +27 @@
         self.pars1 =['length','radius','scale']
         
-    def _fit(self, name="scipy"):
+    def _fit(self, name="bumps"):
         """ return fit result """
         fitter = Fit(name)
@@ -45 +45 @@
 
 
-    def test_scipy(self):
-        """ Simple cylinder model fit (scipy)  """
-        self._fit("scipy")
-
-
-    def test_park(self):
-        """ Simple cylinder model fit (park)  """
-        self._fit("park")
-
     def test_bumps(self):
-        """ Simple cylinder model fit (park)  """
+        """ Simple cylinder model fit """
         self._fit("bumps")
 
@@ -90 +81 @@
 
     def test_constrained_bumps(self):
-        """ Simultaneous cylinder model fit (park)  """
+        """ Simultaneous cylinder model fit  """
         self._run_fit(Fit('bumps'))
 
     #@unittest.skip("")
-    def test_constrained_park(self):
-        """ Simultaneous cylinder model fit (park)  """
-        self._run_fit(Fit('park'))
-
     def _run_fit(self, fitter):
         result1, result2 = self._fit(fitter)
@@ -105 +92 @@
 
         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)
+            #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 )
@@ -113 +100 @@
                 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)
+            #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/park_integration/test/utest_fit_line.py

@@ -32 +32 @@
             assert str(exc).startswith('parameter param1')
         else:
-            raise AssertionError("No error raised for scipy fitting with wrong parameters name to fit")
+            raise AssertionError("No error raised for fitting with wrong parameters name to fit")
 
     def fit_single(self, fitter_name, isdream=False):
@@ -45 +45 @@
         model1.name = "M1"
         model = Model(model1,data)
-        #fit with scipy test
 
         pars1= ['A','B']
@@ -92 +91 @@
         self.fit_bumps('lm')
 
-    def test_scipy(self):
-        #print "fitting scipy"
-        self.fit_single('scipy')
-
-    def test_park(self):
-        #print "fitting park"
-        self.fit_single('park')
-
-        
     def test2(self):
         """ fit 2 data and 2 model with no constrainst"""
@@ -112 +102 @@
      
         #Importing the Fit module
-        fitter = Fit('scipy')
+        fitter = Fit('bumps')
         # Receives the type of model for the fitting
         model11  = LineModel()
@@ -121 +111 @@
         model1 = Model(model11,data1)
         model2 = Model(model22,data2)
-        #fit with scipy test
         pars1= ['A','B']
         fitter.set_data(data1,1)
@@ -129 +118 @@
         fitter.set_model(model2,2,pars1)
         fitter.select_problem_for_fit(id=2,value=0)
-        
+
         try: result1, = fitter.fit(handler=FitHandler())
         except RuntimeError,msg:
-           assert str(msg)=="No Assembly scheduled for Scipy fitting."
-        else: raise AssertionError,"No error raised for scipy fitting with no model"
-        fitter.select_problem_for_fit(id=1,value=1)
-        fitter.select_problem_for_fit(id=2,value=1)
-        try: result1, = fitter.fit(handler=FitHandler())
-        except RuntimeError,msg:
-           assert str(msg)=="Scipy can't fit more than a single fit problem at a time."
-        else: raise AssertionError,"No error raised for scipy fitting with more than 2 models"
-
-        #fit with park test
-        fitter = Fit('park')
-        fitter.set_data(data1,1)
-        fitter.set_model(model1,1,pars1)
-        fitter.set_data(data2,2)
-        fitter.set_model(model2,2,pars1)
+            assert str(msg)=="Nothing to fit"
+        else: raise AssertionError,"No error raised for fitting with no model"
         fitter.select_problem_for_fit(id=1,value=1)
         fitter.select_problem_for_fit(id=2,value=1)
@@ -156 +132 @@
         
         
-    def test3(self):
+    def test_constraints(self):
         """ fit 2 data and 2 model with 1 constrainst"""
         #load data
@@ -180 +156 @@
         model1.set(B=3)
         # Constraint the constant value to be equal to parameter B (the real value is 2.5)
-        model2.set(value='line.B')
-        #fit with scipy test
+        #model2.set(value='line.B')
         pars1= ['A','B']
         pars2= ['value']
         
         #Importing the Fit module
-        fitter = Fit('park')
+        fitter = Fit('bumps')
         fitter.set_data(data1,1)
         fitter.set_model(model1,1,pars1)
         fitter.set_data(data2,2,smearer=None)
-        fitter.set_model(model2,2,pars2)
+        fitter.set_model(model2,2,pars2,constraints=[("value","line.B")])
         fitter.select_problem_for_fit(id=1,value=1)
         fitter.select_problem_for_fit(id=2,value=1)
@@ -216 +191 @@
         model = Model(model1,data1)
       
-        #fit with scipy test
-        pars1= ['A','B']
-        #Importing the Fit module
-        fitter = Fit('scipy')
-        fitter.set_data(data1,1,qmin=0, qmax=7)
-        fitter.set_model(model,1,pars1)
-        fitter.set_data(data2,1,qmin=1,qmax=10)
-        fitter.select_problem_for_fit(id=1,value=1)
-        
-        result1, = fitter.fit(handler=FitHandler())
-        #print(result1)
-        self.assert_(result1)
-
-        self.assertTrue( math.fabs(result1.pvec[0]-4)/3 <= result1.stderr[0] )
-        self.assertTrue( math.fabs(result1.pvec[1]-2.5)/3 <= result1.stderr[1])
-        self.assertTrue( result1.fitness/len(data1.x) < 2 )
-
-        #fit with park test
-        fitter = Fit('park')
+        pars1= ['A','B']
+        #Importing the Fit module
+
+        fitter = Fit('bumps')
         fitter.set_data(data1,1,qmin=0, qmax=7)
         fitter.set_model(model,1,pars1)
@@ -245 +205 @@
         self.assertTrue( math.fabs(result2.pvec[1]-2.5)/3 <= result2.stderr[1] )
         self.assertTrue( result2.fitness/len(data1.x) < 2)
-        # compare fit result result for scipy and park
-        self.assertAlmostEquals( result1.pvec[0], result2.pvec[0] )
-        self.assertAlmostEquals( result1.pvec[1],result2.pvec[1] )
-        self.assertAlmostEquals( result1.stderr[0],result2.stderr[0] )
-        self.assertAlmostEquals( result1.stderr[1],result2.stderr[1] )
-        self.assertTrue( result2.fitness/(len(data2.x)+len(data1.x)) < 2 )
 
 

test/park_integration/test/utest_fit_smeared.py

@@ -17 +17 @@
     """ test fitting """
     
-    def test_scipy(self):
-        """ Simple cylinder model fit (scipy)  """
+    def test_without_resolution(self):
+        """ Simple cylinder model fit  """
         
         out=Loader().load("cyl_400_20.txt")
@@ -24 +24 @@
         #out.dy = out.y
         
-        fitter = Fit('scipy')
+        fitter = Fit('bumps')
         fitter.set_data(out,1)
         
@@ -53 +53 @@
         self.assertTrue( result1.fitness < 1.0 )
 
-    def test_park_dispersion(self):
-        """
-            Cylinder fit with dispersion
-        """
-        self._dispersion(fitter = Fit('park'))
-
-    def test_bumps_dispersion(self):
+    def test_dispersion(self):
         """
             Cylinder fit with dispersion
@@ -69 +63 @@
         fitters.FIT_OPTIONS[alg].options.update(monitors=[])
         self._dispersion(fitter = Fit('bumps'))
-
-    def test_scipy_dispersion(self):
-        """
-            Cylinder fit with dispersion
-        """
-        self._dispersion(fitter = Fit('scipy'))
 
     def _dispersion(self, fitter):
@@ -148 +136 @@
 
         # Fit
-        fitter = Fit('scipy')
+        fitter = Fit('bumps')
         
         # Data: right now this is the only way to set the smearer object
@@ -179 +167 @@
         self.assertEqual(smear.__class__.__name__, 'SlitSmearer')
 
-        fitter = Fit('scipy')
+        fitter = Fit('bumps')
         
         # Data: right now this is the only way to set the smearer object

test/park_integration/test/utest_small_test.py

@@ -6 +6 @@
 from sas.fit.Fitting import Fit
 from sas.dataloader.loader import Loader
+import bumps.fitters
+bumps.fitters.FIT_DEFAULT = 'lm'
 
 class testFitModule(unittest.TestCase):
     """ test fitting """
-    def test_park(self):
-        """ Simple cylinder model fit (scipy)  """
+    def test_cylinder_fit(self):
+        """ Simple cylinder model fit """
         
         out= Loader().load("cyl_400_20.txt")
        
-        fitter = Fit('scipy')
+        fitter = Fit('bumps')
         # Receives the type of model for the fitting
         from sas.models.CylinderModel import CylinderModel
@@ -20 +22 @@
         model.setParam('sldCyl', 1)
         model.setParam('sldSolv', 0)
+        model.setParam('scale', 1e-10)
 
         pars1 =['length','radius','scale']
         fitter.set_data(out,1)
-        model.setParam('scale', 1e-10)
         fitter.set_model(model,1,pars1, constraints=())
         fitter.select_problem_for_fit(id=1,value=1)
@@ -33 +35 @@
         self.assertTrue(len(result1.pvec)>0 or len(result1.pvec)==0 )
         self.assertTrue(len(result1.stderr)> 0 or len(result1.stderr)==0)
-        
-        #print result1.pvec[0]-400.0, result1.pvec[0]
-        #print math.fabs(result1.pvec[0]-400.0)/3.0
+
         self.assertTrue( math.fabs(result1.pvec[0]-400.0)/3.0 < result1.stderr[0] )
         self.assertTrue( math.fabs(result1.pvec[1]-20.0)/3.0  < result1.stderr[1] )

test/pr_inversion/test/test_output.txt

@@ -3 +3 @@
 #alpha=0.0007
 #chi2=836.797
-#elapsed=0
+#elapsed=0.00100017
 #qmin=None
 #qmax=None

test/sasmodels/test/utest_models.py

@@ -59 +59 @@
      
     def test2D(self):
-        """ Test 2D model of a cylinder """ 
+        """ Test 2D model of a cylinder """
         self.comp.setParam('cyl_theta', 10.0)
         self.comp.setParam('cyl_phi', 10.0)
-        self.assertAlmostEqual(self.comp.run([0.2, 2.5]), 
-                               0.038176446608393366, 2) 
+        self.assertAlmostEqual(self.comp.run([0.2, 2.5]),
+                               0.038176446608393366, 2)
  
 class TestGaussian(unittest.TestCase):