owkmeans: fix original_domain of output KMeansModel

Author: markotoplak

Orange/widgets/unsupervised/owkmeans.py

@@ -283,7 +283,7 @@ def has_attributes(self):
         return len(self.data.domain.attributes)
 
     @staticmethod
-    def _compute_clustering(data, k, init, n_init, max_iter, random_state):
+    def _compute_clustering(data, k, init, n_init, max_iter, random_state, original_domain):
         # type: (Table, int, str, int, int, bool) -> KMeansModel
         if k > len(data):
             raise NotEnoughData()
@@ -293,6 +293,9 @@ def _compute_clustering(data, k, init, n_init, max_iter, random_state):
             random_state=random_state, preprocessors=[]
         ).get_model(data)
 
+        # set explict original domain because data was preprocessed separately
+        model.original_domain = original_domain
+
         if data.X.shape[0] <= SILHOUETTE_MAX_SAMPLES:
             model.silhouette_samples = silhouette_samples(data.X, model.labels)
             model.silhouette = np.mean(model.silhouette_samples)
@@ -365,6 +368,7 @@ def __launch_tasks(self, ks):
             n_init=self.n_init,
             max_iter=self.max_iterations,
             random_state=RANDOM_STATE,
+            original_domain=self.data.domain,
         ) for k in ks]
         watcher = FutureSetWatcher(futures)
         watcher.resultReadyAt.connect(self.__clustering_complete)

Orange/widgets/unsupervised/tests/test_owkmeans.py

@@ -11,6 +11,7 @@
 
 import Orange.clustering
 from Orange.data import Table, Domain
+from Orange.data.table import DomainTransformationError
 from Orange.widgets import gui
 from Orange.widgets.tests.base import WidgetTest
 from Orange.widgets.unsupervised.owkmeans import OWKMeans, ClusterTableModel
@@ -214,8 +215,8 @@ def test_clusters_compute_value(self):
         np.testing.assert_equal(np.isnan(transformed), False)
 
         incompatible_data = Table("iris")
-        transformed = incompatible_data.transform(out.domain).get_column("Cluster")
-        np.testing.assert_equal(np.isnan(transformed), True)
+        with self.assertRaises(DomainTransformationError):
+            transformed = incompatible_data.transform(out.domain)
 
     def test_centroids_on_output(self):
         widget = self.widget