Changeset 469 for branches/peters_vector/lib/statistics/WilcoxonFoldChange.cc

Timestamp:

Dec 19, 2005, 3:58:29 PM (17 years ago)

Author:

Peter

Message:

non compiling checking before revision after design meeting

File:

• branches/peters_vector/lib/statistics/WilcoxonFoldChange.cc (modified) (3 diffs)

branches/peters_vector/lib/statistics/WilcoxonFoldChange.cc

@@ -2 +2 @@
 
 #include <c++_tools/statistics/WilcoxonFoldChange.h>
+#include <c++_tools/classifier/VectorAbstract.h>
 #include <c++_tools/statistics/utility.h>
+#include <c++_tools/classifier/Target.h>
 
 #include <cmath>
+#include <vector>
 
 namespace theplu {
@@ -17 +20 @@
 
 
-  double WilcoxonFoldChange::score(const gslapi::vector& target, 
-                                   const gslapi::vector& value,
-                                   const std::vector<size_t>& train_set)
+  double WilcoxonFoldChange::score(const classifier::Target& target, 
+                                   const classifier::VectorAbstract& value)
   {
-    if (!train_set_.size())
-      for (size_t i=0; i<target_.size(); i++)
-        train_set_.push_back(i);  
-    else
-      train_set_=train_set;
-
     std::vector<double> distance;
     //Peter, should reserve the vector to avoid reallocations   
     weighted_=false;
-    for (size_t i=0; i<train_set_.size(); i++) {
+    for (size_t i=0; i<target.size(); i++) {
       for (size_t j=0; i<j; j++) {
-        if (target(train_set_[i])==target(train_set_[j])) continue;
-        distance.push_back(value(train_set_[i])-value(train_set_[j]));
+        if (target(i)==target(j)) continue;
+        distance.push_back(value(i)-value(j));
       }
     }
@@ -41 +37 @@
   }
 
-  double WilcoxonFoldChange::score(const gslapi::vector& target, 
-                                   const gslapi::vector& value,
-                                   const gslapi::vector& weight,
-                                   const std::vector<size_t>& train_set) 
+  double WilcoxonFoldChange::score(const classifier::Target& target, 
+                                   const classifier::VectorAbstract& value,
+                                   const classifier::VectorAbstract& weight)
   {
     return 0;