Changeset f182f93 in sasview

Timestamp:

Apr 5, 2017 10:44:27 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

454670d

Parents:

116260a

Message:

Fitting connected. Initial prototype

Location:

src/sas

Files:

• qtgui/Perspectives/Fitting/FittingUtilities.py (modified) (4 diffs)
• qtgui/Perspectives/Fitting/FittingWidget.py (modified) (13 diffs)
• qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui (modified) (2 diffs)
• qtgui/Plotter.py (modified) (1 diff)
• sasgui/perspectives/fitting/fit_thread.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

@@ -55 +55 @@
         item1 = QtGui.QStandardItem(item_name)
         item1.setCheckable(True)
+        item_err = QtGui.QStandardItem()
         # check for polydisp params
         if param.polydisperse:
@@ -94 +95 @@
         # TODO: the error column.
         # Either add a proxy model or a custom view delegate
-        #item_err = QtGui.QStandardItem()
-        item3 = QtGui.QStandardItem(str(param.limits[0]))
-        item4 = QtGui.QStandardItem(str(param.limits[1]))
-        item5 = QtGui.QStandardItem(param.units)
-        model.appendRow([item1, item2, item3, item4, item5])
+        item_err = QtGui.QStandardItem()
+        item4 = QtGui.QStandardItem(str(param.limits[0]))
+        item5 = QtGui.QStandardItem(str(param.limits[1]))
+        item6 = QtGui.QStandardItem(param.units)
+        model.appendRow([item1, item2, item4, item5, item6])
 
 def addCheckedListToModel(model, param_list):
@@ -118 +119 @@
     model.setHeaderData(3, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
     model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("[Units]"))
+
+def addErrorHeadersToModel(model):
+    """
+    Adds predefined headers to the model
+    """
+    model.setHeaderData(0, QtCore.Qt.Horizontal, QtCore.QVariant("Parameter"))
+    model.setHeaderData(1, QtCore.Qt.Horizontal, QtCore.QVariant("Value"))
+    model.setHeaderData(2, QtCore.Qt.Horizontal, QtCore.QVariant("Error"))
+    model.setHeaderData(3, QtCore.Qt.Horizontal, QtCore.QVariant("Min"))
+    model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
+    model.setHeaderData(5, QtCore.Qt.Horizontal, QtCore.QVariant("[Units]"))
 
 def addPolyHeadersToModel(model):
@@ -316 +328 @@
                     str(reference_data.filename) + "]"
     residuals.title = residuals.name
+    residuals.ytransform = 'y'
+
     # when 2 data have the same id override the 1 st plotted
     # include the last part if keeping charts for separate models is required

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -15 +15 @@
 from sasmodels import modelinfo
 from sasmodels.sasview_model import load_standard_models
+from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
+from sas.sasgui.perspectives.fitting.fit_thread import FitThread
 
 from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
@@ -62 +64 @@
         # Dictionary of {model name: model class} for the current category
         self.models = {}
+        # Parameters to fit
+        self.parameters_to_fit = None
 
         # Which tab is this widget displayed in?
@@ -68 +72 @@
         # Which shell is being currently displayed?
         self.current_shell_displayed = 0
+        self.has_error_column = False
 
         # Range parameters
@@ -256 +261 @@
         self.cbStructureFactor.setCurrentIndex(0)
 
+        # Reset parameters to fit
+        self.parameters_to_fit = None
+
         # SasModel -> QModel
         self.SASModelToQModel(model)
