Changeset 44a698c in sasview for src/sas/sascalc/corfunc/corfunc_calculator.py

Timestamp:

Mar 12, 2019 7:15:06 AM (5 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI_sync_sascalc

Parents:

390494d

Message:

Cherry-picked changes from py37-sascalc branch.

File:

• src/sas/sascalc/corfunc/corfunc_calculator.py (modified) (3 diffs)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -30 +30 @@
             self.start = start
             self.stop = stop
-            self._lastx = []
-            self._lasty = []
+            self._lastx = np.empty(0, dtype='d')
+            self._lasty = None
 
         def __call__(self, x):
             # If input is a single number, evaluate the function at that number
             # and return a single number
-            if type(x) == float or type(x) == int:
+            if isinstance(x, (float, int)):
                 return self._smoothed_function(np.array([x]))[0]
             # If input is a list, and is different to the last input, evaluate
@@ -42 +42 @@
             # the function was called, return the result that was calculated
             # last time instead of explicity evaluating the function again.
-            elif self._lastx == [] or x.tolist() != self._lastx.tolist():
-                self._lasty = self._smoothed_function(x)
-                self._lastx = x
+            if not np.array_equal(x, self._lastx):
+                self._lastx, self._lasty = x, self._smoothed_function(x)
             return self._lasty
 
@@ -88 +87 @@
         # Only process data of the class Data1D
         if not issubclass(data.__class__, Data1D):
-            raise ValueError("Correlation function cannot be computed with 2D Data.")
+            raise ValueError("Correlation function cannot be computed with 2D data.")
 
         # Prepare the data