Changeset 6fd4e36 in sasview for src/sas/qtgui/Perspectives/Fitting/UnitTesting

Timestamp:

Mar 28, 2017 6:53:29 AM (7 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:

0268aed

Parents:

a9b568c

Message:

Chi2 display + minor refactoring

Location:

src/sas/qtgui/Perspectives/Fitting/UnitTesting

Files:

• FittingLogicTest.py (modified) (2 diffs)
• FittingUtilitiesTest.py (modified) (2 diffs)
• FittingWidgetTest.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

@@ -104 +104 @@
                         data, False, None)
 
-        self.logic.new1DPlot(return_data=return_data)
+        new_plot = self.logic.new1DPlot(return_data=return_data)
 
-        self.assertIsInstance(self.logic.data, Data1D)
-        self.assertFalse(self.logic.data.is_data)
-        self.assertEqual(self.logic.data.dy.size, 3)
-        self.assertEqual(self.logic.data.title, "boop")
-        self.assertEqual(self.logic.data.name, "boop [boop]")
+        self.assertIsInstance(new_plot, Data1D)
+        self.assertFalse(new_plot.is_data)
+        self.assertEqual(new_plot.dy.size, 3)
+        self.assertEqual(new_plot.title, "boop")
+        self.assertEqual(new_plot.name, "boop [boop]")
 
     def testNew2DPlot(self):
@@ -142 +142 @@
                         0.1, False, None)
 
-        self.logic.new2DPlot(return_data=return_data)
+        new_plot = self.logic.new2DPlot(return_data=return_data)
 
-        self.assertIsInstance(self.logic.data, Data2D)
-        self.assertFalse(self.logic.data.is_data)
-        self.assertEqual(self.logic.data.title, "Analytical model 2D ")
-        self.assertEqual(self.logic.data.name, "boop [boop]")
+        self.assertIsInstance(new_plot, Data2D)
+        self.assertFalse(new_plot.is_data)
+        self.assertEqual(new_plot.title, "Analytical model 2D ")
+        self.assertEqual(new_plot.name, "boop [boop]")
 
 

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingUtilitiesTest.py

@@ -3 +3 @@
 from PyQt4 import QtGui
 
+from sas.sasgui.guiframe.dataFitting import Data1D
+from sas.sasgui.guiframe.dataFitting import Data2D
+
 from UnitTesting.TestUtils import WarningTestNotImplemented
-#from sasmodels.sasview_model import load_standard_models
+
 from sasmodels import generate
 from sasmodels import modelinfo
@@ -180 +183 @@
         self.assertEqual(model.item(1).child(0).child(0,1).text(), "40.0")
 
+    def testCalculate1DChi2(self):
+        """
+        Test the chi2 calculator for Data1D
+        """
+        reference_data = Data1D(x=[0.1, 0.2], y=[0.0, 0.0])
+
+        # 1. identical data
+        current_data = Data1D(x=[0.1, 0.2], y=[0.0, 0.0])
+
+        chi = FittingUtilities.calculateChi2(reference_data, current_data)
+
+        # Should be zero
+        self.assertAlmostEqual(chi, 0.0, 8)
+
+        # 2. far data
+        current_data = Data1D(x=[0.1, 0.2], y=[200.0, 150.0])
+
+        chi = FittingUtilities.calculateChi2(reference_data, current_data)
+
+        # Should not be zero
+        self.assertAlmostEqual(chi, 31250.0, 8)
+
+        # 3. Wrong data
+        current_data = Data1D(x=[0.1, 0.2], y=[200.0, 150.0, 200.0])
+        chi = FittingUtilities.calculateChi2(reference_data, current_data)
+        # Should be None
+        self.assertIsNone(chi)
+
+    def testCalculate2DChi2(self):
+        """
+        Test the chi2 calculator for Data2D
+        """
+        reference_data = Data2D(image=[1.0, 2.0, 3.0],
+                      err_image=[0.01, 0.02, 0.03],
+                      qx_data=[0.1, 0.2, 0.3],
+                      qy_data=[0.1, 0.2, 0.3])
+
+        # 1. identical data
+        current_data = Data2D(image=[1.0, 2.0, 3.0],
+                      err_image=[0.01, 0.02, 0.03],
+                      qx_data=[0.1, 0.2, 0.3],
+                      qy_data=[0.1, 0.2, 0.3])
+
+        chi = FittingUtilities.calculateChi2(reference_data, current_data)
+
+        # Should be zero
+        self.assertAlmostEqual(chi, 0.0, 8)
+
+        # 2. far data
+        current_data = Data2D(image=[100.0, 200.0, 300.0],
+                      err_image=[1.01, 2.02, 3.03],
+                      qx_data=[0.1, 0.2, 0.3],
+                      qy_data=[100.0, 200., 300.])
+
+        chi = FittingUtilities.calculateChi2(reference_data, current_data)
+
+        # Should not be zero
+        self.assertAlmostEqual(chi, 9607.88, 2)
+
+        # 3. Wrong data
+        current_data = Data2D(image=[1.0, 2.0, 3.0],
+                      err_image=[0.01, 0.02],
+                      qx_data=[0.1, 0.2],
+                      qy_data=[0.1, 0.2, 0.3])
+        # Should throw
+        with self.assertRaises(ValueError):
+            chi = FittingUtilities.calculateChi2(reference_data, current_data)
+
 if __name__ == "__main__":
     unittest.main()

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -215 +215 @@
         self.assertFalse(self.widget.calculateQGridForModel.called)
 
-        # Let's set a dummy index on widget
-        self.widget._index = QtGui.QStandardItem()
+        # Let's tell the widget that data has been loaded
+        self.widget.data_is_loaded = True
         # Reset the sasmodel index
         self.widget.cbModel.setCurrentIndex(1)