Changeset 10900:a07531c84486 in orange

Timestamp:

06/04/12 15:44:23 (13 months ago)

Author:

Matija Polajnar <matija.polajnar@…>

Branch:

default

Message:

Fix AUX and stacking to use the new TestedExample structure.

Location:

Orange

Files:

• ensemble/stacking.py (modified) (1 diff)
• evaluation/scoring.py (modified) (11 diffs)

Orange/ensemble/stacking.py

@@ -39 +39 @@
         p_data = Orange.data.Table(domain)
         for r in res.results:
-            p_data.append([p for ps in r.probabilities for p in ps[:-1]] + [r.actual_class])
+            p_data.append([p for ps in r.probabilities for p in list(ps)[:-1]] + [r.actual_class])
         meta_classifier = self.meta_learner(p_data)
 

Orange/evaluation/scoring.py

@@ -1484 +1484 @@
     return wrapped
 
+def replace_discrete_probabilities_with_list(method=False):
+    if environ.orange_no_deprecated_members:
+        return fun
+
+    def decorator(fun):
+        @functools.wraps(fun)
+        def wrapped(*args, **kwargs):
+            res = args[method] if len(args)>method else kwargs.get("res", kwargs.get("test_results", None))
+            convert = res is not None
+
+            if convert:
+                old_probs = []
+                for r in res.results:
+                    old_probs.append(r.probabilities)
+                    r.probabilities = [list(p) if type(p) is Orange.statistics.distribution.Discrete
+                                       else p for p in r.probabilities]
+            result = fun(*args, **kwargs)
+            if convert:
+                for r, old in zip(res.results, old_probs):
+                    r.probabilities = old
+            return result
+        return wrapped
+    return decorator
+
 class AUC(list):
     """
@@ -1539 +1563 @@
             self[:] = self.__call__(test_results)
 
+    @replace_discrete_probabilities_with_list(method=True)
     def __call__(self, test_results):
         if len(test_results.class_values) < 2:
@@ -1722 +1747 @@
         super(AUC_for_single_class, self).__init__(test_results, ignore_weights=ignore_weights)
 
+    @replace_discrete_probabilities_with_list(method=True)
     def __call__(self, test_results):
         return self._compute_for_single_class(test_results, self.class_index)
@@ -1737 +1763 @@
         super(AUC_for_pair_of_classes, self).__init__(test_results, ignore_weights=ignore_weights)
 
+    @replace_discrete_probabilities_with_list(method=True)
     def __call__(self, test_results):
         return self._compute_for_pair_of_classes(test_results, self.class_index1, self.class_index2)
@@ -1748 +1775 @@
     """
 
+    @replace_discrete_probabilities_with_list(method=True)
     def __call__(self, test_results):
         numberOfClasses = len(test_results.class_values)
@@ -1773 +1801 @@
 #Backward compatibility
 @replace_use_weights
+@replace_discrete_probabilities_with_list
 def AUC_binary(res, ignore_weights=False):
     auc = deprecated_function_name(AUC)(ignore_weights=ignore_weights)
@@ -1779 +1808 @@
 
 @replace_use_weights
+@replace_discrete_probabilities_with_list
 def AUC_multi(res, ignore_weights=False, method=0):
     auc = deprecated_function_name(AUC)(ignore_weights=ignore_weights,
@@ -1827 +1857 @@
 
 @deprecated_keywords({"unweighted": "ignore_weights"})
+@replace_discrete_probabilities_with_list
 def McNemar(res, ignore_weights=False, **argkw):
     """
@@ -1874 +1905 @@
     return mcm
 
-
+@replace_discrete_probabilities_with_list
 def McNemar_of_two(res, lrn1, lrn2, ignore_weights=False):
     """
@@ -1904 +1935 @@
         return 0
 
-
+@replace_discrete_probabilities_with_list
 def Friedman(res, stat=CA):
     """
@@ -1929 +1960 @@
     return F, statc.chisqprob(F, k - 1), sums
 
-
+@replace_discrete_probabilities_with_list
 def Wilcoxon_pairs(res, avgranks, stat=CA):
     """