Changeset 9205:cc8a9c2bd0bf in orange

Timestamp:

11/14/11 16:14:57 (18 months ago)

Author:

ales_erjavec <ales.erjavec@…>

Branch:

default

Convert:

3716040913f250d3c0d2714eaecda5638242cd8e

Message:

Fixed binary class classification.
Using soft max function to convert the predicted values to class probabilities.

File:

• orange/Orange/regression/earth.py (modified) (2 diffs)

orange/Orange/regression/earth.py

@@ -229 +229 @@
                                expanded_class=expanded_class)
     
+    
+def soft_max(values):
+    values = numpy.asarray(values)
+    return numpy.exp(values) / numpy.sum(numpy.exp(values))
+
 
 class EarthClassifier(Orange.core.ClassifierFD):
@@ -267 +272 @@
         from Orange.statistics.distribution import Distribution
         
-        if is_discrete(self.class_var):
-            winner = max(vals) #TODO: Handle ties.
-            value = winner.variable.get_value_from.transformer.value
-            value = self.class_var(value)
+        if not self.multi_flag and is_discrete(self.class_var):
             dist = Distribution(self.class_var)
-            dist[value] = 1.0
+            if len(self.class_var.values) == 2:
+                probs = [1 - float(vals[0]), float(vals[0])]
+            else:
+                probs = soft_max(map(float, vals))
+                
+            for val, p in zip(self.class_var.values, probs):
+                dist[val] = p
+            value = dist.modus()
             vals, probs = [value], [dist]
         else: