polytope-python 1.0.14__tar.gz → 1.0.16__tar.gz

{polytope-python-1.0.14/polytope_python.egg-info → polytope-python-1.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: polytope-python
-Version: 1.0.14
+Version: 1.0.16
 Summary: Polytope datacube feature extraction library
 Home-page: https://github.com/ecmwf/polytope
 Author: ECMWF

{polytope-python-1.0.14 → polytope-python-1.0.16}/polytope_feature/datacube/backends/datacube.py

@@ -79,19 +79,23 @@ class Datacube(ABC):
         for axis_name in final_axis_names:
             self.fake_axes.append(axis_name)
             # if axis does not yet exist, create it
-
-            # first need to change the values so that we have right type
-            values = transformation.change_val_type(axis_name, values)
-            if self._axes is None or axis_name not in self._axes.keys():
-                DatacubeAxis.create_standard(axis_name, values, self)
-            # add transformation tag to axis, as well as transformation options for later
-            setattr(self._axes[axis_name], has_transform[transformation_type_key.name], True)  # where has_transform is
-            # a factory inside datacube_transformations to set the has_transform, is_cyclic etc axis properties
-            # add the specific transformation handled here to the relevant axes
-            # Modify the axis to update with the tag
-
-            if transformation not in self._axes[axis_name].transformations:  # Avoids duplicates being stored
-                self._axes[axis_name].transformations.append(transformation)
+            if transformation.change_val_type(axis_name, values) is not None:
+                # first need to change the values so that we have right type
+                values = transformation.change_val_type(axis_name, values)
+                if self._axes is None or axis_name not in self._axes.keys():
+                    DatacubeAxis.create_standard(axis_name, values, self)
+                # add transformation tag to axis, as well as transformation options for later
+                setattr(self._axes[axis_name], has_transform[transformation_type_key.name], True)
+                # where has_transform is a factory inside datacube_transformations to set the has_transform, is_cyclic
+                # etc axis properties add the specific transformation handled here to the relevant axes
+                # Modify the axis to update with the tag
+
+                if transformation not in self._axes[axis_name].transformations:  # Avoids duplicates being stored
+                    self._axes[axis_name].transformations.append(transformation)
+            else:
+                # Means we have an unsliceable axis since we couln't transform values to desired type
+                if self._axes is None or axis_name not in self._axes.keys():
+                    DatacubeAxis.create_standard(axis_name, values, self)
 
     def _add_all_transformation_axes(self, options, name, values):
         for transformation_type_key in options.transformations:

{polytope-python-1.0.14 → polytope-python-1.0.16}/polytope_feature/datacube/transformations/datacube_cyclic/datacube_cyclic.py

@@ -1,7 +1,7 @@
 import math
 from copy import deepcopy
 
-from ....utility.combinatorics import unique
+from ....utility.list_tools import unique
 from ..datacube_transformations import DatacubeAxisTransformation
 
 

{polytope-python-1.0.14 → polytope-python-1.0.16}/polytope_feature/datacube/transformations/datacube_type_change/datacube_type_change.py

@@ -25,6 +25,8 @@ class DatacubeAxisTypeChange(DatacubeAxisTransformation):
 
     def change_val_type(self, axis_name, values):
         return_idx = [self._final_transformation.transform_type(val) for val in values]
+        if None in return_idx:
+            return None
         return_idx.sort()
         return return_idx
 
@@ -61,7 +63,10 @@ class TypeChangeStrToInt(DatacubeAxisTypeChange):
         self._new_type = new_type
 
     def transform_type(self, value):
-        return int(value)
+        try:
+            return int(value)
+        except ValueError:
+            return None
 
     def make_str(self, value):
         values = []

{polytope-python-1.0.14 → polytope-python-1.0.16}/polytope_feature/engine/hullslicer.py

@@ -9,9 +9,10 @@ from ..datacube.backends.datacube import Datacube
 from ..datacube.datacube_axis import UnsliceableDatacubeAxis
 from ..datacube.tensor_index_tree import TensorIndexTree
 from ..shapes import ConvexPolytope
-from ..utility.combinatorics import argmax, argmin, group, tensor_product, unique
+from ..utility.combinatorics import group, tensor_product
 from ..utility.exceptions import UnsliceableShapeError
 from ..utility.geometry import lerp
+from ..utility.list_tools import argmax, argmin, unique
 from .engine import Engine
 
 

{polytope-python-1.0.14 → polytope-python-1.0.16}/polytope_feature/shapes.py

@@ -1,10 +1,13 @@
 import copy
 import math
+import warnings
 from abc import ABC, abstractmethod
 from typing import List
 
 import tripy
 
+from .utility.list_tools import unique
+
 """
 Shapes used for the constructive geometry API of Polytope
 """
@@ -60,11 +63,13 @@ class ConvexPolytope(Shape):
 
 # This is the only shape which can slice on axes without a discretizer or interpolator
 class Select(Shape):
-    """Matches several discrete value"""
+    """Matches several discrete values"""
 
     def __init__(self, axis, values, method=None):
         self.axis = axis
-        self.values = values
+        self.values = unique(values)
+        if len(self.values) != len(values):
+            warnings.warn("Duplicate request values were removed")
         self.method = method
 
     def axes(self):

{polytope-python-1.0.14 → polytope-python-1.0.16}/polytope_feature/utility/combinatorics.py

@@ -46,19 +46,3 @@ def validate_axes(actual_axes, test_axes):
         raise AxisNotFoundError(ax)
 
     return True
-
-
-def unique(points):
-    points.sort()
-    points = [k for k, _ in itertools.groupby(points)]
-    return points
-
-
-def argmin(points):
-    amin = min(range(len(points)), key=points.__getitem__)
-    return amin
-
-
-def argmax(points):
-    amax = max(range(len(points)), key=points.__getitem__)
-    return amax

{polytope-python-1.0.14 → polytope-python-1.0.16}/polytope_feature/utility/exceptions.py

@@ -13,7 +13,7 @@ class AxisOverdefinedError(PolytopeError, KeyError):
         self.axis = axis
         self.message = (
             f"Axis {axis} is overdefined. You have used it in two or more input polytopes which"
-            f"cannot form a union (because they span different axes)."
+            f" cannot form a union (because they span different axes)."
         )
 
 

{polytope-python-1.0.14 → polytope-python-1.0.16}/polytope_feature/utility/list_tools.py

@@ -1,3 +1,6 @@
+import itertools
+
+
 def bisect_left_cmp(arr, val, cmp):
     left = -1
     r = len(arr)
@@ -20,3 +23,19 @@ def bisect_right_cmp(arr, val, cmp):
         else:
             r = e
     return r
+
+
+def unique(points):
+    points.sort()
+    points = [k for k, _ in itertools.groupby(points)]
+    return points
+
+
+def argmin(points):
+    amin = min(range(len(points)), key=points.__getitem__)
+    return amin
+
+
+def argmax(points):
+    amax = max(range(len(points)), key=points.__getitem__)
+    return amax

polytope-python-1.0.16/polytope_feature/version.py

@@ -0,0 +1 @@
+__version__ = "1.0.16"

{polytope-python-1.0.14 → polytope-python-1.0.16/polytope_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: polytope-python
-Version: 1.0.14
+Version: 1.0.16
 Summary: Polytope datacube feature extraction library
 Home-page: https://github.com/ecmwf/polytope
 Author: ECMWF

polytope-python-1.0.14/polytope_feature/version.py

@@ -1 +0,0 @@
-__version__ = "1.0.14"