Changeset cf3b781 in sasview for park_integration/Fitting.py

Timestamp:

Jul 7, 2008 4: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/Fitting.py (modified) (1 diff)

park_integration/Fitting.py

@@ -42 +42 @@
         """ return list of data"""
     
-    def set_param(self,model, pars):
+    def set_param(self,model,name, pars):
         """ Recieve a dictionary of parameter and save it """
    
-    def add_constraint(self, constraint):
-        """ User specify contraint to fit """
+    def remove_data(self,Uid,data=None):
+        """ remove one or all data"""
+                 
+    def remove_model(self,Uid):
+        """ remove model """
         
-    def get_constraint(self):
-        """ return the contraint value """
-  
-    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
         """
-if __name__ == "__main__": 
-    load= Load()
-    # test scipy 
-    """test fit one data set one model with scipy """
-    #load data 
-    load.set_filename("testdata_line.txt")
-    load.set_values()
-    data1 = Data1D(x=[], y=[], dx=None,dy=None)
-    data1.name = "data1"
-    load.load_data(data1)
-    #choose a model
-    from sans.guitools.LineModel import LineModel
-    model  = LineModel()
-    #Create a Fit engine
-    fitter =Fit()
-    fitter.fit_engine('scipy')
-    engine = fitter.returnEngine()
-    
-    #set the model
-    engine.set_model(model,1)
-    engine.set_data(data1,1)
-    
-    print"fit only one data SCIPY:",engine.fit({'A':2,'B':1},None,None)
-    
-    
-    """ test fit one data set one model with park """
-    fitter.fit_engine('scipy')
-    engine = fitter.returnEngine()
-    #set the model
-    engine.set_model(model,1)
-    engine.set_data(data1,1)
-    
-    print"fit only one data PARK:",engine.fit({'A':2,'B':1},None,None)
-    
-    
-    """test fit with 2 data and one model SCIPY:"""
-    # reinitialize the fitter
-    fitter =Fit()
-    #create an engine
-    fitter.fit_engine("scipy")
-    engine=fitter.returnEngine()
-    #set the model for fit
-    engine.set_model(model,2 )
-    #load 1 st data
-    load.set_filename("testdata1.txt")
-    load.set_values()
-    data2 = Data1D(x=[], y=[], dx=None,dy=None)
-    data2.name = "data2"
-    load.load_data(data2)
-    #load  2nd data
-    load.set_filename("testdata2.txt")
-    load.set_values()
-    data3 = Data1D(x=[], y=[], dx=None,dy=None)
-    data3.name = "data2"
-    load.load_data(data3)
-    
-    #set data in the engine
-    engine.set_data(data2,2)
-    engine.set_data(data3,2)
-    print"fit two data SCIPY:",engine.fit({'A':2,'B':1},None,None)
-    
-    """ test fit with 2 data and one model PARK:"""
-    fitter.fit_engine("park")
-    engine=fitter.returnEngine()
-    #set the model for fit
-    engine.set_model(model,2 )
-    #load 1 st data
-    load.set_filename("testdata1.txt")
-    load.set_values()
-    data2 = Data1D(x=[], y=[], dx=None,dy=None)
-    data2.name = "data2"
-    load.load_data(data2)
-    #load  2nd data
-    load.set_filename("testdata2.txt")
-    load.set_values()
-    data3 = Data1D(x=[], y=[], dx=None,dy=None)
-    data3.name = "data2"
-    load.load_data(data3)
-    
-    #set data in the engine
-    engine.set_data(data2,2)
-    engine.set_data(data3,2)
-    print"fit two data PARK:",engine.fit({'A':2,'B':1},None,None)
-    
-