Changeset 6b126e8 in sasview for park_integration

Timestamp:

Jul 30, 2008 3:52:48 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:

60dc5f2c

Parents:

8780e9a

Message:

test added

Location:

park_integration

Files:

• ParkFitting.py (modified) (5 diffs)
• test/test_fitting_panel.py (added)
• test/test_log.txt (added)
• test/testdata_line.txt (modified) (1 diff)
• test/testdata_line1.txt (added)

park_integration/ParkFitting.py

@@ -49 +49 @@
     def __init__(self, sans_model):
         self.model = sans_model
-        print "ParkFitting:sans model",self.model
+        #print "ParkFitting:sans model",self.model
         sansp = sans_model.getParamList()
-        print "ParkFitting: sans model parameter list",sansp
+        #print "ParkFitting: sans model parameter list",sansp
         parkp = [SansParameter(p,sans_model) for p in sansp]
-        print "ParkFitting: park model parameter ",parkp
+        #print "ParkFitting: park model parameter ",parkp
         self.parameterset = park.ParameterSet(sans_model.name,pars=parkp)
         
     def eval(self,x):
-        print "eval",self.parameterset[0].value,self.parameterset[1].value
-        print "model run ",self.model.run(x)
+        #print "eval",self.parameterset[0].value,self.parameterset[1].value
+        #print "model run ",self.model.run(x)
         return self.model.run(x)
     
@@ -156 +156 @@
             #wrap sans model
             parkmodel = Model(sansmodel)
-            print "ParkFitting: createproblem: just create a model",parkmodel.parameterset
+            #print "ParkFitting: createproblem: just create a model",parkmodel.parameterset
             for p in parkmodel.parameterset:
                 #self.param_list.append(p._getname())
-                if p.isfixed() and p._getname()in self.paramList:
+                if p.isfixed():
+                #if p.isfixed() and p._getname()in self.paramList:
                     p.set([-numpy.inf,numpy.inf])
             
@@ -167 +168 @@
             parkdata=Data(x,y,dy,None)
             couple=(parkmodel,parkdata)
-            print "Parkfitting: fitness",couple   
+            #print "Parkfitting: fitness",couple   
             mylist.append(couple)
-        print "mylist",mylist
+        #print "mylist",mylist
         self.problem =  park.Assembly(mylist)
         
@@ -190 +191 @@
         """
         #from numpy.linalg.linalg.LinAlgError import LinAlgError
-        print "Parkfitting: fit method probably breaking just right before \
-        call fit"
+        #print "Parkfitting: fit method probably breaking just right before \
+        #call fit"
         self.createProblem()
         pars=self.problem.fit_parameters()
@@ -206 +207 @@
                          handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
           
-            for p in result.parameters:
-                print "fit in park fitting", p.name, p.value
-            return result.fitness,result.pvec,result.cov
+            #for p in result.parameters:
+            #    print "fit in park fitting", p.name, p.value,p.stderr
+            return result.fitness,result.pvec,result.cov,result
            
         except :

park_integration/test/testdata_line.txt

@@ -33 +33 @@
 5.91837  14.9428  2.81939
 6.12245  22.1974  2.89592
+6.32653  17.3418  2.97245
+6.53061  19.8174  3.04898
+6.73469  17.6186  3.12551
+6.93878  21.329  3.20204
+7.14286  20.2873  3.27857
+7.34694  23.4112  3.3551
+7.55102  26.063  3.43163
+7.7551  29.8775  3.50816
+7.95918  19.0027  3.58469
+8.16327  19.4248  3.66122
+8.36735  27.4876  3.73776
+8.57143  33.8399  3.81429
+8.77551  24.2611  3.89082
+8.97959  29.8796  3.96735
+9.18367  24.6149  4.04388
+9.38776  35.7664  4.12041
+9.59184  32.145  4.19694
+9.79592  24.8085  4.27347
+10  31.3767  4.35