small fixes in SETS

fzi-forschungszentrum-informatik · Dec 15, 2023 · f683895 · f683895
1 parent 3f83b38
commit f683895
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 51 deletions.
diff --git a/TSInterpret/InterpretabilityModels/counterfactual/SETS/__init__.py b/TSInterpret/InterpretabilityModels/counterfactual/SETS/__init__.py
@@ -0,0 +1,2 @@
+from . import ContractedST, sets, utils
+__all__ = ["ContractedST", "sets", "utils"]
diff --git a/TSInterpret/InterpretabilityModels/counterfactual/SETS/sets.py b/TSInterpret/InterpretabilityModels/counterfactual/SETS/sets.py
@@ -180,7 +180,7 @@ def sets_explain(
         X_train_knn = np.swapaxes(X_train_knn, 1, 2)
         knns[c].fit(X_train_knn)
 
-    orig_c = int(np.argmax(model(to_tff(instance_x))))
+    orig_c = int(np.argmax(model.predict(to_tff(instance_x))))
     if len(target) > 1:
         target.remove(orig_c)
     for target_c in target:

diff --git a/TSInterpret/InterpretabilityModels/counterfactual/SETSCF.py b/TSInterpret/InterpretabilityModels/counterfactual/SETSCF.py
@@ -112,7 +112,6 @@ def __init__(
             max_shapelets_to_store_per_class=30,
             remove_self_similar=remove_self_similar,
             random_state=self.random_state,
-            remove_self_similar=True,
         )
         # Fit multivaraite transformer
         st_transformer = MultivariateTransformer(shapelet_transform)

diff --git a/TSInterpret/InterpretabilityModels/counterfactual/__init__.py b/TSInterpret/InterpretabilityModels/counterfactual/__init__.py
@@ -1,3 +1,3 @@
-from . import CF, COMTE, NativeGuideCF, TSEvo, TSEvoCF, COMTECF
+from . import CF, COMTE, NativeGuideCF, TSEvo, TSEvoCF, COMTECF, SETSCF
 
-__all__ = ["CF", "COMTE", "NativeGuideCF", "TSEvoCF", "TSEvo", "COMTECF"]
+__all__ = ["CF", "COMTE", "NativeGuideCF", "TSEvoCF", "TSEvo", "COMTECF","SETSCF"]
diff --git a/TSInterpret/__version__.py b/TSInterpret/__version__.py
@@ -1,2 +1,2 @@
-VERSION = (0, 4, 1)
+VERSION = (0, 4, 2)
 __version__ = ".".join(map(str, VERSION))  # noqa: F401
diff --git a/docs/Notebooks/Sets_tensorflow.ipynb b/docs/Notebooks/Sets_tensorflow.ipynb
diff --git a/setup.py b/setup.py
@@ -55,6 +55,7 @@
     "pymop",
     "deap",
     "wheel",
+    "sktime"
 ]
 
 dev_packages = base_packages + [