Changeset 386ffe1 in sasview for test/park_integration/test/utest_small_test.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_small_test.py (modified) (3 diffs)

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] )