Changeset d1c8036 in sasview

Timestamp:

Aug 26, 2011 3:44:43 PM (13 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:

2e95da4

Parents:

f3242cf

Message:

update unittest

File:

• park_integration/test/batch_fit.py (modified) (5 diffs)

park_integration/test/batch_fit.py

@@ +1 @@
+
 
 import math
@@ -73 +74 @@
             #smear data
             current_smearer = smear_selection(data, model)
+            import cPickle
+            p = cPickle.dumps(current_smearer)
+            sm = cPickle.loads(p)
             fitter.set_data(data=data, id=i,
                              smearer=current_smearer, qmin=self.qmin, qmax=self.qmax)
@@ -107 +111 @@
         path = "latex_qdev2.txt"
         self._reset_helper(path=path, engine=engine, npts=NPTS)
+        
       
     def test_map_fit(self):
@@ -140 +145 @@
     def setUp(self):
         self.test = BatchScipyFit(qmin=None, qmax=None)
+       
     
-    def test_fit1(self):
+    def __test_fit1(self):
         """test fit with python built in map function---- full range of each data"""
         self.test.test_map_fit()
         
-    #def test_fit2(self):
-    #   """test fit with python built in map function---- common range for all data"""
-    #    self.test.set_range(qmin=0.013, qmax=0.05)
-    #    self.test.reset_value()
-    #    self.test.test_map_fit()
+    def __test_fit2(self):
+        """test fit with python built in map function---- common range for all data"""
+        self.test.set_range(qmin=0.013, qmax=0.05)
+        self.test.reset_value()
+        self.test.test_map_fit()
         
     def test_fit3(self):
@@ -155 +161 @@
         self.test.set_range(qmin=None, qmax=None)
         self.test.reset_value()
+        self.test.test_process_map_fit(n=2)
+        
+    def test_fit4(self):
+        """test fit with a common fixed range for data using 1 processor and map"""
+        self.test.set_range(qmin=-1, qmax=10)
+        self.test.reset_value()
         self.test.test_process_map_fit(n=1)
-        
-    #def test_fit4(self):
-    #    """test fit with a common fixed range for data using 1 processor and map"""
-    #    self.test.set_range(qmin=0.013, qmax=0.05)
-    #    self.test.reset_value()
-    #    self.test.test_process_map_fit(n=1)