Changeset 172

Timestamp:

Sep 28, 2004, 11:53:45 AM (19 years ago)

Author:

Jari Häkkinen

Message:

Fixed stupid bug; now the original data is kept during whole impute
algorithm, i.e. imputed values are not used to impute other values.

Location:

trunk

Files:

• src/NNI.cc (modified) (1 diff)
• src/NNI.h (modified) (2 diffs)
• src/WeNNI.cc (modified) (1 diff)
• src/kNNI.cc (modified) (1 diff)
• test/data/wenni_result.data (modified) (1 diff)
• test/test_nni.cc (modified) (2 diffs)

trunk/src/NNI.cc

@@ -15 +15 @@
   NNI::NNI(gslapi::matrix& matrix,const gslapi::matrix& weight,
            const u_int neighbours)
-    : data_(matrix), weight_(weight), neighbours_(neighbours)
+    : data_(matrix), imputed_data_(matrix), neighbours_(neighbours),
+      weight_(weight)
   {
   }

trunk/src/NNI.h

@@ -29 +29 @@
     virtual ~NNI(void) {};
 
+    const gslapi::matrix& imputed_data(void) const { return imputed_data_; }
+
   protected:
     vector<pair<u_int,double> > calculate_distances(const u_int) const;
@@ -36 +38 @@
 
     gslapi::matrix& data_;
+    gslapi::matrix imputed_data_;
+    u_int neighbours_;
     const gslapi::matrix& weight_;
-    u_int neighbours_;
   };
 

trunk/src/WeNNI.cc

@@ -42 +42 @@
         // No impute if no contributions from neighbours.
         if (norm)
-          data_(i,j)=weight_(i,j)*data_(i,j)+(1-weight_(i,j))*new_value/norm;
+          imputed_data_(i,j)=weight_(i,j)*data_(i,j)+(1-weight_(i,j))*new_value/norm;
       }
     }

trunk/src/kNNI.cc

@@ -49 +49 @@
           // No impute if no contributions from neighbours.
           if (norm)
-            data_(mv_rows_[i],j)=new_value/norm;
+            imputed_data_(mv_rows_[i],j)=new_value/norm;
         }
     }

trunk/test/data/wenni_result.data

@@ -8 +8 @@
 0.2234 0.77639 0.38783 0.28953 0.62376 0.5445 0.32489 0.22388 0.238746 0.23468 0.1234
 0.2388 0.234688 0.43687 0.86456 0.65654 0.6864 0.879645 0.98454 0.98731 0.164897 0.1234
-0.1968 0.153987 0.13684 0.14685 0.316135 0.5286 0.69435 0.13634 0.18351 0.577498730752 0.1234
+0.1968 0.153987 0.13684 0.14685 0.316135 0.5286 0.69435 0.13634 0.18351 0.577488912729 0.1234
 0.6865 0.213687 0.12368 0.18564 0.897654 0.4945 0.789654 0.45547 0.98466 0.66136 0.1234
 0.9835 0.963154 0.964664 0.132369 0.983316 0.3276 0.376513 0.34941 0.387433 0.31685 0.1234

trunk/test/test_nni.cc

@@ -43 +43 @@
   std::ifstream control_stream(knni_result.c_str());
   theplu::gslapi::matrix control(control_stream);
-  control-=data;
+  control-=knni.imputed_data();
   for (unsigned int i=0; i<control.rows(); i++)
     for (unsigned int j=0; j<control.columns(); j++)
@@ -64 +64 @@
   control_stream.open(wenni_result.c_str());
   control=theplu::gslapi::matrix(control_stream);
-  control-=data;
+  control-=wenni.imputed_data();
   for (unsigned int i=0; i<control.rows(); i++)
     for (unsigned int j=0; j<control.columns(); j++)