Merge pull request #147 from Starfish-develop/ml/interpolator

Author: mileslucas

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 repos:
 -   repo: https://github.com/python/black
-    rev: stable
+    rev: 22.3.0
     hooks:
     - id: black

Starfish/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 
 from .spectrum import Spectrum
 

Starfish/grid_tools/interpolators.py

@@ -19,12 +19,14 @@ class IndexInterpolator:
     """
 
     def __init__(self, parameter_list):
-        parameter_list = np.asarray(parameter_list)
-        self.npars = parameter_list.shape[-1]
-        self.parameter_list = np.unique(parameter_list)
-        self.index_interpolator = interp1d(
-            self.parameter_list, np.arange(len(self.parameter_list)), kind="linear"
-        )
+        parameter_list = list(parameter_list)
+        self.npars = len(parameter_list)
+        self.parameter_list = [np.unique(pars) for pars in parameter_list]
+        idxs = [np.arange(len(pars)) for pars in self.parameter_list]
+        self.index_interpolators = [
+            interp1d(pars, idx, kind="linear")
+            for pars, idx in zip(self.parameter_list, idxs)
+        ]
 
     def __call__(self, param):
         """
@@ -34,26 +36,33 @@ def __call__(self, param):
         :type param: list
         :raises ValueError: if *value* is out of bounds.
 
-        :returns: ((low_val, high_val), (frac_low, frac_high)), the lower and higher bounding points in the grid
-        and the fractional distance (0 - 1) between them and the value.
+        :returns: ((low_val, high_val), (low_dist, high_dist)), the lower and higher bounding points in the grid
+        and the fractional distance (0 - 1) from the two points.
         """
         if len(param) != self.npars:
             raise ValueError(
                 "Incorrect number of parameters. Expected {} but got {}".format(
                     self.npars, len(param)
                 )
             )
-        try:
-            index = self.index_interpolator(param)
-        except ValueError:
-            raise ValueError("Requested param {} is out of bounds.".format(param))
-        high = np.ceil(index).astype(int)
-        low = np.floor(index).astype(int)
-        frac_index = index - low
-        return (
-            (self.parameter_list[low], self.parameter_list[high]),
-            ((1 - frac_index), frac_index),
-        )
+        lows = np.empty(self.npars)
+        highs = np.empty(self.npars)
+        fracs = np.empty(self.npars)
+        for i in range(self.npars):
+            # get interpolated index
+            try:
+                index = self.index_interpolators[i](param[i])
+            except ValueError:
+                raise ValueError("Requested param {} is out of bounds.".format(param))
+            low = np.floor(index).astype(int)
+            high = np.ceil(index).astype(int)
+            frac = index - low
+            # get bounding params
+            lows[i] = self.parameter_list[i][low]
+            highs[i] = self.parameter_list[i][high]
+            fracs[i] = frac
+
+        return (lows, highs), (1 - fracs, fracs)
 
 
 class Interpolator:

Starfish/grid_tools/utils.py

@@ -217,7 +217,7 @@ def determine_chunk_log(wl, wl_min, wl_max):
         else:
             break
 
-    assert type(chunk) == np.int, "Chunk is not an integer!. Chunk is {}".format(chunk)
+    assert type(chunk) == int, "Chunk is not an integer!. Chunk is {}".format(chunk)
 
     if chunk < len_wl:
         # Now that we have determined the length of the chunk of the synthetic
@@ -345,4 +345,4 @@ def idl_float(idl_num: str) -> float:
     ```
     """
     idl_str = idl_num.lower()
-    return np.float(idl_str.replace("d", "e"))
+    return float(idl_str.replace("d", "e"))

tests/test_grid_tools/test_interpolators.py

@@ -7,7 +7,8 @@
 class TestIndexInterpolator:
     @pytest.fixture
     def mock_index_interpolator(self, grid_points):
-        yield IndexInterpolator(grid_points)
+        pars = [np.unique(pars) for pars in grid_points.T]
+        yield IndexInterpolator(pars)
 
     @pytest.mark.parametrize(
         "input, expected",