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

Timestamp:

Feb 20, 2015 3: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_cylinder.py (modified) (5 diffs)

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 )