Merged in column_refactoring (pull request #4)

Column types are separated, and the matrix representation is more general in its container type

1 files changed, 9 insertions, 2 deletions

diff --git a/include/phat/representations/bit_tree_pivot_column.h b/include/phat/representations/bit_tree_pivot_column.h
index 4d48e88..4779d70 100644
--- a/include/phat/representations/bit_tree_pivot_column.h
+++ b/include/phat/representations/bit_tree_pivot_column.h
@@ -19,7 +19,6 @@
 #pragma once

 

 #include <phat/helpers/misc.h>

-#include <phat/representations/abstract_pivot_column.h>

 

 namespace phat {

 

@@ -133,6 +132,15 @@ namespace phat {
             std::reverse( out.begin(), out.end() );

         }

 

+	

+	template<typename InputIterator>

+	  void add_col(InputIterator begin, InputIterator end) {

+	  for(InputIterator it=begin;it!=end;it++) {

+	    add_index(*it);

+	  }

+	}

+	

+

         void add_col(const column &col) {

             for( size_t i = 0; i < col.size(); ++i )

                 add_index(col[i]);

@@ -161,5 +169,4 @@ namespace phat {
         }

     };

 

-    typedef abstract_pivot_column<bit_tree_column> bit_tree_pivot_column;

 }