Merge pull request #868 from markotoplak/vizrankregression

scatterplot rank projections: R2 score for regression
biolab · Dec 17, 2015 · e5b0753 · e5b0753
2 parents 486ae5d + f6a3de1
commit e5b0753
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Orange/widgets/visualize/owscatterplot.py b/Orange/widgets/visualize/owscatterplot.py
@@ -7,6 +7,7 @@
 from PyQt4.QtGui import QApplication, QTableView, QStandardItemModel, \
     QStandardItem
 from sklearn.neighbors import NearestNeighbors
+from sklearn.metrics import r2_score
 
 import Orange
 from Orange.data import Table, Domain, StringVariable, ContinuousVariable, \
@@ -556,7 +557,11 @@ def run(self):
                     y = y_full[valid]
                     knn = NearestNeighbors(n_neighbors=self.k).fit(X)
                     ind = knn.kneighbors(return_distance=False)
-                    score = norm * np.sum(y[ind] == y.reshape(-1, 1))
+                    if isinstance(self.parent_widget.data.domain.class_var,
+                            DiscreteVariable):
+                        score = norm * np.sum(y[ind] == y.reshape(-1, 1))
+                    else:
+                        score = r2_score(y, np.mean(y[ind], axis=1))
                     pos = bisect_left(self.scores, score)
                     self.projectionTableModel.insertRow(
                         len(self.scores) - pos,