Changeset d4b0687 in sasview for park_integration/AbstractFitEngine.py

Timestamp:

Jul 11, 2008 11:16:18 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:

94b44293

Parents:

4c718654

Message:

changed done on AbstractFit? engine scipyfit parkfit

File:

• park_integration/AbstractFitEngine.py (modified) (2 diffs)

park_integration/AbstractFitEngine.py

@@ -32 +32 @@
             return xtemp, ytemp,dytemp
     
+    def set_model(self,model,name,Uid,pars={}):
+        """ 
       
+            Receive a dictionary of parameter and save it Parameter list
+            For scipy.fit use.
+            Set model in a FitArrange object and add that object in a dictionary
+            with key Uid.
+            @param model: model on with parameter values are set
+            @param name: model name
+            @param Uid: unique key corresponding to a fitArrange object with model
+            @param pars: dictionary of paramaters name and value
+            pars={parameter's name: parameter's value}
+            
+        """
+        self.parameters=[]
+        if model==None:
+            raise ValueError, "Cannot set parameters for empty model"
+        else:
+            model.name=name
+            for key, value in pars.iteritems():
+                param = Parameter(model, key, value)
+                self.parameters.append(param)
+        
+        #A fitArrange is already created but contains dList only at Uid
+        if self.fitArrangeList.has_key(Uid):
+            self.fitArrangeList[Uid].set_model(model)
+        else:
+        #no fitArrange object has been create with this Uid
+            fitproblem= FitArrange()
+            fitproblem.set_model(model)
+            self.fitArrangeList[Uid]=fitproblem
+        
+        
+    def set_data(self,data,Uid):
+        """ Receives plottable, creates a list of data to fit,set data
+            in a FitArrange object and adds that object in a dictionary 
+            with key Uid.
+            @param data: data added
+            @param Uid: unique key corresponding to a fitArrange object with data
+            """
+        #A fitArrange is already created but contains model only at Uid
+        if self.fitArrangeList.has_key(Uid):
+            self.fitArrangeList[Uid].add_data(data)
+        else:
+        #no fitArrange object has been create with this Uid
+            fitproblem= FitArrange()
+            fitproblem.add_data(data)
+            self.fitArrangeList[Uid]=fitproblem
+            
+    def get_model(self,Uid):
+        """ 
+            @param Uid: Uid is key in the dictionary containing the model to return
+            @return  a model at this uid or None if no FitArrange element was created
+            with this Uid
+        """
+        if self.fitArrangeList.has_key(Uid):
+            return self.fitArrangeList[Uid].get_model()
+        else:
+            return None
+    
+    def remove_Fit_Problem(self,Uid):
+        """remove   fitarrange in Uid"""
+        if self.fitArrangeList.has_key(Uid):
+            del self.fitArrangeList[Uid]
+            
+      
+   
+   
 class Parameter:
     """
@@ -55 +122 @@
         return self.model.getParam(self.name)
     
+class FitArrange:
+    def __init__(self):
+        """
+            Class FitArrange contains a set of data for a given model
+            to perform the Fit.FitArrange must contain exactly one model
+            and at least one data for the fit to be performed.
+            model: the model selected by the user
+            Ldata: a list of data what the user wants to fit
+            
+        """
+        self.model = None
+        self.dList =[]
+        
+    def set_model(self,model):
+        """ 
+            set_model save a copy of the model
+            @param model: the model being set
+        """
+        self.model = model
+        
+    def add_data(self,data):
+        """ 
+            add_data fill a self.dList with data to fit
+            @param data: Data to add in the list  
+        """
+        if not data in self.dList:
+            self.dList.append(data)
+            
+    def get_model(self):
+        """ @return: saved model """
+        return self.model   
+     
+    def get_data(self):
+        """ @return:  list of data dList"""
+        return self.dList 
+      
+    def remove_data(self,data):
+        """
+            Remove one element from the list
+            @param data: Data to remove from dList
+        """
+        if data in self.dList:
+            self.dList.remove(data)
+    def remove_datalist(self):
+        """ empty the complet list dLst"""
+        self.dList=[]
+