Changeset acf8e4a5 in sasview for test/sasfit/test/utest_fit_cylinder.py

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

File:

• test/sasfit/test/utest_fit_cylinder.py (modified) (7 diffs)

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 )