@@ -350 +358 @@
         Perform fitting on the current data
         """
-        # TODO: everything here
-        #self.calculate1DForModel()
-        #calc_fit = FitThread(handler=handler,
-        #                     fn=fitter_list,
-        #                     batch_inputs=batch_inputs,
-        #                     batch_outputs=batch_outputs,
-        #                     page_id=list_page_id,
-        #                     updatefn=handler.update_fit,
-        #                     completefn=self._fit_completed)
-
+        fitter = Fit()
+
+        # Data going in
+        data = self.logic.data
+        model = self.kernel_module
+        qmin = self.q_range_min
+        qmax = self.q_range_max
+        params_to_fit = self.parameters_to_fit
+
+        # These should be updating somehow?
+        fit_id = 0
+        constraints = []
+        smearer = None
+        page_id = [210]
+        handler = None
+        batch_inputs = {}
+        batch_outputs = {}
+        list_page_id = [page_id]
+        #---------------------------------
+
+        # Parameterize the fitter
+        fitter.set_model(model, fit_id, params_to_fit, data=data,
+                         constraints=constraints)
+        fitter.set_data(data=data, id=fit_id, smearer=smearer, qmin=qmin,
+                        qmax=qmax)
+        fitter.select_problem_for_fit(id=fit_id, value=1)
+
+        fitter.fitter_id = page_id
+
+        # Create the fitting thread, based on the fitter
+        calc_fit = FitThread(handler=handler,
+                             fn=[fitter],
+                             batch_inputs=batch_inputs,
+                             batch_outputs=batch_outputs,
+                             page_id=list_page_id,
+                             updatefn=self.updateFit,
+                             completefn=None)
+
+        # start the trhrhread
+        calc_thread = threads.deferToThread(calc_fit.compute)
+        calc_thread.addCallback(self.fitComplete)
+
+        #disable the Fit button
+        self.cmdFit.setText("Calculating...")
+        self.cmdFit.setEnabled(False)
+
+    def updateFit(self):
+        """
+        """
+        print "UPDATE FIT"
         pass
+
+    def fitComplete(self, result):
+        """
+        Receive and display fitting results
+
+        "result" is a tuple of actual result list and the fit time in seconds
+        """
+        #re-enable the Fit button
+        self.cmdFit.setText("Fit")
+        self.cmdFit.setEnabled(True)
+        res_list = result[0]
+        res = res_list[0]
+        if res.fitness is None or \
+            not numpy.isfinite(res.fitness) or \
+            numpy.any(res.pvec == None) or \
+            not numpy.all(numpy.isfinite(res.pvec)):
+            msg = "Fitting did not converge!!!"
+            logging.error(msg)
+            return
+
+        elapsed = result[1]
+        msg = "Fitting completed successfully in: %s s.\n" % GuiUtils.formatNumber(elapsed)
+
+        self.communicate.statusBarUpdateSignal.emit(msg)
+
+        fitness = res.fitness
+        param_list = res.param_list
+        param_values = res.pvec
+        param_stderr = res.stderr
+        from itertools import izip
+        # TODO: add errors to the dict so they can propagate to the view
+        params_and_errors = zip(param_values, param_stderr)
+        param_dict = dict(izip(param_list, params_and_errors))
+
+        # Dictionary of fitted parameter: value, error
+        # e.g. param_dic = {"sld":(1.703, 0.0034), "length":(33.455, -0.0983)}
+        self.updateModelFromList(param_dict)
+
+        # Read only value - we can get away by just printing it here
+        chi2_repr = GuiUtils.formatNumber(fitness, high=True)
+        self.lblChi2Value.setText(chi2_repr)
+
+        pass
+
+    def iterateOverModel(self, func):
+        """
+        Take func and throw it inside the model row loop
+        """
+        #assert isinstance(func, function)
+        for row_i in xrange(self._model_model.rowCount()):
+            func(row_i)
+
+    def updateModelFromList(self, param_dict):
+        """
+        Update the model with new parameters, create the errors column
+        """
+        assert isinstance(param_dict, dict)
+        if not dict:
+            return
+
+        def updateValues(row_i):
+            # Utility function for main model update
+            param_name = str(self._model_model.item(row_i, 0).text())
+            if param_name not in param_dict.keys():
+                return
+            # modify the param value
+            self._model_model.item(row_i, 1).setText(str(param_dict[param_name][0]))
+            if self.has_error_column:
+                self._model_model.item(row_i, 2).setText(str(param_dict[param_name][1]))
+
+        def createColumn(row_i):
+            # Utility function for error column update
+            item = QtGui.QStandardItem()
+            for param_name in param_dict.keys():
+                if str(self._model_model.item(row_i, 0).text()) != param_name:
+                    continue
+                error_repr = GuiUtils.formatNumber(param_dict[param_name][1], high=True)
+                item.setText(error_repr)
+            error_column.append(item)
+
+        self.iterateOverModel(updateValues)
+
+        if self.has_error_column:
+            return
+
+        error_column = []
+        self.iterateOverModel(createColumn)
+
+        self.has_error_column = True
+        self._model_model.insertColumn(2, error_column)
+        FittingUtilities.addErrorHeadersToModel(self._model_model)
+
 
     def onPlot(self):
@@ -370 +510 @@
         self.calculateQGridForModel()
 
-    #def onNpts(self, text):
     def onNpts(self):
         """
@@ -387 +526 @@
             self.onPlot()
 
-    #def onMinRange(self, text):
     def onMinRange(self):
         """
@@ -405 +543 @@
             self.onPlot()
 
-    #def onMaxRange(self, text):
     def onMaxRange(self):
         """
@@ -537 +674 @@
             structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))
             FittingUtilities.addSimpleParametersToModel(structure_parameters, self._model_model)
