Changeset 5bf0331 in sasview for test

Timestamp:

May 5, 2014 9:21:47 AM (11 years ago)

Author:

pkienzle

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:

644ca73

Parents:

6f87cc1 (diff), 0089be3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from trunk

Location:

test

Files:

• run_one.py (modified) (1 diff)
• sansdataloader/test/utest_cansas.py (modified) (6 diffs)
• sansmodels/test/utest_coreshellellipsoidXTmodel.py (added)
• park_integration/test/utest_fit_line.py (moved) (moved from test/park_integration/test/test_fit_line.py) (11 diffs)

test/run_one.py

@@ -9 +9 @@
 
 run_py = joinpath(dirname(dirname(abspath(__file__))), 'run.py')
-#print run_py
 run = imp.load_source('sasview_run', run_py)
 run.prepare()

test/sansdataloader/test/utest_cansas.py

@@ -90 +90 @@
         self.assertTrue(data.detector[1].distance == 4145.02)
         self.assertTrue(data.process[0].name == "Mantid generated CanSAS1D XML")
-        self.assertTrue(data.meta_data["xmlpreprocess"]["xml-stylesheet"] != None)
+        self.assertTrue(data.meta_data["xmlpreprocess"] != None)
         
     
@@ -102 +102 @@
         xmlreader = XMLreader(self.isis_1_1, self.schema_1_1)
         valid = xmlreader.validateXML()
+        xmlreader.setProcessingInstructions()
         self.assertTrue(valid)
+        fo = open(self.isis_1_1)
+        str = fo.read()
         reader_generic = Loader()
         dataloader = reader_generic.load(self.isis_1_1)
@@ -113 +116 @@
             self._check_data_1_1(cansasreader[i])
             reader_generic.save(filename, dataloader[i], None)
-            reader2 = Reader()
-            return_data = reader2.read(filename)
-            data_new = return_data
+            fo = open(filename)
+            str = fo.read()
+            reader2 = Loader()
+            return_data = reader2.load(filename)
             written_data = return_data[0]
             self._check_data(written_data)
-            
+    
     
     def test_double_trans_spectra(self):
@@ -169 +173 @@
         self.assertTrue(reader4.validateXML())
         
+    
     def test_save_cansas_v1_0(self):
         filename = "isis_1_0_write_test.xml"
@@ -184 +189 @@
             reader2 = Reader()
             return_data = reader2.read(filename)
-            data_new = return_data
             written_data = return_data[0]
+            xmlwrite = XMLreader(filename, self.schema_1_0)
+            valid = xmlreader.validateXML()
+            self.assertTrue(valid)
             self._check_data(written_data)
         
@@ -230 +237 @@
         return dict
         
+
 if __name__ == '__main__':
     unittest.main()    

test/park_integration/test/utest_fit_line.py

