From b2d69bab41c8164fe0fdf738176d9c61b7e4a4cc Mon Sep 17 00:00:00 2001
From: Dongryeol Lee <drselee@gmail.com>
Date: Mon, 29 Nov 2010 20:48:55 +0000
Subject: [PATCH] Compiles, but still on progress.

---
 .../core/table/distributed_table.h            | 38 ++++++++-----------
 .../core/table/offset_dense_matrix.h          | 16 ++++----
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/core/table/distributed_table.h b/fastlib/trunk/contrib/dongryel/thesis_research/core/table/distributed_table.h
index c43eab7ad6..5676045bb8 100644
--- a/fastlib/trunk/contrib/dongryel/thesis_research/core/table/distributed_table.h
+++ b/fastlib/trunk/contrib/dongryel/thesis_research/core/table/distributed_table.h
@@ -95,34 +95,28 @@ class DistributedTable: public boost::noncopyable {
           table_outbox_group_comm.size() -
           table_outbox_group_comm.rank() - 1, neighbor_radius));
       for(unsigned int i = 1; i <= left_contributions.size(); i++) {
-
-        // Send and receive.
-        left_send_requests_[i - 1] =
-          comm.isend(comm.rank() - i, i, local_centroid_);
-        left_receive_requests_[i - 1] =
-          comm.irecv(
-            comm.rank() - i, neighbor_radius + i, left_centroids_[i - 1]);
+        left_contributions[i - 1].Init(
+          owned_table_->data(), point_assignments,
+          table_outbox_group_comm.rank() - i);
+        left_send_requests[i - 1] =
+          table_outbox_group_comm.isend(
+            table_outbox_group_comm.rank() - i, i, left_contributions[i - 1]);
       }
-      std::vector< core::table::OffsetDenseMatrix > right_contributions;
-      for(unsigned int i = 1; i <= right_centroids_.size(); i++) {
-
-        // Send and receive.
-        right_send_requests_[i - 1] =
-          comm.isend(
-            comm.rank() + i, neighbor_radius + i, local_centroid_);
-        right_receive_requests_[i - 1] =
-          comm.irecv(comm.rank() + i, i, right_centroids_[i - 1]);
+      for(unsigned int i = 1; i <= right_contributions.size(); i++) {
+        right_contributions[i - 1].Init(
+          owned_table_->data(), point_assignments,
+          table_outbox_group_comm.rank() + i);
+        right_send_requests[i - 1] =
+          table_outbox_group_comm.isend(
+            table_outbox_group_comm.rank() + i, neighbor_radius + i,
+            right_contributions[i - 1]);
       }
 
       // Wait for all send/receive requests to be completed.
       boost::mpi::wait_all(
-        left_send_requests_.begin(), left_send_requests_.end());
+        left_send_requests.begin(), left_send_requests.end());
       boost::mpi::wait_all(
-        left_receive_requests_.begin(), left_receive_requests_.end());
-      boost::mpi::wait_all(
-        right_send_requests_.begin(), right_send_requests_.end());
-      boost::mpi::wait_all(
-        right_receive_requests_.begin(), right_receive_requests_.end());
+        right_send_requests.begin(), right_send_requests.end());
     }
 
     int TakeLeafNodeOwnerShip_(
diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/core/table/offset_dense_matrix.h b/fastlib/trunk/contrib/dongryel/thesis_research/core/table/offset_dense_matrix.h
index d6eb73fdcb..a35a5e971b 100644
--- a/fastlib/trunk/contrib/dongryel/thesis_research/core/table/offset_dense_matrix.h
+++ b/fastlib/trunk/contrib/dongryel/thesis_research/core/table/offset_dense_matrix.h
@@ -44,17 +44,15 @@ class OffsetDenseMatrix {
       n_attributes_ = n_attributes_in;
     }
 
-    void set_filter_index(int filter_index_in) {
-      filter_index_ = filter_index_in;
-    }
-
     void Init(
       core::table::DenseMatrix &mat_in,
-      std::vector<int> &assignment_indices_in) {
+      std::vector<int> &assignment_indices_in,
+      int filter_index_in) {
       ptr_ = mat_in.ptr();
-      n_attributes_ = mat_in.n_attributes();
-      n_entries_ = mat_in.n_entries();
+      n_attributes_ = mat_in.n_rows();
+      n_entries_ = mat_in.n_cols();
       assignment_indices_ = &assignment_indices_in;
+      filter_index_ = filter_index_in;
     }
 
     template<class Archive>
@@ -62,7 +60,7 @@ class OffsetDenseMatrix {
 
       // First, save the number of doubles to be serialized.
       int num_doubles = 0;
-      for(int i = 0; i < assignment_indices_->size(); i++) {
+      for(unsigned int i = 0; i < assignment_indices_->size(); i++) {
         if((*assignment_indices_)[i] == filter_index_) {
           num_doubles++;
         }
@@ -72,7 +70,7 @@ class OffsetDenseMatrix {
 
       // Loop through and find out the columns to serialize.
       double *ptr_iter = ptr_;
-      for(int i = 0; i < assignment_indices_->size();
+      for(unsigned int i = 0; i < assignment_indices_->size();
           i++, ptr_iter += n_attributes_) {
         if((*assignment_indices_)[i] == filter_index_) {
           for(int j = 0; j < n_attributes_; j++) {