util.get_unique_names: Remove get_next_name

Author: janezd

Orange/widgets/unsupervised/owkmeans.py

@@ -10,9 +10,10 @@
 from Orange.clustering import KMeans
 from Orange.clustering.kmeans import KMeansModel, SILHOUETTE_MAX_SAMPLES
 from Orange.data import Table, Domain, DiscreteVariable, ContinuousVariable
+from Orange.data.util import get_unique_names
 from Orange.widgets import widget, gui
 from Orange.widgets.settings import Setting
-from Orange.widgets.utils.annotated_data import get_next_name, \
+from Orange.widgets.utils.annotated_data import \
     ANNOTATED_DATA_SIGNAL_NAME, add_columns
 from Orange.widgets.utils.concurrent import ThreadExecutor, FutureSetWatcher
 from Orange.widgets.utils.sql import check_sql_input
@@ -463,11 +464,12 @@ def send_data(self):
 
         domain = self.data.domain
         cluster_var = DiscreteVariable(
-            get_next_name(domain, "Cluster"),
+            get_unique_names(domain, "Cluster"),
             values=["C%d" % (x + 1) for x in range(km.k)]
         )
         clust_ids = km(self.data)
-        silhouette_var = ContinuousVariable(get_next_name(domain, "Silhouette"))
+        silhouette_var = ContinuousVariable(
+            get_unique_names(domain, "Silhouette"))
         if km.silhouette_samples is not None:
             self.Warning.no_silhouettes.clear()
             scores = np.arctan(km.silhouette_samples) / np.pi + 0.5

Orange/widgets/unsupervised/owlouvainclustering.py

@@ -16,11 +16,12 @@
 
 from Orange.clustering.louvain import table_to_knn_graph, Louvain
 from Orange.data import Table, DiscreteVariable
+from Orange.data.util import get_unique_names
 from Orange.projection import PCA
 from Orange.widgets import widget, gui, report
 from Orange.widgets.settings import DomainContextHandler, ContextSetting, \
     Setting
-from Orange.widgets.utils.annotated_data import get_next_name, add_columns, \
+from Orange.widgets.utils.annotated_data import add_columns, \
     ANNOTATED_DATA_SIGNAL_NAME
 from Orange.widgets.utils.concurrent import FutureWatcher
 from Orange.widgets.utils.signals import Input, Output
@@ -358,7 +359,7 @@ def _send_data(self):
         new_partition = list(map(index_map.get, self.partition))
 
         cluster_var = DiscreteVariable(
-            get_next_name(domain, 'Cluster'),
+            get_unique_names(domain, 'Cluster'),
             values=['C%d' % (i + 1) for i, _ in enumerate(np.unique(new_partition))]
         )
 

Orange/widgets/utils/annotated_data.py

@@ -1,8 +1,6 @@
-from itertools import chain
-
 import numpy as np
 from Orange.data import Domain, DiscreteVariable
-from Orange.data.util import get_indices
+from Orange.data.util import get_unique_names
 
 ANNOTATED_DATA_SIGNAL_NAME = "Data"
 ANNOTATED_DATA_FEATURE_NAME = "Selected"
@@ -32,28 +30,8 @@ def add_columns(domain, attributes=(), class_vars=(), metas=()):
     return Domain(attributes, class_vars, metas)
 
 
-def get_next_name(names, name):
-    """
-    Returns next 'possible' attribute name. The name should not be duplicated
-    and is generated using name parameter, appended by smallest possible index.
-
-    :param names: list
-    :param name: str
-    :return: str
-    """
-    if isinstance(names, Domain):
-        names = [
-            var.name
-            for var in chain(names.attributes, names.class_vars, names.metas)
-        ]
-    indexes = get_indices(names, name)
-    if name not in names and not indexes:
-        return name
-    return "{} ({})".format(name, max(indexes, default=0) + 1)
-
-
 def _table_with_annotation_column(data, values, column_data, var_name):
-    var = DiscreteVariable(get_next_name(data.domain, var_name), values)
+    var = DiscreteVariable(get_unique_names(data.domain, var_name), values)
     class_vars, metas = data.domain.class_vars, data.domain.metas
     if not data.domain.class_vars:
         class_vars += (var, )

Orange/widgets/utils/tests/test_annotated_data.py

@@ -5,21 +5,11 @@
 
 from Orange.data import Table, Variable
 from Orange.data.filter import SameValue
-from Orange.data.util import get_unique_names
 from Orange.widgets.utils.annotated_data import (
-    create_annotated_table, get_next_name,
-    create_groups_table, ANNOTATED_DATA_FEATURE_NAME
+    create_annotated_table, create_groups_table, ANNOTATED_DATA_FEATURE_NAME
 )
 
 
-class TestGetNextName(unittest.TestCase):
-    def test_get_var_name(self):
-        self.assertEqual(get_next_name(["a"], "XX"), "XX")
-        self.assertEqual(get_next_name(["a", "XX"], "XX"), "XX (1)")
-        self.assertEqual(get_next_name(["a", "XX (4)"], "XX"), "XX (5)")
-        self.assertEqual(get_next_name(["a", "XX", "XX (4)"], "XX"), "XX (5)")
-
-
 class TestAnnotatedData(unittest.TestCase):
     def setUp(self):
         Variable._clear_all_caches()  # pylint: disable=protected-access