@@ -4 +4 @@
 """
 import unittest
-
-from sans.fit.AbstractFitEngine import Model
+import math
+
+from sans.fit.AbstractFitEngine import Model, FitHandler
 from sans.dataloader.loader import Loader
 from sans.fit.Fitting import Fit
@@ -11 +12 @@
 from sans.models.Constant import Constant
 
-import math
 class testFitModule(unittest.TestCase):
     """ test fitting """
-   
-    def test1(self):
-        """ Fit 1 data (testdata_line.txt)and 1 model(lineModel) """
-        #load data
+
+    def test_bad_pars(self):
+        fitter = Fit('bumps')
+
         data = Loader().load("testdata_line.txt")
         data.name = data.filename
-        #Importing the Fit module
-        fitter = Fit('scipy')
+        fitter.set_data(data,1)
+
+        model1  = LineModel()
+        model1.name = "M1"
+        model = Model(model1, data)
+        pars1= ['param1','param2']
+        try:
+            fitter.set_model(model,1,pars1)
+        except ValueError,exc:
+            #print "ValueError was correctly raised: "+str(msg)
+            assert str(exc).startswith('wrong parameter')
+        else:
+            raise AssertionError("No error raised for scipy fitting with wrong parameters name to fit")
+
+    def fit_single(self, fitter_name, isdream=False):
+        fitter = Fit(fitter_name)
+
+        data = Loader().load("testdata_line.txt")
+        data.name = data.filename
+        fitter.set_data(data,1)
+
         # Receives the type of model for the fitting
         model1  = LineModel()
@@ -27 +46 @@
         model = Model(model1,data)
         #fit with scipy test
-        
-        pars1= ['param1','param2']
-        fitter.set_data(data,1)
-        try:fitter.set_model(model,1,pars1)
-        except ValueError,exc:
-            #print "ValueError was correctly raised: "+str(msg)
-            assert str(exc).startswith('wrong parameter')
-        else: raise AssertionError("No error raised for scipy fitting with wrong parameters name to fit")
+
         pars1= ['A','B']
         fitter.set_model(model,1,pars1)
         fitter.select_problem_for_fit(id=1,value=1)
-        result1, = fitter.fit()
-
-        self.assertTrue( math.fabs(result1.pvec[0]-4)/3 <= result1.stderr[0] )
-        self.assertTrue( math.fabs(result1.pvec[1]-2.5)/3 <= result1.stderr[1])
-        self.assertTrue( result1.fitness/len(data.x) < 2 )
-
-        #fit with park test
-        fitter = Fit('park')
-        fitter.set_data(data,1)
-        fitter.set_model(model,1,pars1)
-        fitter.select_problem_for_fit(id=1,value=1)
-        result2, = fitter.fit()
-        
-        self.assert_(result2)
-        self.assertTrue( math.fabs(result2.pvec[0]-4)/3 <= result2.stderr[0] ) 
-        self.assertTrue( math.fabs(result2.pvec[1]-2.5)/3 <= result2.stderr[1] )
-        self.assertTrue( result2.fitness/len(data.x) < 2)
-        # compare fit result result for scipy and park
-        self.assertAlmostEquals( result1.pvec[0], result2.pvec[0] )
-        self.assertAlmostEquals( result1.pvec[1],result2.pvec[1] )
-        self.assertAlmostEquals( result1.stderr[0],result2.stderr[0] )
-        self.assertAlmostEquals( result1.stderr[1],result2.stderr[1] )
-        self.assertAlmostEquals( result1.fitness,
-                                 result2.fitness/len(data.x),1 )
-        
+        result1, = fitter.fit(handler=FitHandler())
+
+        # The target values were generated from the following statements
+        p,s,fx = result1.pvec, result1.stderr, result1.fitness
+        #print "p0,p1,s0,s1,fx_ = %g, %g, %g, %g, %g"%(p[0],p[1],s[0],s[1],fx)
+        p0,p1,s0,s1,fx_ = 3.68353, 2.61004, 0.336186, 0.105244, 1.20189
+
+        if isdream:
+            # Dream is not a minimizer: just check that the fit is within
+            # uncertainty
+            self.assertTrue( abs(p[0]-p0) <= s0 )
+            self.assertTrue( abs(p[1]-p1) <= s1 )
+        else:
+            self.assertTrue( abs(p[0]-p0) <= 1e-5 )
+            self.assertTrue( abs(p[1]-p1) <= 1e-5 )
+            self.assertTrue( abs(fx-fx_) <= 1e-2 )
+
+    def fit_bumps(self, alg, **opts):
+        #Importing the Fit module
+        from bumps import fitters
+        fitters.FIT_DEFAULT = alg
+        fitters.FIT_OPTIONS[alg].options.update(opts)
+        fitters.FIT_OPTIONS[alg].options.update(monitors=[])
+        #print "fitting",alg,opts
+        #kprint "options",fitters.FIT_OPTIONS[alg].__dict__
+        self.fit_single('bumps', isdream=(alg=='dream'))
+
+    def test_bumps_de(self):
+        self.fit_bumps('de')
+
+    def test_bumps_dream(self):
+        self.fit_bumps('dream', burn=500, steps=100)
+
+    def test_bumps_amoeba(self):
+        self.fit_bumps('amoeba')
+
+    def test_bumps_newton(self):
+        self.fit_bumps('newton')
+
+    def test_scipy(self):
+        #print "fitting scipy"
+        self.fit_single('scipy')
+
+    def test_park(self):
+        #print "fitting park"
+        self.fit_single('park')
+
         
     def test2(self):
@@ -93 +127 @@
         fitter.select_problem_for_fit(id=2,value=0)
         
-        try: result1, = fitter.fit()
+        try: result1, = fitter.fit(handler=FitHandler())
         except RuntimeError,msg:
            assert str(msg)=="No Assembly scheduled for Scipy fitting."
@@ -99 +133 @@
         fitter.select_problem_for_fit(id=1,value=1)
         fitter.select_problem_for_fit(id=2,value=1)
-        try: result1, = fitter.fit()
+        try: result1, = fitter.fit(handler=FitHandler())
         except RuntimeError,msg:
            assert str(msg)=="Scipy can't fit more than a single fit problem at a time."
         else: raise AssertionError,"No error raised for scipy fitting with more than 2 models"
-        
+
         #fit with park test
         fitter = Fit('park')
@@ -112 +146 @@
         fitter.select_problem_for_fit(id=1,value=1)
         fitter.select_problem_for_fit(id=2,value=1)
-        R1,R2 = fitter.fit()
+        R1,R2 = fitter.fit(handler=FitHandler())
         
         self.assertTrue( math.fabs(R1.pvec[0]-4)/3 <= R1.stderr[0] )
@@ -157 +191 @@
         fitter.select_problem_for_fit(id=2,value=1)
         
-        R1,R2 = fitter.fit()
+        R1,R2 = fitter.fit(handler=FitHandler())
         self.assertTrue( math.fabs(R1.pvec[0]-4.0)/3. <= R1.stderr[0])
         self.assertTrue( math.fabs(R1.pvec[1]-2.5)/3. <= R1.stderr[1])
@@ -188 +222 @@
         fitter.select_problem_for_fit(id=1,value=1)
         
-        result1, = fitter.fit()
+        result1, = fitter.fit(handler=FitHandler())
+        #print(result1)
         self.assert_(result1)
 
@@ -194 +229 @@
         self.assertTrue( math.fabs(result1.pvec[1]-2.5)/3 <= result1.stderr[1])
         self.assertTrue( result1.fitness/len(data1.x) < 2 )
-        
+
         #fit with park test
         fitter = Fit('park')
@@ -201 +236 @@
         fitter.set_data(data2,1,qmin=1,qmax=10)
         fitter.select_problem_for_fit(id=1,value=1)
-        result2, = fitter.fit()
+        result2, = fitter.fit(handler=FitHandler())
         
         self.assert_(result2)
@@ -213 +248 @@
         self.assertAlmostEquals( result1.stderr[1],result2.stderr[1] )
         self.assertTrue( result2.fitness/(len(data2.x)+len(data1.x)) < 2 )
-        
-        
+
+
+if __name__ == "__main__":
+    unittest.main()
     
-