Changeset 623 for trunk/c++_tools/statistics/tScore.cc

Timestamp:

Sep 5, 2006, 4:13:12 AM (16 years ago)

Author:

Peter

Message:

fixes #112 and refs #123 added overloaded function score taking Target and DataLookupWeighted1D, which is needed for InputRanker?.

File:

• trunk/c++_tools/statistics/tScore.cc (modified) (2 diffs)

trunk/c++_tools/statistics/tScore.cc

@@ -1 +1 @@
 // $Id$
 
-// System includes
+#include "c++_tools/statistics/tScore.h"
+#include "c++_tools/statistics/Averager.h"
+#include "c++_tools/statistics/AveragerWeighted.h"
+#include "c++_tools/classifier/DataLookupWeighted1D.h"
+#include "c++_tools/classifier/Target.h"
+
 #include <cassert>
 #include <cmath>
 
-// Thep C++ Tools
-#include <c++_tools/statistics/tScore.h>
-#include <c++_tools/statistics/Averager.h>
-#include <c++_tools/statistics/AveragerWeighted.h>
-#include <c++_tools/classifier/Target.h>
 
 namespace theplu {
@@ -41 +41 @@
     return t_;
   }
+
+
+  double tScore::score(const classifier::Target& target, 
+                       const classifier::DataLookupWeighted1D& value)
+  {
+    weighted_=true;
+
+    statistics::AveragerWeighted positive;
+    statistics::AveragerWeighted negative;
+    for(size_t i=0; i<target.size(); i++){
+      if (target.binary(i))
+        positive.add(value.data(i),value.weight(i));
+      else
+        negative.add(value.data(i),value.weight(i));
+    }
+    double diff = positive.mean() - negative.mean();
+    dof_=positive.n()+negative.n()-2;
+    double s2=(positive.sum_xx_centered()+negative.sum_xx_centered())/dof_;
+    t_=diff/sqrt(s2/positive.n()+s2/(negative.n()));
+    if (t_<0 && absolute_)
+      t_=-t_;
+
+    if(positive.sum_w()==0 || negative.sum_w()==0)
+      t_=0;
+    return t_;
+  }
+
 
   double tScore::score(const classifier::Target& target,