Changeset 93c2ef2 in sasview

Timestamp:

May 21, 2008 11:10:45 AM (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:

acb8788

Parents:

4a0536a

Message:

some modif

File:

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

park_integration/test/testfitting.py

@@ -2 +2 @@
     Unit tests for fitting module 
 """
-import unittest,fittings
+import unittest
 from sans.guitools.plottables import Theory1D
 from sans.guitools.plottables import Data1D
+from FittingModule import Parameter
+import math
 class testFitModule(unittest.TestCase):
     """ test fitting """
@@ -55 +57 @@
         load= Load()
         load.set_filename("testdata_line.txt")
-        self.assertEqual(load.get_filename(),"testdata_line.txt")
         load.set_values()
         x,y,dx,dy = load.get_values()
-        
         data1 = Data1D(x=[], y=[],dx=None, dy=None)
         load.load_data(data1)
+        
         # Receives the type of model for the fitting
         from sans.guitools.LineModel import LineModel
-        self.model  = LineModel()
-          
+        model  = LineModel()
+        
         from FittingModule import Fitting
-        fitting= Fitting(data1,None)
-        fitting.set_model(self.model)
-        self.assertEqual(fitting.fit_engine(),True)
-        fitting.set_data(x,y,dx,dy)
-        chisqr, out, cov= fitting.fit()
-        self.assertAlmostEqual(out[1],2.5)
-        self.assertAlmostEquals(out[0],4.0)
-        self.assertAlmostEquals(out[1]+cov[1][1],2.5)
-        self.assertAlmostEquals(out[0]+cov[0][0],4.0)
+        Fit= Fitting()
+        Fit.set_data(data1)
+        Fit.set_model(model)
         
+        default_A = model.getParam('A') 
+        default_B = model.getParam('B') 
+        cstA = Parameter(model, 'A', default_A)
+        cstB  = Parameter(model, 'B', default_B)
+        chisqr, out, cov=Fit.fit([cstA,cstB],None,None)
+        print"fit only one data",chisqr, out, cov   
+       
+        self.assertEqual(Fit.fit_engine(),True)
+        
+        self.assert_(math.fabs(out[1]-2.5)/math.sqrt(cov[1][1]) < 2)
+        print "chisqr",chisqr/len(data1.x)
+        self.assert_(chisqr/len(data1.x) < 2)
+#        self.assertAlmostEqual(out[1],2.5)
+        #self.assertAlmostEquals(out[0],4.0)
+        #self.assertAlmostEquals(out[1]+cov[1][1],2.5)
+        #self.assertAlmostEquals(out[0]+cov[0][0],4.0)
+