Changeset 48882d1 in sasview for park_integration/test/test_large_model.py

Timestamp:

Aug 22, 2008 3:51:05 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

3c404d3

Parents:

d6513cd

Message:

park fitting with new model and new data

File:

• park_integration/test/test_large_model.py (modified) (3 diffs)

park_integration/test/test_large_model.py

@@ -5 +5 @@
 from sans.guitools.plottables import Theory1D
 from sans.guitools.plottables import Data1D
-
+from sans.fit.AbstractFitEngine import Data,Model
 import math
 class testFitModule(unittest.TestCase):
     """ test fitting """
-    
-      
-    def testfit_11Data_1Model(self):
-        """ test fitting for one data and one model park vs scipy"""
+    def test_cylinder_park(self):
+        """ test fitting large model with park"""
         #load data
         from sans.fit.Loader import Load
@@ -18 +16 @@
         load.set_filename("cyl_testdata.txt")
         load.set_values()
-        data1 = Data1D(x=[], y=[],dx=None, dy=None)
-        load.load_data(data1)
+        data11 = Data1D(x=[], y=[],dx=None, dy=None)
+        load.load_data(data11)
+        data1=Data(sans_data=data11)
         
-        load.set_filename("testdata_line1.txt")
-        load.set_values()
-        data2 = Data1D(x=[], y=[],dx=None, dy=None)
-        load.load_data(data2)
         
         #Importing the Fit module
@@ -33 +28 @@
         from sans.models.CylinderModel import CylinderModel
         model1  = CylinderModel()
-        #model2  = CylinderModel()
+        model =Model(model1)
         
         #Do the fit SCIPY
         fitter.set_data(data1,1)
         import math
-        pars1={'background':0,'contrast':3*math.pow(10, -6),\
-                'cyl_phi':1,'cyl_theta':1,'length':400,'radius':20,'scale':1}
-        fitter.set_model(model1,"M1",1,pars1)
+        #pars1=['background','contrast', 'length']
+        pars1=['background','contrast',\
+                'cyl_phi','cyl_theta','length','radius','scale']
+        pars1.sort()
+        fitter.set_model(model,"M1",1,pars1)
+        fitter.set_data(data1,1)
+      
+        result=fitter.fit()
+        print "park",result.fitness,result.cov, result.pvec
+        self.assert_(result.fitness)
         
-        #fitter.set_data(data2,2)
-        #fitter.set_model(model1,"M1",2,pars1)
+     
+    def test_cylinder_scipy(self):
+        """ test fitting large model with scipy"""
+        #load data
+        from sans.fit.Loader import Load
+        load= Load()
+        load.set_filename("cyl_testdata.txt")
+        load.set_values()
+        data11 = Data1D(x=[], y=[],dx=None, dy=None)
+        load.load_data(data11)
+        data1=Data(sans_data=data11)
         
-        chisqr1, out1, cov1=fitter.fit()
-        print "park",chisqr1, out1, cov1
-        self.assert_(chisqr1)
         
-       
+        #Importing the Fit module
+        from sans.fit.Fitting import Fit
+        fitter= Fit('scipy')
+        
+        # Receives the type of model for the fitting
+        from sans.models.CylinderModel import CylinderModel
+        model1  = CylinderModel()
+        model =Model(model1)
+        
+        #Do the fit SCIPY
+        fitter.set_data(data1,1)
+        import math
+        #pars1=['background','contrast', 'length']
+        pars1=['background','contrast',\
+                'cyl_phi','cyl_theta','length','radius','scale']
+        pars1.sort()
+        fitter.set_model(model,"M1",1,pars1)
+        fitter.set_data(data1,1)
       
+        result=fitter.fit()
+        print "scipy",result.fitness,result.cov, result.pvec
+        self.assert_(result.fitness)
+        
+