Changeset d48858da in sasview for park_integration

Timestamp:

Aug 17, 2011 9:02:51 AM (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:

d4edd72

Parents:

aaeae3a0

Message:

update fit batch and smear

Location:

park_integration/test

Files:

• batch_fit.py (modified) (8 diffs)
• latex_qdev.txt (added)
• latex_qdev2.txt (added)

park_integration/test/batch_fit.py

@@ -5 +5 @@
 import time
 import unittest
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
 from sans.fit.Fitting import Fit
 from sans.models.CylinderModel import CylinderModel
@@ -13 +13 @@
 NPTS = 1
 
+
+
+    
 def classMapper(classInstance, classFunc, *args):
     """
@@ -24 +27 @@
 
 
+
 class BatchScipyFit:
     """
-    test fit module using map function
+    test fit module
     """
     def __init__(self, qmin=None, qmax=None):
@@ -85 +89 @@
         self.list_of_constraints = []
         self.list_of_mapper = []
+        engine ="scipy"
         
         path = "testdata_line3.txt"
-        self._reset_helper(path=path, engine="scipy", npts=NPTS)
+        self._reset_helper(path=path, engine=engine, npts=NPTS)
         path = "testdata_line.txt"
-        self._reset_helper(path=path, engine="scipy", npts=NPTS)
+        self._reset_helper(path=path, engine=engine, npts=NPTS)
         path = "SILIC010_noheader.DAT"
-        self._reset_helper(path=path, engine="scipy", npts=NPTS)
+        self._reset_helper(path=path, engine=engine, npts=NPTS)
         path = "cyl_400_20.txt"
-        self._reset_helper(path=path, engine="scipy", npts=NPTS)
+        self._reset_helper(path=path, engine=engine, npts=NPTS)
         path = "sphere_80.txt"
-        self._reset_helper(path=path, engine="scipy", npts=NPTS)
+        self._reset_helper(path=path, engine=engine, npts=NPTS)
         path = "PolySpheres.txt"
-        self._reset_helper(path=path, engine="scipy", npts=NPTS)
+        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        path = "latex_qdev.txt"
+        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        path = "latex_qdev2.txt"
+        self._reset_helper(path=path, engine=engine, npts=NPTS)
       
     def test_map_fit(self):
@@ -103 +112 @@
         """ 
         results =  map(classMapper,self.list_of_fitter, self.list_of_function)
-        #print len(results)
-        #for result in results:
-        #    print result.fitness, result.stderr, result.pvec
+        print len(results)
+        for result in results:
+            print result.fitness, result.stderr, result.pvec
         
     def test_process_map_fit(self, n=1):
@@ -118 +127 @@
                                iterable=temp)
         t1 = time.time()
-        print "got %s fit results  in %ss" % (str(len(results)), str(t1 - t0))
-       
-        #for result in results:
-        #    print result.fitness, result.stderr, result.pvec
-        #t2 = time.time()
-        #print "print fit results ", time.strftime(" %H:%M:%S", time.localtime(t2)), t2 - t1   
+        print "got fit results ", time.strftime(" %H:%M:%S", time.localtime(t1)), t1 - t0
+        print len(results)
+        for result in results:
+            print result.fitness, result.stderr, result.pvec
+        t2 = time.time()
+        print "print fit1 results ", time.strftime(" %H:%M:%S", time.localtime(t2)), t2 - t1   
                 
 class testBatch(unittest.TestCase):
@@ -136 +145 @@
         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):
@@ -148 +157 @@
         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)
+    #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)