Changeset 386ffe1 in sasview for test/park_integration/test/utest_fit_smeared.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_smeared.py (modified) (6 diffs)

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