Changeset cf3b781 in sasview for park_integration/ParkFitting.py

Timestamp:

Jul 7, 2008 6:37:27 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:

1b0b3ca

Parents:

672c44da

Message:

need more tests.but usecase 3 implemented

File:

• park_integration/ParkFitting.py (modified) (8 diffs)

park_integration/ParkFitting.py

@@ -7 +7 @@
 from park import fit,fitresult
 from park import assembly
+from park.fitmc import FitSimplex, FitMC
 
 from sans.guitools.plottables import Data1D
@@ -67 +68 @@
         x,y,dy = [numpy.asarray(v) for v in (self.x,self.y,self.dy)]
         if self.qmin==None and self.qmax==None: 
+            self.fx = fn(x)
             return (y - fn(x))/dy
         
         else:
+            self.fx = fn(x[idx])
             idx = x>=self.qmin & x <= self.qmax
             return (y[idx] - fn(x[idx]))/dy[idx]
@@ -115 +118 @@
         if data in self.dList:
             self.dList.remove(data)
+    def remove_model(self):
+        """ Remove model """
+        model=None
+    def remove_datalist(self):
+        self.dList=[]
             
 class ParkFit:
@@ -160 +168 @@
             mylist.append(couple)
         #print mylist
-        return mylist
+        self.problem =  park.Assembly(mylist)
         #return model,data
     
@@ -167 +175 @@
              Do the fit 
         """
-    
+
+        self.createProblem(pars)
         print "starting ParkFit.fit()"
-        modelList=self.createProblem()
-        problem =  park.Assembly(modelList)
-        pars=problem.fit_parameters()
+        #problem[0].model.parameterset['A'].set([1,5])
+        #problem[0].model.parameterset['B'].set([1,5])
+        pars=self.problem.fit_parameters()
         print "About to call eval",pars
         print "initial",[p.value for p in pars]
-        problem.eval()
+        self.problem.eval()
         #print "M2.B",problem.parameterset['M2.B'].expression,problem.parameterset['M2.B'].value
         #print "problem :",problem[0].parameterset,problem[0].parameterset.fitted
@@ -180 +189 @@
         #problem[0].parameterset['A'].set([0,1000])
         #print "problem :",problem[0].parameterset,problem[0].parameterset.fitted
-        fit.fit(problem, handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
-       
+
+        localfit = FitSimplex()
+        localfit.ftol = 1e-8
+        fitter = FitMC(localfit=localfit)
+
+        result = fit.fit(self.problem,
+                         fitter=fitter,
+                         handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
+        pvec = result.pvec
+        cov = self.problem.cov(pvec)
+        return result.fitness,pvec,numpy.sqrt(numpy.diag(cov))
+
     
     def set_model(self,model,Uid):
@@ -219 +238 @@
         return parameters
     
-    def add_constraint(self, constraint):
-        """ User specify contraint to fit """
-        self.constraint = str(constraint)
-        
-    def get_constraint(self):
-        """ return the contraint value """
-        return self.constraint
-   
-    def set_constraint(self,constraint):
-        """ 
-            receive a string as a constraint
-            @param constraint: a string used to constraint some parameters to get a 
-                specific value
-        """
-        self.constraint= constraint
+    def remove_data(self,Uid,data=None):
+        """ remove one or all data"""
+        if data==None:# remove all element in data list
+            if self.fitArrangeList.has_key(Uid):
+                self.fitArrangeList[Uid].remove_datalist()
+        else:
+            if self.fitArrangeList.has_key(Uid):
+                self.fitArrangeList[Uid].remove_data(data)
+                
+    def remove_model(self,Uid):
+        """ remove model """
+        if self.fitArrangeList.has_key(Uid):
+            self.fitArrangeList[Uid].remove_model()
+                
+                
     def _concatenateData(self, listdata=[]):
         """ concatenate each fields of all Data contains ins listdata
@@ -287 +306 @@
     
 
-      
-if __name__ == "__main__": 
-    load= Load()
-    
-    # test fit one data set one model
-    load.set_filename("testdata_line.txt")
-    load.set_values()
-    data1 = Data1D(x=[], y=[], dx=None,dy=None)
-    data1.name = "data1"
-    load.load_data(data1)
-    fitter =ParkFit()
-    
-    from sans.guitools.LineModel import LineModel
-    model  = LineModel()
-    fitter.set_model(model,1)
-    fitter.set_data(data1,1)
-    
-    print"PARK fit result",fitter.fit({'A':2,'B':1},None,None)
+
+    
    
     
-   
-