Changeset 4dd63eb in sasview for park_integration/test

Timestamp:

Jul 10, 2008 4:05:09 PM (17 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:

49b3ddd

Parents:

83ca047

Message:

change on set_model

Location:

park_integration/test

Files:

• constrainttestpark.py (modified) (1 diff)
• testfitting.py (modified) (4 diffs)
• testpark.py (modified) (3 diffs)

park_integration/test/constrainttestpark.py

@@ -27 +27 @@
         #Importing the Fit module
         from sans.fit.Fitting import Fit
-        fitter= Fit()
+        fitter= Fit('park')
         # Receives the type of model for the fitting
         from sans.guitools.LineModel import LineModel
         model1  = LineModel()
         model2  = LineModel()
-        #set engine for scipy 
-        fitter.fit_engine('park')
-        engine = fitter.returnEngine()
+        
         #Do the fit
-        engine.set_param( model1,"M1", {'A':2,'B':3})
-        engine.set_model(model1,1)
-        engine.set_data(data1,1)
-        #print "m1 param b", M1.B
-        engine.set_param( model2,"M2", {'A':'M1.A','B':'M1.B'})
-        engine.set_model(model2,2)
         
-        engine.set_data(data2,2)
+        fitter.set_model(model1,"M1",1, {'A':1,'B':2})
+        fitter.set_data(data1,1)
+       
+        fitter.set_model(model2,"M2",2, {'A':'M1.A','B':'M1.B'})
+        fitter.set_data(data2,2)
     
         
-        chisqr2, out2, cov2= engine.fit({'A':2,'B':1},None,None)
+        chisqr2, out2, cov2= fitter.fit()
         print "chisqr2",chisqr2
         print "out2", out2

park_integration/test/testfitting.py

@@ -5 +5 @@
 from sans.guitools.plottables import Theory1D
 from sans.guitools.plottables import Data1D
-from sans.fit.ScipyFitting import Parameter
+
 import math
 class testFitModule(unittest.TestCase):
@@ -64 +64 @@
         #Importing the Fit module
         from sans.fit.Fitting import Fit
-        fitter= Fit()
-        fitter.fit_engine('scipy')
-        engine = fitter.returnEngine()
+        fitter= Fit('scipy')
+        
         # Receives the type of model for the fitting
         from sans.guitools.LineModel import LineModel
@@ -73 +72 @@
         
         #Do the fit SCIPY
-        engine.set_data(data1,1)
-        #engine.set_param( model1,"M1", {'A':2,'B':4})
-        engine.set_model(model1,1)
+        fitter.set_data(data1,1)
+        fitter.set_model(model1,"M1",1,{'A':2,'B':1})
         
-        chisqr1, out1, cov1=engine.fit({'A':2,'B':1},None,None)
+        chisqr1, out1, cov1=fitter.fit()
         """ testing SCIPy results"""
         self.assert_(math.fabs(out1[1]-2.5)/math.sqrt(cov1[1][1]) < 2)
@@ -83 +81 @@
         self.assert_(chisqr1/len(data1.x) < 2)
         # PARK
-        fitter= Fit()
-        fitter.fit_engine('park')
-        engine = fitter.returnEngine()
+        fitter= Fit('park')
         
         #Do the fit
-        engine.set_data(data1,1)
-        engine.set_param( model2,"M1", {'A':2,'B':1})
-        engine.set_model(model2,1)
+        fitter.set_data(data1,1)
+        fitter.set_model(model2,"M1",1,{'A':2,'B':1})
        
-        chisqr2, out2, cov2=engine.fit({'A':2,'B':1},None,None)
+        chisqr2, out2, cov2=fitter.fit(None,None)
         
         self.assert_(math.fabs(out2[1]-2.5)/math.sqrt(cov2[1][1]) < 2)

park_integration/test/testpark.py

@@ -33 +33 @@
         #Importing the Fit module
         from sans.fit.Fitting import Fit
-        fitter= Fit()
+        fitter= Fit('park')
         # Receives the type of model for the fitting
         from sans.guitools.LineModel import LineModel
         model1  = LineModel()
         model2  = LineModel()
-        #set engine for scipy 
-        fitter.fit_engine('park')
-        engine = fitter.returnEngine()
+        
         #Do the fit
-        engine.set_param( model1,"M1", {'A':2.5,'B':4})
-        engine.set_model(model1,1)
-        engine.set_data(data1,1)
+        fitter.set_model(model1,"M1",1, {'A':2.5,'B':4})
+        fitter.set_data(data1,1)
         
-        engine.set_param( model2,"M2", {'A':2,'B':4})
-        engine.set_model(model2,2)
-        engine.set_data(data2,2)
+        fitter.set_model(model2,"M2",2, {'A':2,'B':3})
+        fitter.set_data(data2,2)
         
-        chisqr1, out1, cov1= engine.fit({'A':2,'B':1},None,None)
+        chisqr1, out1, cov1= fitter.fit()
         
         self.assert_(math.fabs(out1[1]-2.5)/math.sqrt(cov1[1][1]) < 2)
@@ -63 +59 @@
         
         
-        engine.set_data(data3,1)
-        chisqr2, out2, cov2= engine.fit({'A':2,'B':1},None,None)
+        fitter.set_data(data3,1)
+        chisqr2, out2, cov2= fitter.fit(None,None)
         self.assert_(math.fabs(out2[1]-2.5)/math.sqrt(cov2[1][1]) < 2)
         print math.fabs(out2[0]-4.0)/math.sqrt(cov2[0][0])
@@ -75 +71 @@
         #self.assert_(chisqr2/len(data2.x) < 2)
         
+        fitter.remove_Fit_Problem(2)
         
-        
-        engine.remove_Fit_Problem(2)
-        chisqr3, out3, cov3= engine.fit({'A':2,'B':1},None,None)
+        chisqr3, out3, cov3= fitter.fit()
         #print "park",chisqr3, out3, cov3
         self.assert_(math.fabs(out1[1]-2.5)/math.sqrt(cov1[1][1]) < 2)