Changeset 779 for trunk/yat/classifier

Timestamp:

Mar 5, 2007, 7:58:30 PM (17 years ago)

Author:

Peter

Message:

Refs #101

Location:

trunk/yat/classifier

Files:

• DataLookupWeighted1D.cc (modified) (1 diff)
• DataLookupWeighted1D.h (modified) (1 diff)
• InputRanker.cc (modified) (1 diff)
• utility.cc (modified) (2 diffs)
• utility.h (modified) (2 diffs)

trunk/yat/classifier/DataLookupWeighted1D.cc

@@ -78 +78 @@
 
 
+  double sum_weight(const DataLookupWeighted1D& x)
+  {
+    double r=0;
+    for (size_t i=0; i<x.size(); ++i)
+      r += x.weight(i);
+    return r;
+  }
+
+
   double DataLookupWeighted1D::weight(const size_t i) const
   {

trunk/yat/classifier/DataLookupWeighted1D.h

@@ -105 +105 @@
   };
 
+  ///
+  /// @return sum of weights
+  ///
+  double sum_weight(const DataLookupWeighted1D&);
+
 }}} // of namespace classifier, yat, and theplu
 

trunk/yat/classifier/InputRanker.cc

@@ -28 +28 @@
 #include "DataLookupWeighted1D.h"
 #include "Target.h"
-#include "yat/statistics/ROC.h"
+#include "yat/statistics/Score.h"
 #include "yat/utility/stl_utility.h"
 

trunk/yat/classifier/utility.cc

@@ -24 +24 @@
 #include "utility.h"
 #include "DataLookup1D.h"
+#include "DataLookupWeighted1D.h"
 #include "yat/utility/vector.h"
 
@@ -38 +39 @@
   }
 
+  void convert(const DataLookupWeighted1D& lookup, utility::vector& value,
+               utility::vector& weight) 
+  {
+    
+    value=utility::vector(lookup.size());
+    weight=utility::vector(lookup.size());
+    for(u_int i=0; i<lookup.size(); i++){
+      value(i)=lookup.data(i);
+      weight(i)=lookup.weight(i);
+    }
+  }
+
 }}} // of namespace classifier, yat, and theplu

trunk/yat/classifier/utility.h

@@ -35 +35 @@
 
   class DataLookup1D;
+  class DataLookupWeighted1D;
 
   ///
@@ -41 +42 @@
   void convert(const DataLookup1D&, utility::vector&);
 
+  ///
+  /// Converts a DataLookupWeighted1D to two utility::vector
+  ///
+  void convert(const DataLookupWeighted1D&, utility::vector& value,
+               utility::vector& weight);
+
 }}} // of namespace classifier, yat, and theplu