Merge pull request #94 from janezd/values-as-tuples

Change argument for Variable.values from list to tuple
biolab · Aug 28, 2020 · 066432f · 066432f
2 parents 98eed64 + 06de49a
commit 066432f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/orangecontrib/educational/widgets/owgradientdescent.py b/orangecontrib/educational/widgets/owgradientdescent.py
@@ -757,7 +757,7 @@ def select_data(self):
                     [attr_x, attr_y],
                     [DiscreteVariable(
                         name=self.data.domain.class_var.name + "-bin",
-                        values=[self.target_class, 'Others'])],
+                        values=(self.target_class, 'Others'))],
                     [self.data.domain.class_var])
 
             y = [(0 if self.data.domain.class_var.values[int(d)] ==

diff --git a/orangecontrib/educational/widgets/owpolynomialclassification.py b/orangecontrib/educational/widgets/owpolynomialclassification.py
@@ -564,9 +564,9 @@ def select_data(self):
         other_value = cls_domain.values[(target_idx + 1) % 2]
 
         class_domain = [DiscreteVariable(
-            name="Transormed " + self.data.domain.class_var.name,
-            values=[self.target_class, 'Others'
-            if len(cls_domain.values) > 2 else other_value])]
+            name="Transformed " + self.data.domain.class_var.name,
+            values=(self.target_class, 'Others'
+            if len(cls_domain.values) > 2 else other_value))]
 
         domain = Domain(
             [attr_x, attr_y],

diff --git a/orangecontrib/educational/widgets/tests/test_owgradientdescent.py b/orangecontrib/educational/widgets/tests/test_owgradientdescent.py
@@ -75,7 +75,7 @@ def test_set_data_one_class_value(self):
         # with only one class value
         table_one_class = Table.from_numpy(
             Domain([ContinuousVariable("x"), ContinuousVariable("y")],
-                   DiscreteVariable("a", values=["k"])),
+                   DiscreteVariable("a", values=("k", ))),
             [[1, 2], [2, 3]], [0, 0]
         )
         self.send_signal(w.Inputs.data, table_one_class)
@@ -96,8 +96,8 @@ def test_set_data_incomplete_continuous(self):
         table_no_enough_cont = Table.from_numpy(
             Domain(
                 [ContinuousVariable("x"),
-                 DiscreteVariable("y", values=["a", "b"])],
-                DiscreteVariable("a", values=['a', 'b'])),
+                 DiscreteVariable("y", values=("a", "b"))],
+                DiscreteVariable("a", values=('a', 'b'))),
             [[1, 0], [2, 1]], [0, 1]
         )
         self.send_signal(w.Inputs.data, table_no_enough_cont)
@@ -167,7 +167,7 @@ def test_set_data_incomplete_cont_class(self):
         # not enough continuous variables when continuous class
         table_no_enough_cont = Table.from_numpy(
             Domain(
-                [DiscreteVariable("y", values=["a", "b"])],
+                [DiscreteVariable("y", values=("a", "b"))],
                 ContinuousVariable("a")),
             [[1], [0]], [0, 1])
 
@@ -749,7 +749,7 @@ def test_select_data_discrete(self):
 
         # test with data set for logistic regression - class discrete
         domain = Domain([ContinuousVariable('a'), ContinuousVariable('b')],
-                        DiscreteVariable('c', values=['a', 'b']))
+                        DiscreteVariable('c', values=('a', 'b')))
         data = Table.from_numpy(domain, [[1, 2], [1, 2]], [0, 1])
 
         self.send_signal(w.Inputs.data, data)
@@ -777,7 +777,7 @@ def test_select_data_none(self):
         data = Table.from_numpy(
             Domain(
                 [ContinuousVariable('a'), ContinuousVariable('b')],
-                DiscreteVariable('c', values=['a', 'b'])
+                DiscreteVariable('c', values=('a', 'b'))
             ),
             [[1, None], [1, None]], [0, 1]
         )
@@ -788,7 +788,7 @@ def test_select_data_none(self):
         data = Table.from_numpy(
             Domain(
                 [ContinuousVariable('a'), ContinuousVariable('b')],
-                DiscreteVariable('c', values=['a', 'b'])
+                DiscreteVariable('c', values=('a', 'b'))
             ),
             [[None, None], [None, None]], [0, 1]
         )

diff --git a/orangecontrib/educational/widgets/tests/test_owpolynomialclassification.py b/orangecontrib/educational/widgets/tests/test_owpolynomialclassification.py
@@ -209,7 +209,7 @@ def test_set_data_one_class(self):
 
         table_one_class = Table.from_list(
             Domain([ContinuousVariable("x"), ContinuousVariable("y")],
-                   DiscreteVariable("a", values=["k"])),
+                   DiscreteVariable("a", values=("k", ))),
             [[1, 2], [2, 3]], [0, 0])
         self.send_signal(w.Inputs.data, table_one_class)
 
@@ -228,7 +228,7 @@ def test_set_data_wrong_var_number(self):
         table_no_enough_cont = Table.from_numpy(
             Domain(
                 [ContinuousVariable("x"),
-                 DiscreteVariable("y", values=["a", "b"])],
+                 DiscreteVariable("y", values=("a", "b"))],
                 ContinuousVariable("a")),
             [[1, 0], [2, 1]], [0, 0])
         self.send_signal(w.Inputs.data, table_no_enough_cont)
@@ -385,7 +385,7 @@ def test_select_data(self):
         # selected data none when one column only Nones
         data = Table.from_numpy(
             Domain([ContinuousVariable('a'), ContinuousVariable('b')],
-                   DiscreteVariable('c', values=['a', 'b'])),
+                   DiscreteVariable('c', values=('a', 'b'))),
             [[1, None], [1, None]], [0, 1]
         )
         self.send_signal(w.Inputs.data, data)
@@ -394,7 +394,7 @@ def test_select_data(self):
 
         data = Table.from_numpy(
             Domain([ContinuousVariable('a'), ContinuousVariable('b')],
-                   DiscreteVariable('c', values=['a', 'b'])),
+                   DiscreteVariable('c', values=('a', 'b'))),
             [[None, None], [None, None]], [0, 1]
         )
         self.send_signal(w.Inputs.data, data)