Merge pull request #226 from lucasimi/improve-plot-plotly

Improve plot plotly

Author: lucasimi

docs/source/notebooks/circles.py

@@ -96,6 +96,7 @@
 fig = plot.plot_plotly(
     colors=labels,
     cmap=["jet", "viridis", "cividis"],
+    node_size=[0.0, 0.5, 1.0, 1.5, 2.0],
     agg=np.nanmean,
     width=600,
     height=600,
@@ -118,6 +119,7 @@
 fig = plot.plot_plotly(
     colors=labels,
     cmap=["jet", "viridis", "cividis"],
+    node_size=[0.0, 0.5, 1.0, 1.5, 2.0],
     agg=np.nanstd,
     width=600,
     height=600,

docs/source/notebooks/digits.py

@@ -103,10 +103,10 @@ def mode(arr):
     colors=labels,
     cmap=["jet", "viridis", "cividis"],
     agg=mode,
+    node_size=[0.0, 0.5, 1.0, 1.5, 2.0],
     title="mode of digits",
     width=600,
     height=600,
-    node_size=0.5,
 )
 
 fig.show(config={"scrollZoom": True}, renderer="notebook_connected")
@@ -134,10 +134,10 @@ def entropy(arr):
     colors=labels,
     cmap=["jet", "viridis", "cividis"],
     agg=entropy,
+    node_size=[0.0, 0.5, 1.0, 1.5, 2.0],
     title="entropy of digits",
     width=600,
     height=600,
-    node_size=0.5,
 )
 
 fig.show(config={"scrollZoom": True}, renderer="notebook_connected")

src/tdamapper/_common.py

@@ -29,12 +29,12 @@ def warn_user(msg):
 
 class EstimatorMixin:
 
-    def __is_sparse(self, X):
+    def _is_sparse(self, X):
         # simple alternative use scipy.sparse.issparse
         return hasattr(X, "toarray")
 
     def _validate_X_y(self, X, y):
-        if self.__is_sparse(X):
+        if self._is_sparse(X):
             raise ValueError("Sparse data not supported.")
 
         X = np.asarray(X)
@@ -80,10 +80,10 @@ class ParamsMixin:
     scikit-learn `get_params` and `set_params`.
     """
 
-    def __is_param_public(self, k):
+    def _is_param_public(self, k):
         return (not k.startswith("_")) and (not k.endswith("_"))
 
-    def __split_param(self, k):
+    def _split_param(self, k):
         k_split = k.split("__")
         outer = k_split[0]
         inner = "__".join(k_split[1:])
@@ -98,7 +98,7 @@ def get_params(self, deep=True):
         """
         params = {}
         for k, v in self.__dict__.items():
-            if self.__is_param_public(k):
+            if self._is_param_public(k):
                 params[k] = v
                 if hasattr(v, "get_params") and deep:
                     for _k, _v in v.get_params().items():
@@ -111,8 +111,8 @@ def set_params(self, **params):
         """
         nested_params = []
         for k, v in params.items():
-            if self.__is_param_public(k):
-                k_outer, k_inner = self.__split_param(k)
+            if self._is_param_public(k):
+                k_outer, k_inner = self._split_param(k)
                 if not k_inner:
                     if hasattr(self, k_outer):
                         setattr(self, k_outer, v)
@@ -131,7 +131,7 @@ def __repr__(self):
             v_default = getattr(obj_noargs, k)
             v_default_repr = repr(v_default)
             v_repr = repr(v)
-            if self.__is_param_public(k) and not v_repr == v_default_repr:
+            if self._is_param_public(k) and not v_repr == v_default_repr:
                 args_repr.append(f"{k}={v_repr}")
         return f"{self.__class__.__name__}({', '.join(args_repr)})"
 

src/tdamapper/core.py

@@ -297,7 +297,7 @@ def fit(self, X):
         :return: The object itself.
         :rtype: self
         """
-        self.__X = X
+        self._X = X
         return self
 
     def search(self, x):
@@ -314,7 +314,7 @@ def search(self, x):
             dataset.
         :rtype: list[int]
         """
-        return list(range(0, len(self.__X)))
+        return list(range(0, len(self._X)))
 
     def apply(self, X):
         """
