Changeset dfd3577 in sasview

Timestamp:

Mar 24, 2011 1:52:25 PM (14 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:

0806def

Parents:

91bdf87

Message:

working on park stop

File:

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

park_integration/ParkFitting.py

@@ -8 +8 @@
 """
 #import time
-#import numpy
+import numpy
 #import park
 from park import fit
@@ -14 +14 @@
 from park.assembly import Assembly
 from park.fitmc import FitSimplex 
+import park.fitmc
 from park.fitmc import FitMC
 
@@ -20 +21 @@
 
 
+
+class MyAssembly(Assembly):
+    def __init__(self, models, curr_thread=None):
+        Assembly.__init__(self, models)
+        self.curr_thread = curr_thread
+        
+    def eval(self):
+        """
+        Recalculate the theory functions, and from them, the
+        residuals and chisq.
+
+        :note: Call this after the parameters have been updated.
+        """
+        # Handle abort from a separate thread.
+        self._cancel = False
+        if self.curr_thread != None:
+            try:
+                self.curr_thread.isquit()
+            except:
+                self._cancel = True
+
+        # Evaluate the computed parameters
+        self._fitexpression()
+
+        # Check that the resulting parameters are in a feasible region.
+        if not self.isfeasible(): return numpy.inf
+
+        resid = []
+        k = len(self._fitparameters)
+        for m in self.parts:
+            # In order to support abort, need to be able to propagate an
+            # external abort signal from self.abort() into an abort signal
+            # for the particular model.  Can't see a way to do this which
+            # doesn't involve setting a state variable.
+            self._current_model = m
+            if self._cancel: return numpy.inf
+            if m.isfitted and m.weight != 0:
+                m.residuals = m.fitness.residuals()
+                N = len(m.residuals)
+                m.degrees_of_freedom = N-k if N>k else 1
+                m.chisq = numpy.sum(m.residuals**2)
+                resid.append(m.weight*m.residuals)
+        self.residuals = numpy.hstack(resid)
+        N = len(self.residuals)
+        self.degrees_of_freedom = N-k if N>k else 1
+        self.chisq = numpy.sum(self.residuals**2)
+        return self.chisq
+    
 class ParkFit(FitEngine):
     """ 
@@ -59 +108 @@
         self.param_list = []
         
-    def create_assembly(self):
+    def create_assembly(self, curr_thread):
         """
         Extract sansmodel and sansdata from 
@@ -88 +137 @@
                     else:
                         p.status = 'fixed'
-            #i += 1
             data_list = item.get_data()
-            #parkdata=self._concatenateData(Ldata)
             parkdata = data_list
             fitness = (parkmodel, parkdata)
             mylist.append(fitness)
-        self.problem = Assembly(mylist)
+        self.problem = MyAssembly(models=mylist, curr_thread=curr_thread)
         
+  
+    
     def fit(self, q=None, handler=None, curr_thread=None):
         """
@@ -117 +166 @@
         
         """
-        self.create_assembly()
+        self.create_assembly(curr_thread=curr_thread)
         localfit = FitSimplex()
         localfit.ftol = 1e-8
@@ -125 +174 @@
         if handler == None:
             handler = fitresult.ConsoleUpdate(improvement_delta=0.1)
-        result = fit.fit(self.problem,
-                         fitter=fitter,
-                         handler=handler)
+        result = fit.fit(self.problem, fitter=fitter, handler=handler)
         self.problem.all_results(result)
         if result != None: