sgptools 1.1.0__tar.gz → 1.1.1__tar.gz

{sgptools-1.1.0 → sgptools-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sgptools
-Version: 1.1.0
+Version: 1.1.1
 Summary: Software Suite for Sensor Placement and Informative Path Planning
 Home-page: https://www.itskalvik.com/sgp-tools
 Author: Kalvik
@@ -13,7 +13,7 @@ Requires-Dist: matplotlib
 Requires-Dist: pandas
 Requires-Dist: scikit-learn
 Requires-Dist: scipy
-Requires-Dist: numpy
+Requires-Dist: numpy<2.0.0
 Requires-Dist: ortools
 Requires-Dist: scikit-image
 Requires-Dist: shapely

{sgptools-1.1.0 → sgptools-1.1.1}/README.md

@@ -12,11 +12,11 @@ The library includes python code for the following:
 - Sparse Gaussian process (SGP)-based approaches
 
 <p align="center">
-  <img alt="Light" src="docs/assets/point_sensing.gif" width="45%">
-&nbsp; &nbsp; &nbsp; &nbsp;
-  <img alt="Dark" src="docs/assets/non-point_sensing.gif" width="45%">
-&nbsp; &nbsp; &nbsp; &nbsp;
-  <img alt="Dark" src="docs/assets/AIPP-non-point_sensing.gif" width="45%"></p>
+  <img src="docs/assets/point_sensing.gif" width="49%">
+  <img src="docs/assets/non-point_sensing.gif" width="49%">
+  <img src="docs/assets/AIPP-4R.gif" width="49%">
+  <img src="docs/assets/AIPP-non-point_sensing.gif" width="49%">
+</p>
 
 ## Related Packages
 

{sgptools-1.1.0 → sgptools-1.1.1}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = "1.1.0"
+__version__ = "1.1.1"
 
 setup(
     name='sgptools',
@@ -18,7 +18,7 @@ setup(
                       'pandas',
                       'scikit-learn',
                       'scipy',
-                      'numpy',
+                      'numpy<2.0.0',
                       'ortools',
                       'scikit-image',
                       'shapely',

{sgptools-1.1.0 → sgptools-1.1.1}/sgptools/__init__.py

@@ -12,7 +12,7 @@ The library includes python code for the following:
 
 """
 
-__version__ = "1.0.1"
+__version__ = "1.1.0"
 __author__ = 'Kalvik'
 
 from .models.core import *

{sgptools-1.1.0 → sgptools-1.1.1}/sgptools/models/core/transformations.py

@@ -159,7 +159,6 @@ class IPPTransform(Transform):
         if self.Xu_fixed is not None:
             self.Xu_fixed.assign(Xu_fixed)
         else:
-            # ToDo: Use binary mask of fixed size to avoid retracing
             self.Xu_fixed = tf.Variable(Xu_fixed, 
                                         shape=tf.TensorShape(None), 
                                         trainable=False)
@@ -325,24 +324,9 @@ class SquareTransform(Transform):
                                       self.num_side, axis=1))
         xy = tf.concat(points, axis=1)
         xy = tf.transpose(xy, [2, 1, 0])
-        xy = self._reshape(xy)
+        xy = tf.reshape(xy, (-1, 2))
         return xy
     
-    def _reshape(self, X):
-        """Reorder the inducing points to be in the correct order for aggregation with square FoV.
-
-        Args:
-            X (ndarray): (mp, 2); Inducing points in input space. `p` is the number of points each 
-                        inducing point is mapped to in order to form the FoV.
-                            
-        Returns:
-            Xu (ndarray): (mp, 2); Reorder inducing points
-        """
-        X = tf.reshape(X, (-1, self.num_side, self.num_side, 2))
-        X = tf.transpose(X, (1, 0, 2, 3))
-        X = tf.reshape(X, (-1, 2))
-        return X
-    
     def distance(self, Xu):
         """Computes the distance incured by sequentially visiting the inducing points
         Args:

{sgptools-1.1.0 → sgptools-1.1.1}/sgptools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sgptools
-Version: 1.1.0
+Version: 1.1.1
 Summary: Software Suite for Sensor Placement and Informative Path Planning
 Home-page: https://www.itskalvik.com/sgp-tools
 Author: Kalvik
@@ -13,7 +13,7 @@ Requires-Dist: matplotlib
 Requires-Dist: pandas
 Requires-Dist: scikit-learn
 Requires-Dist: scipy
-Requires-Dist: numpy
+Requires-Dist: numpy<2.0.0
 Requires-Dist: ortools
 Requires-Dist: scikit-image
 Requires-Dist: shapely

{sgptools-1.1.0 → sgptools-1.1.1}/sgptools.egg-info/requires.txt

@@ -3,7 +3,7 @@ matplotlib
 pandas
 scikit-learn
 scipy
-numpy
+numpy<2.0.0
 ortools
 scikit-image
 shapely