Module: ppl/ppl Branch: MPI Commit: c51907509e1e93f5d7972bb1414092a50cb3ff7e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c51907509e1e9...

Author: Marco Poletti poletti.marco@gmail.com Date: Sat Sep 18 12:21:33 2010 +0200

Revert "Distributed_Sparse_Matrix: print the number of pivot operations in the destructor."

This reverts commit 845523ef94033ab908ea709b87c6bc511235f1af.

---

src/Distributed_Sparse_Matrix.cc | 2 -- src/Distributed_Sparse_Matrix.defs.hh | 2 -- src/Distributed_Sparse_Matrix.inlines.hh | 5 ----- 3 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/src/Distributed_Sparse_Matrix.cc b/src/Distributed_Sparse_Matrix.cc index 2e6e99a..b3f0b7e 100644 --- a/src/Distributed_Sparse_Matrix.cc +++ b/src/Distributed_Sparse_Matrix.cc @@ -1873,8 +1873,6 @@ PPL::Distributed_Sparse_Matrix dimension_type& exiting_var_index, Sparse_Row& working_cost) {

- ++pivot_count; - broadcast_operation(GET_EXITING_AND_PIVOT, id, entering_index);

// 1. exiting_index(entering_index): diff --git a/src/Distributed_Sparse_Matrix.defs.hh b/src/Distributed_Sparse_Matrix.defs.hh index 59907bb..7396ee3 100644 --- a/src/Distributed_Sparse_Matrix.defs.hh +++ b/src/Distributed_Sparse_Matrix.defs.hh @@ -470,8 +470,6 @@ private: If base[i] is not 0, it is the column associated with that row. */ std::vector<dimension_type> base; - - dimension_type pivot_count; };

namespace std { diff --git a/src/Distributed_Sparse_Matrix.inlines.hh b/src/Distributed_Sparse_Matrix.inlines.hh index 12c5a23..95301a8 100644 --- a/src/Distributed_Sparse_Matrix.inlines.hh +++ b/src/Distributed_Sparse_Matrix.inlines.hh @@ -55,7 +55,6 @@ Distributed_Sparse_Matrix::Distributed_Sparse_Matrix() reverse_mapping(comm_size), next_rank(0), local_rows(0), base(0) { PPL_ASSERT(comm().rank() == 0); PPL_ASSERT(OK()); - pivot_count = 0; }

inline @@ -65,7 +64,6 @@ Distributed_Sparse_Matrix PPL_ASSERT(comm().rank() == 0);

init(num_rows1, num_cols1); - pivot_count = 0; }

inline @@ -82,8 +80,6 @@ Distributed_Sparse_Matrix

broadcast_operation(COPY_MATRIX_OPERATION, matrix.id, id);

- pivot_count = 0; - PPL_ASSERT(OK()); }

@@ -111,7 +107,6 @@ Distributed_Sparse_Matrix::~Distributed_Sparse_Matrix() { broadcast_operation(DELETE_MATRIX_OPERATION, id);

// The rows stored at the root will be destroyed automatically. - std::cout << pivot_count << std::endl; }

inline dimension_type