From eb062b2da9ebd03de91184eec265c2eef6150535 Mon Sep 17 00:00:00 2001
From: Dongryeol Lee <drselee@gmail.com>
Date: Tue, 12 Feb 2008 22:50:52 +0000
Subject: [PATCH] Confirmed the correctness of the pruning

---
 fastlib2/contrib/dongryel/regression/dense_lpr.h     | 12 ++++++------
 .../contrib/dongryel/regression/dense_lpr_main.cc    |  8 ++++----
 fastlib2/contrib/dongryel/regression/matrix_util.h   |  5 -----
 fastlib2/contrib/dongryel/regression/naive_lpr.h     | 10 +++++-----
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/fastlib2/contrib/dongryel/regression/dense_lpr.h b/fastlib2/contrib/dongryel/regression/dense_lpr.h
index 76f532556a..5c034c3961 100644
--- a/fastlib2/contrib/dongryel/regression/dense_lpr.h
+++ b/fastlib2/contrib/dongryel/regression/dense_lpr.h
@@ -499,12 +499,12 @@ class DenseLpr {
   
     /** @brief Get the intermediate computation results.
      */
-    void get_intermediate_results(Matrix *numerator,
-				  ArrayList<Matrix> *denominator,
-				  ArrayList<int> *old_from_new_queries) {
-      numerator = &numerator_e_;
-      denominator = &denominator_e_;
-      old_from_new_queries = &old_from_new_queries_;
+    void get_intermediate_results(Matrix **numerator,
+				  ArrayList<Matrix> **denominator,
+				  ArrayList<int> **old_from_new_queries) {
+      *numerator = &numerator_e_;
+      *denominator = &denominator_e_;
+      *old_from_new_queries = &old_from_new_queries_;
     }
 
     /** @brief Get the regression estimates.
diff --git a/fastlib2/contrib/dongryel/regression/dense_lpr_main.cc b/fastlib2/contrib/dongryel/regression/dense_lpr_main.cc
index 2edd3deadc..9bfb560307 100644
--- a/fastlib2/contrib/dongryel/regression/dense_lpr_main.cc
+++ b/fastlib2/contrib/dongryel/regression/dense_lpr_main.cc
@@ -58,8 +58,8 @@ int main(int argc, char *argv[]) {
   fast_lpr.Compute();
   fast_lpr.PrintDebug();
   fast_lpr.get_regression_estimates(&fast_lpr_results);
-  fast_lpr.get_intermediate_results(fast_numerator, fast_denominator,
-				    old_from_new_queries);
+  fast_lpr.get_intermediate_results(&fast_numerator, &fast_denominator,
+				    &old_from_new_queries);
 
   // Do naive algorithm.
   ArrayList<Vector> *naive_numerator = NULL;
@@ -71,7 +71,7 @@ int main(int argc, char *argv[]) {
   naive_lpr.Compute();
   naive_lpr.PrintDebug();
   naive_lpr.get_regression_estimates(&naive_lpr_results);
-  naive_lpr.get_intermediate_results(naive_numerator, naive_denominator);
+  naive_lpr.get_intermediate_results(&naive_numerator, &naive_denominator);
   printf("Maximum relative error: %g\n", 
 	 MatrixUtil::MaxRelativeDifference(naive_lpr_results, 
 					   fast_lpr_results));
@@ -79,7 +79,7 @@ int main(int argc, char *argv[]) {
   double max_relative_error = 0;
   for(index_t q = 0; q < queries.n_cols(); q++) {
     Vector q_fast_numerator;
-    fast_numerator->MakeColumnVector(q, &q_fast_numerator);
+    (*fast_numerator).MakeColumnVector(q, &q_fast_numerator);
 
     max_relative_error = 
       std::max(max_relative_error,
diff --git a/fastlib2/contrib/dongryel/regression/matrix_util.h b/fastlib2/contrib/dongryel/regression/matrix_util.h
index fca491a838..149af335de 100644
--- a/fastlib2/contrib/dongryel/regression/matrix_util.h
+++ b/fastlib2/contrib/dongryel/regression/matrix_util.h
@@ -139,11 +139,6 @@ class MatrixUtil {
 	  std::max(max_relative_error, 
 		   fabs(approx_results[d] - true_results[d]) /
 		   fabs(true_results[d]));
-
-	printf("%g against %g gives %g\n",
-	       approx_results[d], true_results[d],
-	       fabs(approx_results[d] - true_results[d]) /
-	       fabs(true_results[d]));
       }
 
       return max_relative_error;
diff --git a/fastlib2/contrib/dongryel/regression/naive_lpr.h b/fastlib2/contrib/dongryel/regression/naive_lpr.h
index 9e5b843edf..cea4d1941e 100644
--- a/fastlib2/contrib/dongryel/regression/naive_lpr.h
+++ b/fastlib2/contrib/dongryel/regression/naive_lpr.h
@@ -63,11 +63,11 @@ class NaiveLpr {
  public:
 
   ////////// Getter/Setter //////////
-  void get_intermediate_results(ArrayList<Vector> *numerator,
-				ArrayList<Matrix> *denominator) {
-
-    numerator = &numerator_;
-    denominator = &denominator_;
+  void get_intermediate_results(ArrayList<Vector> **numerator,
+				ArrayList<Matrix> **denominator) {
+    
+    *numerator = &numerator_;
+    *denominator = &denominator_;
   }
 
   ////////// Constructor/Destructor //////////