@@ -385,27 +385,27 @@ def __init__(
 
     def fit(self, X, y=None):
         X, y = self._validate_X_y(X, y)
-        self.__cover = TrivialCover() if self.cover is None else self.cover
-        self.__clustering = (
+        self._cover = TrivialCover() if self.cover is None else self.cover
+        self._clustering = (
             TrivialClustering() if self.clustering is None else self.clustering
         )
-        self.__verbose = self.verbose
-        self.__failsafe = self.failsafe
-        if self.__failsafe:
-            self.__clustering = FailSafeClustering(
-                clustering=self.__clustering,
-                verbose=self.__verbose,
+        self._verbose = self.verbose
+        self._failsafe = self.failsafe
+        if self._failsafe:
+            self._clustering = FailSafeClustering(
+                clustering=self._clustering,
+                verbose=self._verbose,
             )
-        self.__cover = clone(self.__cover)
-        self.__clustering = clone(self.__clustering)
-        self.__n_jobs = self.n_jobs
+        self._cover = clone(self._cover)
+        self._clustering = clone(self._clustering)
+        self._n_jobs = self.n_jobs
         y = X if y is None else y
         self.graph_ = mapper_graph(
             X,
             y,
-            self.__cover,
-            self.__clustering,
-            n_jobs=self.__n_jobs,
+            self._cover,
+            self._clustering,
+            n_jobs=self._n_jobs,
         )
         self._set_n_features_in(X)
         return self
@@ -451,16 +451,16 @@ def __init__(self, clustering=None, verbose=True):
         self.verbose = verbose
 
     def fit(self, X, y=None):
-        self.__clustering = (
+        self._clustering = (
             TrivialClustering() if self.clustering is None else self.clustering
         )
-        self.__verbose = self.verbose
+        self._verbose = self.verbose
         self.labels_ = None
         try:
-            self.__clustering.fit(X, y)
-            self.labels_ = self.__clustering.labels_
+            self._clustering.fit(X, y)
+            self.labels_ = self._clustering.labels_
         except ValueError as err:
-            if self.__verbose:
+            if self._verbose:
                 _logger.warning("Unable to perform clustering on local chart: %s", err)
             self.labels_ = [0 for _ in X]
         return self

src/tdamapper/cover.py

@@ -97,10 +97,10 @@ def fit(self, X):
         :rtype: self
         """
         metric = get_metric(self.metric, **(self.metric_params or {}))
-        self.__radius = self.radius
-        self.__data = list(enumerate(X))
-        self.__vptree = VPTree(
-            self.__data,
+        self._radius = self.radius
+        self._data = list(enumerate(X))
+        self._vptree = VPTree(
+            self._data,
             metric=_Pullback(_snd, metric),
             metric_params=None,
             kind=self.kind,
@@ -121,11 +121,11 @@ def search(self, x):
         :return: The indices of the neighbors contained in the dataset.
         :rtype: list[int]
         """
-        if self.__vptree is None:
+        if self._vptree is None:
             return []
-        neighs = self.__vptree.ball_search(
+        neighs = self._vptree.ball_search(
             (-1, x),
-            self.__radius,
+            self._radius,
             inclusive=False,
         )
         return [x for (x, _) in neighs]
@@ -198,10 +198,10 @@ def fit(self, X):
         :rtype: self
         """
         metric = get_metric(self.metric, **(self.metric_params or {}))
-        self.__neighbors = self.neighbors
-        self.__data = list(enumerate(X))
-        self.__vptree = VPTree(
-            self.__data,
+        self._neighbors = self.neighbors
+        self._data = list(enumerate(X))
+        self._vptree = VPTree(
+            self._data,
             metric=_Pullback(_snd, metric),
             metric_params=None,
             kind=self.kind,
@@ -223,9 +223,9 @@ def search(self, x):
         :return: The indices of the neighbors contained in the dataset.
         :rtype: list[int]
         """
-        if self.__vptree is None:
+        if self._vptree is None:
             return []
-        neighs = self.__vptree.knn_search((-1, x), self.__neighbors)
+        neighs = self._vptree.knn_search((-1, x), self._neighbors)
         return [x for (x, _) in neighs]
 
 

src/tdamapper/plot.py

@@ -7,9 +7,9 @@
 import numpy as np
 
 from tdamapper._common import deprecated
-from tdamapper._plot_matplotlib import plot_matplotlib
-from tdamapper._plot_plotly import plot_plotly, plot_plotly_update
-from tdamapper._plot_pyvis import plot_pyvis
+from tdamapper.plot_backends.plot_matplotlib import plot_matplotlib
+from tdamapper.plot_backends.plot_plotly import plot_plotly, plot_plotly_update
+from tdamapper.plot_backends.plot_pyvis import plot_pyvis
 
 
 class MapperPlot:
@@ -206,10 +206,6 @@ def plot_plotly(
             cmap=cmap,
         )
 
-    @deprecated(
-        "This method is deprecated and will be removed in a future release. "
-        "Use a new instance of tdamapper.plot.MapperPlot."
-    )
     def plot_plotly_update(
         self,
         fig,
@@ -382,29 +378,29 @@ def __init__(
         height=512,
         cmap="jet",
     ):
-        self.__graph = graph
-        self.__dim = dim
-        self.__iterations = iterations
-        self.__seed = seed
-        self.__mapper_plot = MapperPlot(
-            graph=self.__graph,
-            dim=self.__dim,
-            iterations=self.__iterations,
-            seed=self.__seed,
+        self._graph = graph
+        self._dim = dim
+        self._iterations = iterations
+        self._seed = seed
+        self._mapper_plot = MapperPlot(
+            graph=self._graph,
+            dim=self._dim,
+            iterations=self._iterations,
+            seed=self._seed,
         )
-        self.__colors = colors
-        self.__agg = agg
-        self.__title = title
-        self.__width = width
-        self.__height = height
-        self.__cmap = cmap
-        self.__fig = self.__mapper_plot.plot_plotly(
-            colors=self.__colors,
-            agg=self.__agg,
-            title=self.__title,
-            width=self.__width,
-            height=self.__height,
-            cmap=self.__cmap,
+        self._colors = colors
+        self._agg = agg
+        self._title = title
+        self._width = width
+        self._height = height
+        self._cmap = cmap
+        self._fig = self._mapper_plot.plot_plotly(
+            colors=self._colors,
+            agg=self._agg,
+            title=self._title,
+            width=self._width,
+            height=self._height,
+            cmap=self._cmap,
         )
 
     def update(
@@ -451,20 +447,20 @@ def update(
         """
         _update_pos = False
         if seed is not None:
-            self.__seed = seed
+            self._seed = seed
             _update_pos = True
         if iterations is not None:
-            self.__iterations = iterations
+            self._iterations = iterations
             _update_pos = True
         if _update_pos:
-            self.__mapper_plot = MapperPlot(
-                graph=self.__graph,
-                dim=self.__dim,
-                iterations=self.__iterations,
-                seed=self.__seed,
+            self._mapper_plot = MapperPlot(
+                graph=self._graph,
+                dim=self._dim,
+                iterations=self._iterations,
+                seed=self._seed,
             )
-        self.__mapper_plot.plot_plotly_update(
-            self.__fig,
+        self._mapper_plot.plot_plotly_update(
+            self._fig,
             colors=colors,
             agg=agg,
             title=title,
@@ -482,7 +478,7 @@ def plot(self):
             context to be shown.
         :rtype: :class:`plotly.graph_objects.Figure`
         """
-        return self.__fig
+        return self._fig
 
 
 class MapperLayoutStatic:
@@ -543,12 +539,12 @@ def __init__(
         height=512,
         cmap="jet",
     ):
-        self.__colors = colors
-        self.__agg = agg
-        self.__title = title
-        self.__width = width
-        self.__height = height
-        self.__cmap = cmap
+        self._colors = colors
+        self._agg = agg
+        self._title = title
+        self._width = width
+        self._height = height
+        self._cmap = cmap
         self.mapper_plot = MapperPlot(
             graph=graph,
             dim=dim,
@@ -566,10 +562,10 @@ def plot(self):
             :class:`matplotlib.axes.Axes`
         """
         return self.mapper_plot.plot_matplotlib(
-            colors=self.__colors,
-            agg=self.__agg,
-            title=self.__title,
-            width=self.__width,
-            height=self.__height,
-            cmap=self.__cmap,
+            colors=self._colors,
+            agg=self._agg,
+            title=self._title,
+            width=self._width,
+            height=self._height,
+            cmap=self._cmap,
         )