Changeset 386ffe1 in sasview for test/park_integration/test/utest_fit_line.py

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

File:

• test/park_integration/test/utest_fit_line.py (modified) (10 diffs)

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 )