Changeset 768

Timestamp:

Feb 22, 2007, 6:18:15 PM (17 years ago)

Author:

Peter

Message:

addresses #57

Location:

trunk/yat/classifier

Files:

• NBC.cc (modified) (3 diffs)
• NBC.h (modified) (1 diff)

trunk/yat/classifier/NBC.cc

@@ -74 +74 @@
   bool NBC::train()
   {   
-    sigma_=centroids_=utility::matrix(data_.rows(), target_.nof_classes());
+    sigma2_=centroids_=utility::matrix(data_.rows(), target_.nof_classes());
     utility::matrix nof_in_class(data_.rows(), target_.nof_classes());
     
@@ -106 +106 @@
     assert(data_.rows()==input.rows());
 
-    std::log(sigma_(i,c)) + 
-
     prediction = utility::matrix(centroids_.columns(),input.columns());
-    for (size_t c=0; c<centroid_.columns(); ++c) {
+    for (size_t c=0; c<centroids_.columns(); ++c) {
       double sum_ln_sigma=0;
       for (size_t i=0; i<sigma2_.rows(); ++i) 
@@ -119 +117 @@
         prediction(c,s) = sum_ln_sigma;
         for (size_t i=0; i<input.columns(); ++i) {
-          prediction(c,s) += std::pow(input(i,s)-mean_(i,c),2)/sigma2_(i,c);
+          prediction(c,s) += std::pow(input(i,s)-centroids_(i,c),2)/sigma2_(i,c);
         }
       }

trunk/yat/classifier/NBC.h

@@ -93 +93 @@
 
     utility::matrix centroids_;
-    utility::matrix sigma_;
+    utility::matrix sigma2_;
     const DataLookup2D& data_;