Adjusted to new CST interface.

hmusta · Mar 11, 2013 · 99e587b · 99e587b
1 parent 6905215
commit 99e587b
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/examples/64bit_array2int_vector.cpp b/examples/64bit_array2int_vector.cpp
@@ -13,7 +13,7 @@ using namespace sdsl;
 using namespace std;
 
 int main(int argc, char *argv[]){
-	size_t x = util::get_file_size(argv[1]);
+	size_t x = util::file_size(argv[1]);
 	const int BPI=8;
 	cout<<"file size in bytes = "<<x<<endl;
 	if ( x % BPI != 0 ){

diff --git a/examples/bit_vector.cpp b/examples/bit_vector.cpp
@@ -1,5 +1,5 @@
 #include <sdsl/int_vector.hpp>
-#include <sdsl/suffixtrees.hpp>
+#include <sdsl/suffix_trees.hpp>
 #include <iostream>
 
 using namespace std;

diff --git a/examples/cst_bfs_iterator.cpp b/examples/cst_bfs_iterator.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <string>
 #include <sdsl/util.hpp>
-#include <sdsl/suffixtrees.hpp>
+#include <sdsl/suffix_trees.hpp>
 
 using namespace std;
 using namespace sdsl;

diff --git a/examples/hugepages.cpp b/examples/hugepages.cpp
@@ -1,5 +1,5 @@
 #include <sdsl/int_vector.hpp>
-#include <sdsl/suffixtrees.hpp>
+#include <sdsl/suffix_trees.hpp>
 #include <sdsl/wt_rlmn.hpp>
 #include <sdsl/testutils.hpp>
 #include <sdsl/bit_vector_interleaved.hpp>

diff --git a/examples/louds_tree.cpp b/examples/louds_tree.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <string>
 #include <sdsl/util.hpp>
-#include <sdsl/suffixtrees.hpp>
+#include <sdsl/suffix_trees.hpp>
 #include <sdsl/louds_tree.hpp>
 
 using namespace std;

diff --git a/examples/text_statistics.cpp b/examples/text_statistics.cpp
@@ -1,4 +1,4 @@
-#include <sdsl/suffixtrees.hpp>
+#include <sdsl/suffix_trees.hpp>
 #include <iostream>
 
 using namespace std;

diff --git a/include/sdsl/csa_wt.hpp b/include/sdsl/csa_wt.hpp
@@ -26,6 +26,7 @@
 #endif
 
 #include "wt_huff.hpp"
+#include "suffix_array_helper.hpp"
 #include "algorithms.hpp"
 #include "iterators.hpp"
 #include "util.hpp"

diff --git a/include/sdsl/louds_tree.hpp b/include/sdsl/louds_tree.hpp
@@ -73,7 +73,7 @@ class louds_tree
         //! Constructor for a cst and a root node for the traversal
         template<class Cst, class CstBfsIterator>
         louds_tree(const Cst& cst, const CstBfsIterator begin, const CstBfsIterator end):m_bv(), m_bv_select1(), m_bv_select0(), bv(m_bv) {
-            bit_vector tmp_bv(4*cst.leaves_in_the_subtree(*begin) , 0); // resize the bit_vector to the maximal
+            bit_vector tmp_bv(4*cst.size(*begin) , 0); // resize the bit_vector to the maximal
             // possible size 2*2*#leaves in the tree
             size_type pos = 0;
             for (CstBfsIterator it = begin; it != end;) {

diff --git a/test/CstByteTest.cpp b/test/CstByteTest.cpp
@@ -130,7 +130,7 @@ TYPED_TEST(CstByteTest, BasicMethods) {
         typedef typename TypeParam::node_type node_type;
         node_type r = cst.root(); // get root node
         // Size of the subtree rooted at r should the size of the suffix array
-        ASSERT_EQ(cst.csa.size(), cst.leaves_in_the_subtree(r));
+        ASSERT_EQ(cst.csa.size(), cst.size(r));
         // Check leaf methods
         for (size_type i=0; i < cst.csa.size(); ++i) {
             ASSERT_EQ(true, cst.is_leaf(cst.select_leaf(i+1)));

diff --git a/test/CstIntTest.cpp b/test/CstIntTest.cpp
@@ -166,7 +166,7 @@ TYPED_TEST(CstIntTest, BasicMethods) {
         typedef typename TypeParam::node_type node_type;
         node_type r = cst.root(); // get root node
         // Size of the subtree rooted at r should the size of the suffix array
-        ASSERT_EQ(cst.csa.size(), cst.leaves_in_the_subtree(r));
+        ASSERT_EQ(cst.csa.size(), cst.size(r));
         // Check leaf methods
         for (size_type i=0; i < cst.csa.size(); ++i) {
             ASSERT_EQ(true, cst.is_leaf(cst.select_leaf(i+1)));