+            # Set the error column width to 0
+            self.lstParams.setColumnWidth(2, 20)
             # Update the counter used for multishell display
             self._last_model_row = self._model_model.rowCount()
@@ -565 +704 @@
         """
         model_column = item.column()
+
+        if model_column == 0:
+            self.checkboxSelected(item)
+            return
+
         model_row = item.row()
         name_index = self._model_model.index(model_row, 0)
-
-        if model_column == 0:
-            # Assure we're dealing with checkboxes
-            if not item.isCheckable():
-                return
-            status = item.checkState()
-            # If multiple rows selected - toggle all of them
-            rows = [s.row() for s in self.lstParams.selectionModel().selectedRows()]
-
-            # Switch off signaling from the model to avoid multiple calls
-            self._model_model.blockSignals(True)
-            # Convert to proper indices and set requested enablement
-            items = [self._model_model.item(row, 0).setCheckState(status) for row in rows]
-            self._model_model.blockSignals(False)
-            return
 
         # Extract changed value. Assumes proper validation by QValidator/Delegate
@@ -588 +717 @@
         property_name = str(self._model_model.headerData(1, model_column).toPyObject()) # Value, min, max, etc.
 
-        # print "%s(%s) => %d" % (parameter_name, property_name, value)
         self.kernel_module.params[parameter_name] = value
 
         # min/max to be changed in self.kernel_module.details[parameter_name] = ['Ang', 0.0, inf]
-
         # magnetic params in self.kernel_module.details['M0:parameter_name'] = value
         # multishell params in self.kernel_module.details[??] = value
@@ -598 +725 @@
         # Force the chart update
         self.onPlot()
+
+    def checkboxSelected(self, item):
+        # Assure we're dealing with checkboxes
+        if not item.isCheckable():
+            return
+        status = item.checkState()
+
+        def isChecked(row):
+            return self._model_model.item(row, 0).checkState() == QtCore.Qt.Checked
+
+        def isCheckable(row):
+            return self._model_model.item(row, 0).isCheckable()
+
+        # If multiple rows selected - toggle all of them, filtering uncheckable
+        rows = [s.row() for s in self.lstParams.selectionModel().selectedRows() if isCheckable(s.row())]
+
+        # Switch off signaling from the model to avoid recursion
+        self._model_model.blockSignals(True)
+        # Convert to proper indices and set requested enablement
+        items = [self._model_model.item(row, 0).setCheckState(status) for row in rows]
+        self._model_model.blockSignals(False)
+
+        # update the list of parameters to fit
+        self.parameters_to_fit = [str(self._model_model.item(row_index, 0).text())
+                                  for row_index in xrange(self._model_model.rowCount())
+                                  if isChecked(row_index)]
 
     def nameForFittedData(self, name):
@@ -714 +867 @@
         chi2 = FittingUtilities.calculateChi2(fitted_data, self.logic.data)
         # Update the control
-        self.lblChi2Value.setText(GuiUtils.formatNumber(chi2, high=True))
+        chi2_repr = "---" if chi2 is None else GuiUtils.formatNumber(chi2, high=True)
+        #self.lblChi2Value.setText(GuiUtils.formatNumber(chi2, high=True))
+        self.lblChi2Value.setText(chi2_repr)
 
         # Plot residuals if actual data

src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui

@@ -432 +432 @@
                <string>None</string>
               </property>
+              <property name="checked">
+               <bool>true</bool>
+              </property>
              </widget>
             </item>
@@ -489 +492 @@
            <widget class="QComboBox" name="comboBox_4">
             <property name="currentIndex">
-             <number>2</number>
+             <number>0</number>
             </property>
             <item>

src/sas/qtgui/Plotter.py

@@ -69 +69 @@
 
         is_fit = (self.data.id=="fit")
+
+        # Transform data if required.
+        # TODO: it properly!
+        #if data.xtransform is not None or data.ytransform is not None:
+        #    a, b, c, d = GuiUtils.xyTransform(self.data, self.data.xtransform, self.data.ytransform)
 
         # Shortcuts

src/sas/sasgui/perspectives/fitting/fit_thread.py

@@ -89 +89 @@
                           elapsed=time.time() - self.starttime)
 
+            return result[0], time.time()-self.starttime
+
         except KeyboardInterrupt, msg:
             # Thread was interrupted, just proceed and re-raise.
@@ -100 +102 @@
             if self.handler is not None:
                 self.handler.stop(msg=msg)
-        except:
+        except Exception as ex:
+            #print "EXCEPTION: ", ex
             import traceback
             if self.handler is not None: