Changeset 233

Timestamp:

Feb 21, 2005, 3:52:30 PM (17 years ago)

Author:

Peter

Message:

function added

Location:

trunk/src

Files:

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

trunk/src/WeNNI.cc

@@ -15 +15 @@
   WeNNI::WeNNI(const gslapi::matrix& matrix,const gslapi::matrix& flag,
                const u_int neighbours)
-    : NNI(matrix,flag,neighbours)
+    : NNI(matrix,flag,neighbours), imputed_data_raw_(matrix)
   {
     //estimate();
@@ -34 +34 @@
       sort(distance.begin(),distance.end(),
                 pair_value_compare<u_int,double>());
+      bool row_imputed=true;
       for (unsigned int j=0; j<data_.columns(); j++) {
         vector<u_int> knn=nearest_neighbours(j,distance);
@@ -47 +48 @@
         }
         // No impute if no contributions from neighbours.
-        if (norm)
+        if (norm){
+          imputed_data_raw_(i,j) = new_value/norm;
           imputed_data_(i,j)=
-            weight_(i,j)*data_(i,j) + (1-weight_(i,j)) * new_value/norm;
+            weight_(i,j)*data_(i,j) + (1-weight_(i,j))* imputed_data_raw_(i,j);
+        }
         else
-          not_imputed_.push_back(i);
+          row_imputed=false;
       }
+      if (!row_imputed)
+        not_imputed_.push_back(i);
     }
     return not_imputed_.size();

trunk/src/WeNNI.h

@@ -40 +40 @@
     u_int estimate(void);
 
+    ///
+    /// @return A const reference to.
+    ///
+    const gslapi::matrix& imputed_data_raw(void) const 
+    { return imputed_data_raw_; }
+
+
+
   private:
 
-
+    gslapi::matrix imputed_data_raw_;
   };