Changeset 4dd63eb in sasview for park_integration/test/testfitting.py

Timestamp:

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

49b3ddd

Parents:

83ca047

Message:

change on set_model

File:

• park_integration/test/testfitting.py (modified) (4 diffs)

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)