sgptools 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

sgptools/__init__.py

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

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.dist-info → sgptools-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sgptools
-Version: 1.1.0
+Version: 1.1.2
 Summary: Software Suite for Sensor Placement and Informative Path Planning
 Home-page: https://www.itskalvik.com/sgp-tools
 Author: Kalvik
@@ -13,18 +13,18 @@ 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
 Requires-Dist: cma
 Requires-Dist: bayesian-optimization
-Requires-Dist: hkb-diamondsquare
-Requires-Dist: tensorflow-probability[tf] >=0.21.0
-Requires-Dist: typing-extensions
-Requires-Dist: gpflow >=2.7.0
+Requires-Dist: hkb_diamondsquare
+Requires-Dist: tensorflow-probability[tf]>=0.21.0
+Requires-Dist: tensorflow>=2.13.0; platform_machine != "arm64"
+Requires-Dist: tensorflow-aarch64>=2.13.0; platform_machine == "arm64"
+Requires-Dist: typing_extensions
+Requires-Dist: gpflow>=2.7.0
 Requires-Dist: pillow
-Requires-Dist: tensorflow >=2.13.0 ; platform_machine != "arm64"
-Requires-Dist: tensorflow-aarch64 >=2.13.0 ; platform_machine == "arm64"
 
 Software Suite for Sensor Placement and Informative Path Planning

{sgptools-1.1.0.dist-info → sgptools-1.1.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-sgptools/__init__.py,sha256=J4jZOdSzuUtaabg4TtYxxWfQwZkA0E_bVK3aaBPgPAc,449
+sgptools/__init__.py,sha256=v20FWREF4GkLOyADat_DukZaWOptzI1Yt0RxT4JSY3o,449
 sgptools/kernels/__init__.py,sha256=zRf4y-wJwjXKt1uOnmI5MbzCA6pRlyA7C-eagLfb3d0,190
 sgptools/kernels/neural_kernel.py,sha256=9XEjcwwi1Gwj4D5cAZwq5QdWqMaI-Vu2DKgYO58DmPg,6709
 sgptools/models/__init__.py,sha256=X2lIg9kf1-2MHUswk-VW2dHHcbSLxf6_IuV7lc_kvDc,682
@@ -11,15 +11,15 @@ sgptools/models/core/__init__.py,sha256=TlUdvrM0A7vSzc5IM8C2Y2kliB1ip7YLEcHHzvuw
 sgptools/models/core/augmented_gpr.py,sha256=NuYwlggz7ho7pvW4-so3ghos5vZ8oK7nRZqvHpAt0Zk,3497
 sgptools/models/core/augmented_sgpr.py,sha256=qMP9J4AnOUx9AEZfaPhoyb3RP_2AOhOUCUY4eh7uOi0,7185
 sgptools/models/core/osgpr.py,sha256=gqliUdXdnt3fea206LP0rqGIggmIdKh8WP2DtFWzdBw,11798
-sgptools/models/core/transformations.py,sha256=avluSP7g4EWjijlpFQYobO_CHKA0-V7PemC6SdVwrG8,18976
+sgptools/models/core/transformations.py,sha256=X7WEKo_lFAYB5HKnFvxFsxfz6CB-jzPfVWcx1sWe2lI,18313
 sgptools/utils/__init__.py,sha256=jgWqzSDgUbqOTFo8mkqZaTlyz44l3v2XYPJfcHYHjqM,376
 sgptools/utils/data.py,sha256=oTXq4oRuzJdXpZC6frUfja8jhwy_ZdDDi7L1BYZcdQs,7309
 sgptools/utils/gpflow.py,sha256=LnFYufnMW4ch7qsKnru53QUxEtIzJqE822qj6w8ssRg,8576
 sgptools/utils/metrics.py,sha256=tu8H129n8GuxV5fQIKLcfzPUxd7sp8zEF9qZBOZjNKo,5834
 sgptools/utils/misc.py,sha256=LdAFJS7-xubWpRnrgdLOorCa9vB_8vRrvL5cahxHYNA,5442
 sgptools/utils/tsp.py,sha256=RJAQ4_uE7CUtR1ei3nSnGy-1kNhw82E9P_HyaCkc4iI,7007
-sgptools-1.1.0.dist-info/LICENSE.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sgptools-1.1.0.dist-info/METADATA,sha256=4_pfsYY9aY2D8vw_gsb0EGoE2ErABQog-slYq1ThEQo,944
-sgptools-1.1.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sgptools-1.1.0.dist-info/top_level.txt,sha256=2NWH6uQLAOuLB9fG7o1pqf6Jvpe1_hEcuqfSqtUw3gw,9
-sgptools-1.1.0.dist-info/RECORD,,
+sgptools-1.1.2.dist-info/LICENSE.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sgptools-1.1.2.dist-info/METADATA,sha256=Ig-Y6qyVRqARqO4FODhkSOHUsjrrNI6Eaw96uVTNDmg,944
+sgptools-1.1.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+sgptools-1.1.2.dist-info/top_level.txt,sha256=2NWH6uQLAOuLB9fG7o1pqf6Jvpe1_hEcuqfSqtUw3gw,9
+sgptools-1.1.2.dist-info/RECORD,,

{sgptools-1.1.0.dist-info → sgptools-1.1.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any