Changeset 495809d in sasview

Timestamp:

May 27, 2008 12:00:12 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:

b11d175

Parents:

197ea24

Message:

more testing

File:

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

park_integration/test/testfitting.py

@@ -72 +72 @@
         Fit.set_data(data1,1)
         Fit.set_model(model,1)
+        self.assertEqual(Fit.fit_engine("scipy"),True)
         chisqr, out, cov=Fit.fit({'A':2,'B':1},None,None)
         #print"fit only one data",chisqr, out, cov   
         #Testing results
-        self.assertEqual(Fit.fit_engine("scipy"),True)
+        
         self.assert_(math.fabs(out[1]-2.5)/math.sqrt(cov[1][1]) < 2)
         self.assert_(math.fabs(out[0]-4.0)/math.sqrt(cov[0][0]) < 2)
@@ -113 +114 @@
         Fit.set_data(data2,2)
         Fit.set_model(model,2)
-        
+        self.assertEqual(Fit.fit_engine("scipy"),True)
+        self.assertEqual(Fit.fit_engine("scipys"),False)
         chisqr, out, cov=Fit.fit({'A':2,'B':1},None,None)
         #print"fit only one data",chisqr, out, cov
         
         #Testing results
-        self.assertEqual(Fit.fit_engine("scipy"),True)
+        
         self.assert_(math.fabs(out[1]-2.5)/math.sqrt(cov[1][1]) < 2)
         self.assert_(math.fabs(out[0]-4.0)/math.sqrt(cov[0][0]) < 2)
         self.assert_(chisqr/len(data1.x) < 2)
         
+