Changeset 916a15f in sasview for park_integration

Timestamp:

Sep 22, 2008 8:16:39 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:

55fd102

Parents:

70975f3

Message:

changes for presentation on tests

Location:

park_integration

Files:

• ParkFitting.py (modified) (4 diffs)
• test/test_fit_cylinder.py (modified) (1 diff)
• test/test_fit_line.py (modified) (3 diffs)
• test/testpark.py (deleted)
• test/testpark_line.py (deleted)

park_integration/ParkFitting.py

@@ -41 +41 @@
         the user should make sure to call set_param himself.
     """
-    def __init__(self,data=[]):
+    def __init__(self):
         """
             Creates a dictionary (self.fitArrangeList={})of FitArrange elements
@@ -61 +61 @@
             parkmodel = value.get_model()
             for p in parkmodel.parameterset:
-                if p.isfixed() and p._getname()in self.paramList:
-                    p.set([-numpy.inf,numpy.inf])
-            i+=1    
+                if p._getname()in self.paramList and not p.iscomputed():
+                    p.status = 'fitted' # make it a fitted parameter
+                            #iscomputed  paramter with string inside
+               
+            i+=1
             Ldata=value.get_data()
             parkdata=self._concatenateData(Ldata)
@@ -89 +91 @@
             @return result.cov: Covariance matrix
         """
-        
         self.createAssembly()
-        pars=self.problem.fit_parameters()
-        self.problem.eval()
+    
         localfit = FitSimplex()
         localfit.ftol = 1e-8
+        # fitmc(fitness,localfit,n,handler):
+        #Run a monte carlo fit.
+        #This procedure maps a local optimizer across a set of n initial points.
+        #The initial parameter value defined by the fitness parameters defines
+        #one initial point.  The remainder are randomly generated within the
+        #bounds of the problem.
+        #localfit is the local optimizer to use.  It should be a bounded
+        #optimizer following the `park.fitmc.LocalFit` interface.
+        #handler accepts updates to the current best set of fit parameters.
+        # See `park.fitresult.FitHandler` for details.
         fitter = FitMC(localfit=localfit)
-        list=self.problem[0]._parameterset()
         #result = fit.fit(self.problem,
         #             fitter=fitter,
@@ -103 +112 @@
                          fitter=fitter,
                          handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
-
-       
         if result !=None:
             return result

park_integration/test/test_fit_cylinder.py

@@ -31 +31 @@
         fitter.set_data(data,1)
         model.model.setParam('scale',10)
-        fitter.set_model(model,"M1",1,pars1)
+        fitter.set_model(model,1,pars1)
         result1 = fitter.fit()
         print "test scipy result:",result1.stderr,result1.pvec,result1.fitness

park_integration/test/test_fit_line.py

@@ -136 +136 @@
         model11  = LineModel()
         model11.name= "line"
+        model11.setParam('A',4)
+        model11.setParam('B',3)
         model22  = Constant()
         model22.name= "cst"
@@ -179 +181 @@
         model1  = LineModel()
         model1.name= "M1"
-        
+      
         data1 = Data(sans_data=data11 )
         data2 = Data(sans_data=data22 )
@@ -192 +194 @@
         result1 = fitter.fit()
         self.assert_(result1)
-        
+
         self.assertTrue( ( math.fabs(result1.pvec[0]-4)/3 == result1.stderr[0] ) or 
                          ( math.fabs(result1.pvec[0]-4)/3 < result1.stderr[0]) )