sgptools 1.1.6__py3-none-any.whl → 1.1.8__py3-none-any.whl

sgptools/__init__.py

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

sgptools/models/core/osgpr.py

@@ -57,28 +57,42 @@ class OSGPR_VFE(GPModel, InternalDataTrainingLossMixin):
         self.Kaa_old = tf.Variable(Kaa_old, shape=tf.TensorShape(None), trainable=False)
         self.Z_old = tf.Variable(Z_old, shape=tf.TensorShape(None), trainable=False)
 
-    def update(self, data):
+    def init_Z(self):
+        M = self.inducing_variable.Z.shape[0]
+        M_old = int(0.7 * M)
+        M_new = M - M_old
+        old_Z = self.Z_old.numpy()[np.random.permutation(M)[0:M_old], :]
+        new_Z = self.X.numpy()[np.random.permutation(self.X.shape[0])[0:M_new], :]
+        Z = np.vstack((old_Z, new_Z))
+        return Z
+
+    def update(self, data, inducing_variable=None, update_inducing=True):
         """Configure the OSGPR to adapt to a new batch of data. 
         Note: The OSGPR needs to be trained using gradient-based approaches after update.
 
         Args:
-            data (tuple): (X, y) ndarrays with new batch of inputs (n, d) and labels (n, 1)
+            data (tuple): (X, y) ndarrays with new batch of inputs (n, d) and labels (n, ndim)
+            inducing_variable (ndarray): (m_new, d): New initial inducing points
+            update_inducing (bool): Whether to update the inducing points
         """
         self.X, self.Y = self.data = gpflow.models.util.data_input_to_tensor(data)
         self.num_data = self.X.shape[0]
 
-        self.Z_old = tf.Variable(self.inducing_variable.Z.numpy(), 
-                                 shape=tf.TensorShape(None), 
-                                 trainable=False)
+        # Update the inducing points        
+        self.Z_old.assign(self.inducing_variable.Z.numpy())
+        if inducing_variable is None and update_inducing:
+            inducing_variable = self.init_Z()
+        if inducing_variable is not None:
+            self.inducing_variable.Z.assign(inducing_variable)
 
         # Get posterior mean and covariance for the old inducing points
         mu_old, Su_old = self.predict_f(self.Z_old, full_cov=True)
-        self.mu_old = tf.Variable(mu_old, shape=tf.TensorShape(None), trainable=False)
-        self.Su_old = tf.Variable(Su_old, shape=tf.TensorShape(None), trainable=False)
-        
+        self.mu_old.assign(mu_old.numpy())
+        self.Su_old.assign(Su_old.numpy())
+
         # Get the prior covariance matrix for the old inducing points
         Kaa_old = self.kernel(self.Z_old)
-        self.Kaa_old = tf.Variable(Kaa_old, shape=tf.TensorShape(None), trainable=False)
+        self.Kaa_old.assign(Kaa_old.numpy())
 
     def _common_terms(self):
         Mb = self.inducing_variable.num_inducing
