Changeset 8bbab51 in sasview

Timestamp:

Sep 30, 2008 10:34:36 AM (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:

948add7

Parents:

a9e04aa

Message:

modified tests

Location:

park_integration/test

Files:

• cyl_400_20.txt (added)
• cyl_400_40.txt (added)
• small_test.py (added)
• test_engine_methods.py (moved) (moved from park_integration/test/testnewscipys.py)
• test_fit_cylinder.py (modified) (6 diffs)
• test_fit_line.py (modified) (10 diffs)

park_integration/test/test_fit_cylinder.py

@@ -29 +29 @@
         pars1 =['length','radius','scale']
         fitter.set_data(data,1)
-        model.model.setParam('scale',1e-10)
+        model.set(scale=1e-10)
         fitter.set_model(model,1,pars1)
+        fitter.select_problem_for_fit(Uid=1,value=1)
         result1 = fitter.fit()
         
@@ -52 +53 @@
         from sans.models.CylinderModel import CylinderModel
         model1  = CylinderModel()
-        model1.setParam('contrast', 1)
+        
         data = Data(sans_data=data1)
         model = Model(model1)
@@ -58 +59 @@
         pars1 =['length','radius','scale']
         fitter.set_data(data,1)
-        model.model.setParam('scale',1e-10)
+        model.set(contrast= 1)
+        model.set(scale=1e-10)
         fitter.set_model(model,1,pars1)
+        fitter.select_problem_for_fit(Uid=1,value=1)
         result1 = fitter.fit()
         
@@ -87 +90 @@
         cyl1  = CylinderModel()
         cyl1.name = "C1"
-        cyl1.setParam('contrast', 1)
-        cyl1.setParam('scale', 1e-10)
+        
         data1 = Data(sans_data=data1)
         model1 = Model(cyl1)
+        model1.set(contrast=1)
+        model1.set(scale= 1e-10)
         fitter.set_data(data1,1)
         fitter.set_model(model1, 1, ['length','radius','scale'])
@@ -96 +100 @@
         cyl2  = CylinderModel()
         cyl2.name = "C2"
-        cyl2.setParam('contrast', 1)
-        cyl2.setParam('scale', 1e-10)
+        
         data2 = Data(sans_data=data2)
         # This is wrong. We should not store string as 
@@ -108 +111 @@
         model2 = Model(cyl2)
         model2.set(length='C1.length')
-        
+        model2.set(contrast=1)
+        model2.set(scale= 1e-10)
         fitter.set_data(data2,2)
         fitter.set_model(model2, 2, ['radius','scale'])
-        
+        fitter.select_problem_for_fit(Uid=1,value=1)
+        fitter.select_problem_for_fit(Uid=2,value=1)
         result1 = fitter.fit()
         

park_integration/test/test_fit_line.py

@@ -10 +10 @@
     """ test fitting """
     def test1(self):
-        """ Fit 1 data (testdata_line.txt)and 1 model(lineModel)  """
+        """ Fit 1 data (testdata_line.txt)and 1 model(lineModel) """
         #load data
         from DataLoader.loader import Loader
@@ -34 +34 @@
         pars1= ['A','B']
         fitter.set_model(model,1,pars1)
+        fitter.select_problem_for_fit(Uid=1,value=1)
         result1 = fitter.fit()
         self.assert_(result1)
@@ -48 +49 @@
         fitter.set_data(data,1)
         fitter.set_model(model,1,pars1)
+        fitter.select_problem_for_fit(Uid=1,value=1)
         result2 = fitter.fit()
         
@@ -91 +93 @@
         fitter.set_data(data1,1)
         fitter.set_model(model1,1,pars1)
+        fitter.select_problem_for_fit(Uid=1,value=0)
         fitter.set_data(data2,2)
         fitter.set_model(model2,2,pars1)
+        fitter.select_problem_for_fit(Uid=2,value=0)
+        
+        try: result1 = fitter.fit()
+        except RuntimeError,msg:
+           assert str(msg)=="No Assembly scheduled for Scipy fitting."
+        else: raise AssertError,"No error raised for scipy fitting with no model"
+        fitter.select_problem_for_fit(Uid=1,value=1)
+        fitter.select_problem_for_fit(Uid=2,value=1)
         try: result1 = fitter.fit()
         except RuntimeError,msg:
@@ -104 +115 @@
         fitter.set_data(data2,2)
         fitter.set_model(model2,2,pars1)
+        fitter.select_problem_for_fit(Uid=1,value=1)
+        fitter.select_problem_for_fit(Uid=2,value=1)
         result2 = fitter.fit()
         
@@ -132 +145 @@
         model11  = LineModel()
         model11.name= "line"
-        model11.setParam('A',4)
-        model11.setParam('B',3)
+       
         model22  = Constant()
         model22.name= "cst"
         # Constrain the constant value to be equal to parameter B (the real value is 2.5)
-        model22.setParam('value','line.B')
+        
         
         data1 = Data(sans_data=data11 )
@@ -143 +155 @@
         model1 = Model(model11)
         model2 = Model(model22)
+        model1.set(A=4)
+        model1.set(B=3)
+        model2.set(value='line.B')
         #fit with scipy test
         pars1= ['A','B']
@@ -151 +166 @@
         fitter.set_data(data2,2)
         fitter.set_model(model2,2,pars2)
+        fitter.select_problem_for_fit(Uid=1,value=1)
+        fitter.select_problem_for_fit(Uid=2,value=1)
         
         result2 = fitter.fit()
@@ -186 +203 @@
         fitter.set_model(model,1,pars1)
         fitter.set_data(data2,1,qmin=1,qmax=10)
+        fitter.select_problem_for_fit(Uid=1,value=1)
         
         result1 = fitter.fit()
@@ -203 +221 @@
         fitter.set_model(model,1,pars1)
         fitter.set_data(data2,1,qmin=1,qmax=10)
-       
+        fitter.select_problem_for_fit(Uid=1,value=1)
         result2 = fitter.fit()