Changeset 388309d in sasview

Timestamp:

Sep 12, 2008 12:05:19 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:

e7430b6

Parents:

49b7efa

Message:

park_integration working better for large model

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (4 diffs)
• ParkFitting.py (modified) (2 diffs)
• test/constrainttestpark.py (deleted)
• test/test_fitting_panel.py (deleted)
• test/test_large_model.py (deleted)
• test/testnewscipy.py (modified) (2 diffs)
• test/testpark_line.py (added)

park_integration/AbstractFitEngine.py

@@ -34 +34 @@
         PARK wrapper for SANS models.
     """
-    def __init__(self, sans_model):
+    def __init__(self, sans_model, **kw):
         self.model = sans_model
         self.name=sans_model.name
@@ -44 +44 @@
         self.parameterset = park.ParameterSet(sans_model.name,pars=self.parkp)
         self.pars=[]
-        
+      
+    #def __call__(self, x, pars=[]):
+    #    return self.eval(x)   
     def getParams(self,fitparams):
         list=[]
@@ -62 +64 @@
         list.sort()
         for i in range(len(params)):
-            #self.parkp[i].value = params[i]
-            #print "abstractfitengine: set-params",list[i],params[i]
+            self.parkp[i].value = params[i]
+            print "abstractfitengine: set-params",list[i],params[i]
             
             self.model.setParam(list[i],params[i])
@@ -70 +72 @@
        
         return self.model.runXY(x)
-       
-
+   
+    #def set(self, **kw):
+        #"""
+            #Set the initial value for a set of parameters.
+            #E.g., model.set(width=3,center=5)
+        #"""
+        #print "Abstractfitting : set called"
+        # This is a convenience funciton for the user.
+        # 
+        #for k,v in kw.items(): 
+        #    self.parameterset[k].set(v)
+   
 class Data(object):
     """ Wrapper class  for SANS data """

park_integration/ParkFitting.py

@@ -68 +68 @@
                 #if p.isfixed():
                 #print 'parameters',p.name
-                print "parkfitting: self.paramList",self.paramList
+                #print "parkfitting: self.paramList",self.paramList
                 if p.isfixed() and p._getname()in self.paramList:
+                #if p.isfixed():
                     p.set([-numpy.inf,numpy.inf])
             i+=1    
@@ -108 +109 @@
         localfit = FitSimplex()
         localfit.ftol = 1e-8
+        #localfit.ftol = 1e-6
         fitter = FitMC(localfit=localfit)
-        print "ParkFitting: result1"
+        print "ParkFitting: result1",pars
+        print "Parkfitting: in fit function fitness resid",self.problem[0].residuals()
+        
+        list=self.problem[0]._parameterset()
+        print "Parkfitting: in fit function fitness paramset",list
+        for item in list:
+            print "Parkfitting: in fit function fitness",item.name, item.value,item.path,item.range
         result = fit.fit(self.problem,
                      fitter=fitter,
                      handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
-        print "ParkFitting: result",result
+        #result = fit.fit(self.problem)
+        print "ParkFitting: result",result.fitness,result.pvec,result.cov
         if result !=None:
             #for p in result.parameters:

park_integration/test/testnewscipy.py

@@ -22 +22 @@
         #Importing the Fit module
         from sans.fit.Fitting import Fit
-        fitter= Fit('scipy')
+        fitter= Fit('park')
         
         # Receives the type of model for the fitting
@@ -31 +31 @@
         #Do the fit SCIPY
        
-        fitter.set_data_assembly(data1,1)
-        fitter.set_model_assembly(model,"M1",1,['A','B'])
+        fitter.set_data(data1,1)
+        fitter.set_model(model,"M1",1,['A','B'])
     
         result=fitter.fit()
-        print "scipy",result.pvec,
-        chisqr1, out1, cov1=fitter.fit()
-        """ testing SCIPy results"""
-        self.assert_(math.fabs(out1[1]-2.5)/math.sqrt(cov1[1][1]) < 2)
-        self.assert_(math.fabs(out1[0]-4.0)/math.sqrt(cov1[0][0]) < 2)
-        self.assert_(chisqr1/len(data1.x) < 2)
-       
+        print "park",result.pvec,
+        
+        self.assert_(result)
       
+    def test_cylinder_scipy(self):
+        """ test fitting large model with scipy"""
+        #load data
+        from sans.fit.Loader import Load
+        load= Load()
+        load.set_filename("cyl_testdata.txt")
+        load.set_values()
+        data11 = Data1D(x=[], y=[],dx=None, dy=None)
+        load.load_data(data11)
+        data1=Data(sans_data=data11)
+        
+        
+        #Importing the Fit module
+        from sans.fit.Fitting import Fit
+        fitter= Fit('park')
+        
+        # Receives the type of model for the fitting
+        from sans.models.CylinderModel import CylinderModel
+        model1  = CylinderModel()
+        model =Model(model1)
+        
+        #Do the fit SCIPY
+        fitter.set_data(data1,1)
+        import math
+        pars1=['background','contrast', 'length']
+        #pars1=['background','contrast',\
+        #        'cyl_phi','cyl_theta','length','radius','scale']
+        pars1.sort()
+        fitter.set_model(model,"M1",1,pars1)
+        fitter.set_data(data1,1)
+      
+        result=fitter.fit()
+        print "park",result.fitness,result.cov, result.pvec
+        self.assert_(result.fitness)
+        
+    
+