@@ -228,7 +242,8 @@ def init_osgpr(X_train,
                lengthscales=1.0, 
                variance=1.0,
                noise_variance=0.001,
-               kernel=None):
+               kernel=None,
+               ndim=1):
     """Initialize a VFE OSGPR model with an RBF kernel with 
     unit variance and lengthcales, and 0.001 noise variance.
     Used in the Online Continuous SGP approach. 
@@ -243,6 +258,7 @@ def init_osgpr(X_train,
         variance (float): Kernel variance
         noise_variance (float): Data noise variance
         kernel (gpflow.kernels.Kernel): gpflow kernel function
+        ndim (int): Number of output dimensions
 
     Returns:
         online_param (OSGPR_VFE): Initialized online sparse Gaussian process model
@@ -252,7 +268,7 @@ def init_osgpr(X_train,
         kernel = gpflow.kernels.SquaredExponential(lengthscales=lengthscales, 
                                                    variance=variance)
         
-    y_train = np.zeros((len(X_train), 1), dtype=X_train.dtype)
+    y_train = np.zeros((len(X_train), ndim), dtype=X_train.dtype)
     Z_init = get_inducing_pts(X_train, num_inducing)
     init_param = gpflow.models.SGPR((X_train, y_train),
                                     kernel, 
@@ -261,8 +277,8 @@ def init_osgpr(X_train,
     
     # Initialize the OSGPR model using the parameters from the SGPR model
     # The X_train and y_train here will be overwritten in the online phase 
-    X_train = np.array([[0, 0], [0, 0]])
-    y_train = np.array([0, 0]).reshape(-1, 1)
+    X_train = np.zeros([2, X_train.shape[-1]], dtype=X_train.dtype)
+    y_train =  np.zeros([2, ndim], dtype=X_train.dtype)
     Zopt = init_param.inducing_variable.Z.numpy()
     mu, Su = init_param.predict_f(Zopt, full_cov=True)
     Kaa = init_param.kernel(Zopt)

{sgptools-1.1.6.dist-info → sgptools-1.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sgptools
-Version: 1.1.6
+Version: 1.1.8
 Summary: Software Suite for Sensor Placement and Informative Path Planning
 Home-page: https://www.itskalvik.com/sgp-tools
 Author: Kalvik

{sgptools-1.1.6.dist-info → sgptools-1.1.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-sgptools/__init__.py,sha256=ETsbfpEnORTg0xjJyWQSUNI7cSLKYCAr6QRluBeGzRs,449
+sgptools/__init__.py,sha256=fITCCOmfRYm3Ow6I6EW7ASAf_anvnmJJBA7SVc5K7as,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
@@ -10,7 +10,7 @@ sgptools/models/greedy_sgp.py,sha256=giddMbU3ohePTdLTcH4fDx-bS9upq1T_K8KUW_Ag6HI
 sgptools/models/core/__init__.py,sha256=TlUdvrM0A7vSzc5IM8C2Y2kliB1ip7YLEcHHzvuw-C4,482
 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/osgpr.py,sha256=trUwUOLX82BRY2KyMWFygBQkc2PItxGlWPXaAgOhpE4,12442
 sgptools/models/core/transformations.py,sha256=X7WEKo_lFAYB5HKnFvxFsxfz6CB-jzPfVWcx1sWe2lI,18313
 sgptools/utils/__init__.py,sha256=jgWqzSDgUbqOTFo8mkqZaTlyz44l3v2XYPJfcHYHjqM,376
 sgptools/utils/data.py,sha256=ojDq6KzBXbAl5CdpA6A6me0sg5Sah9ZTl2TpFCqgR4c,7464
@@ -18,8 +18,8 @@ sgptools/utils/gpflow.py,sha256=46-_Tl-suxvuX3Y9KI_uiixfyCWQ2T-7BUn-7hesdVM,1004
 sgptools/utils/metrics.py,sha256=tu8H129n8GuxV5fQIKLcfzPUxd7sp8zEF9qZBOZjNKo,5834
 sgptools/utils/misc.py,sha256=11nsDEU3imnrvH7ywGMiwtNBcBnJfHX3KaGxFS3eq6w,6223
 sgptools/utils/tsp.py,sha256=b1Lx1Pj-sv7siX-f0S6d25C3RtvszCl3IP4QbvBckqY,8151
-sgptools-1.1.6.dist-info/LICENSE.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sgptools-1.1.6.dist-info/METADATA,sha256=SXtfy54sXEKKFd7uPKkpDA7CCQUbAunhjl9YHE_hTRs,944
-sgptools-1.1.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-sgptools-1.1.6.dist-info/top_level.txt,sha256=2NWH6uQLAOuLB9fG7o1pqf6Jvpe1_hEcuqfSqtUw3gw,9
-sgptools-1.1.6.dist-info/RECORD,,
+sgptools-1.1.8.dist-info/LICENSE.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sgptools-1.1.8.dist-info/METADATA,sha256=oDf2T6ldEux4_WQxEPVi1DD6a-_fS9jS1wG7rMhl_8g,944
+sgptools-1.1.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+sgptools-1.1.8.dist-info/top_level.txt,sha256=2NWH6uQLAOuLB9fG7o1pqf6Jvpe1_hEcuqfSqtUw3gw,9
+sgptools-1.1.8.dist-info/RECORD,,