Merge pull request #1 from probml/jsl-refactor

Jsl refactor
probml · Dec 30, 2021 · 31b088d · 31b088d
2 parents 31e12fd + 83c799c
commit 31b088d
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 535 deletions.
diff --git a/bandits/agents/diagonal_subspace.py b/bandits/agents/diagonal_subspace.py
@@ -1,5 +1,5 @@
 import jax.numpy as jnp
-from nlds_lib.diagonal_extended_kalman_filter import DiagonalExtendedKalmanFilter
+from jsl.nlds.diagonal_extended_kalman_filter import DiagonalExtendedKalmanFilter
 from .ekf_subspace import SubspaceNeuralBandit
 from tensorflow_probability.substrates import jax as tfp
 

diff --git a/bandits/agents/ekf_orig_diag.py b/bandits/agents/ekf_orig_diag.py
@@ -7,7 +7,7 @@
 
 from .agent_utils import train
 from scripts.training_utils import MLP
-from nlds_lib.diagonal_extended_kalman_filter import DiagonalExtendedKalmanFilter
+from jsl.nlds.diagonal_extended_kalman_filter import DiagonalExtendedKalmanFilter
 
 from tensorflow_probability.substrates import jax as tfp
 

diff --git a/bandits/agents/ekf_orig_full.py b/bandits/agents/ekf_orig_full.py
@@ -7,7 +7,7 @@
 from flax.training import train_state
 
 from .agent_utils import train
-from nlds_lib.extended_kalman_filter import ExtendedKalmanFilter
+from jsl.nlds.extended_kalman_filter import ExtendedKalmanFilter
 from scripts.training_utils import MLP
 from tensorflow_probability.substrates import jax as tfp
 

diff --git a/bandits/agents/ekf_subspace.py b/bandits/agents/ekf_subspace.py
@@ -7,7 +7,7 @@
 from sklearn.decomposition import PCA
 from .agent_utils import train, generate_random_basis, convert_params_from_subspace_to_full
 from scripts.training_utils import MLP
-from nlds_lib.extended_kalman_filter import ExtendedKalmanFilter
+from jsl.nlds.extended_kalman_filter import ExtendedKalmanFilter
 from tensorflow_probability.substrates import jax as tfp
 
 tfd = tfp.distributions

diff --git a/bandits/agents/linear_kf_bandit.py b/bandits/agents/linear_kf_bandit.py
@@ -2,7 +2,7 @@
 from jax.ops import index_update
 from jax.lax import scan
 from jax.random import split
-from nlds_lib.lds_lib_orig import KalmanFilterNoiseEstimation
+from jsl.lds.kalman_filter import KalmanFilterNoiseEstimation
 from tensorflow_probability.substrates import jax as tfp
 
 tfd = tfp.distributions

diff --git a/bandits/nlds_lib/base.py b/bandits/nlds_lib/base.py
diff --git a/bandits/nlds_lib/diagonal_extended_kalman_filter.py b/bandits/nlds_lib/diagonal_extended_kalman_filter.py
diff --git a/bandits/nlds_lib/extended_kalman_filter.py b/bandits/nlds_lib/extended_kalman_filter.py