Changeset 1271 for trunk/yat/classifier

Timestamp:

Apr 9, 2008, 6:11:07 PM (15 years ago)

Author:

Peter

Message:

replaced u_int with unsigned int or size_t

Location:

trunk/yat/classifier

Files:

• IGP.h (modified) (2 diffs)
• KNN.h (modified) (5 diffs)
• Kernel.cc (modified) (4 diffs)
• Kernel.h (modified) (3 diffs)
• SupervisedClassifier.h (modified) (1 diff)
• utility.cc (modified) (2 diffs)

trunk/yat/classifier/IGP.h

@@ -116 +116 @@
     igp_ = utility::Vector(target_.nof_classes());
     
-    for(u_int i=0; i<target_.size(); i++) {
-      u_int neighbor=i;
+    for(size_t i=0; i<target_.size(); i++) {
+      size_t neighbor=i;
       double mindist=std::numeric_limits<double>::max();
       const DataLookup1D a(matrix_,i,false);
-      for(u_int j=0; j<target_.size(); j++) {           
+      for(size_t j=0; j<target_.size(); j++) {            
         DataLookup1D b(matrix_,j,false);
         double dist=distance_(a.begin, a.end(), b.begin());
@@ -132 +132 @@
       
     }
-    for(u_int i=0; i<target_.nof_classes(); i++) {
+    for(size_t i=0; i<target_.nof_classes(); i++) {
       igp_(i)/=static_cast<double>(target_.size(i));
     }

trunk/yat/classifier/KNN.h

@@ -96 +96 @@
        \return The number of neighbors.
     */
-    u_int k() const;
+    unsigned int k() const;
 
     /**
@@ -103 +103 @@
        Sets the number of neighbors to \a k_in. 
     */
-    void k(u_int k_in);
+    void k(unsigned int k_in);
 
 
@@ -166 +166 @@
 
     // The number of neighbors
-    u_int k_;
+    unsigned int k_;
 
     Distance distance_;
@@ -240 +240 @@
   
   template <typename Distance, typename NeighborWeighting>
-  u_int KNN<Distance, NeighborWeighting>::k() const
+  unsigned int KNN<Distance, NeighborWeighting>::k() const
   {
     return k_;
@@ -246 +246 @@
 
   template <typename Distance, typename NeighborWeighting>
-  void KNN<Distance, NeighborWeighting>::k(u_int k)
+  void KNN<Distance, NeighborWeighting>::k(unsigned k)
   {
     k_=k;

trunk/yat/classifier/Kernel.cc

@@ -42 +42 @@
   {
     if (own)
-      ref_count_ = new u_int(1);
+      ref_count_ = new unsigned int(1);
     else
       ref_count_ = NULL;
@@ -53 +53 @@
   {
     if (own){
-      ref_count_w_ = new u_int(1);
+      ref_count_w_ = new unsigned int(1);
     }
     else {
@@ -68 +68 @@
     if (other.weighted()){
       mlw_ = new MatrixLookupWeighted(*other.mlw_, utility::Index(index),true);
-      ref_count_w_ = new u_int(1);
+      ref_count_w_ = new unsigned int(1);
       ml_=NULL;
       ref_count_ = NULL;
@@ -74 +74 @@
     else{
       ml_ = new MatrixLookup(*other.ml_, utility::Index(index),true);
-      ref_count_ = new u_int(1);
+      ref_count_ = new unsigned int(1);
       mlw_=NULL;
       ref_count_w_ = NULL;

trunk/yat/classifier/Kernel.h

@@ -30 +30 @@
 #include "KernelFunction.h"
 
-#include <cctype>
+#include <cstddef>
 #include <vector>
-
-#include <sys/types.h>
 
 namespace theplu {
@@ -183 +181 @@
     /// (data_). NULL if this is not an owner.
     ///
-    u_int* ref_count_;
+    unsigned int* ref_count_;
 
     ///
@@ -189 +187 @@
     /// (data_w_). NULL if this is not an owner.
     ///
-    u_int* ref_count_w_;
+    unsigned int* ref_count_w_;
 
   private:

trunk/yat/classifier/SupervisedClassifier.h

@@ -27 +27 @@
 */
 
-#include <stddef.h>
+#include <cstddef>
 
 namespace theplu {

trunk/yat/classifier/utility.cc

@@ -36 +36 @@
   {
     vector = utility::Vector(lookup.size());
-    for(u_int i=0; i<lookup.size(); i++)
+    for(size_t i=0; i<lookup.size(); i++)
       vector(i)=lookup(i);
   }
@@ -46 +46 @@
     value = utility::Vector(lookup.size());
     weight = utility::Vector(lookup.size());
-    for(u_int i=0; i<lookup.size(); i++){
+    for(size_t i=0; i<lookup.size(); i++){
       value(i)=lookup.data(i);
       weight(i)=lookup.weight(i);