removing tools/debug.hpp

src/parallel/bingmann-parallel_mkqs.hpp

@@ -28,7 +28,6 @@
 #include <iostream>
 #include <vector>
 
-#include "../tools/debug.hpp"
 #include "../tools/contest.hpp"
 #include "../tools/stringtools.hpp"
 #include "../tools/jobqueue.hpp"

src/parallel/bingmann-parallel_sample_sort.hpp

@@ -32,8 +32,6 @@
 #include <vector>
 #include <algorithm>
 
-#include "../tools/debug.hpp"
-
 #include "../tools/lcgrandom.hpp"
 #include "../tools/contest.hpp"
 #include "../tools/stringtools.hpp"

src/parallel/eberle-parallel-lcp-merge-binary-splitting.hpp

@@ -25,8 +25,6 @@
 
 #include "eberle-parallel-lcp-merge.hpp"
 
-#include "../tools/debug.hpp"
-
 namespace eberle_parallel_lcp_merge {
 
 // debugging constants

src/parallel/eberle-parallel-lcp-merge-standard-splitting.hpp

@@ -26,7 +26,6 @@
 #include "eberle-parallel-lcp-merge.hpp"
 
 #include "../sequential/bs-mkqs.hpp"
-#include "../tools/debug.hpp"
 
 namespace eberle_parallel_lcp_merge {
 

src/parallel/eberle-parallel-lcp-merge.hpp

@@ -33,8 +33,6 @@
 #include "../tools/jobqueue.hpp"
 #include "../tools/stringtools.hpp"
 
-#include "../tools/debug.hpp"
-
 #include <tlx/logger.hpp>
 
 namespace eberle_parallel_lcp_merge {

src/psstest.cpp

@@ -122,7 +122,6 @@ std::vector<size_t> g_numa_string_count;      // pointer to strings on NUMA node
 
 // *** Tools and Algorithms
 
-#include "tools/debug.hpp"
 #include "tools/membuffer.hpp"
 #include "tools/lcgrandom.hpp"
 #include "tools/contest.hpp"

src/sequential/bingmann-lcp_inssort.hpp

@@ -295,7 +295,7 @@ void lcp_insertion_sort_pseudocode(
             lcp[i + 1] = h;
     }
 
-    std::cout << "lcp_inssort comparisons = " << cmp << "\n";
+    LOG1 << "lcp_inssort comparisons = " << cmp;
 }
 
 //! LCP insertion sort, but immediately discard the lcp

src/sequential/bingmann-stdsort.cpp

@@ -24,7 +24,6 @@
 #include <cstdlib>
 #include <algorithm>
 
-#include "../tools/debug.hpp"
 #include "../tools/contest.hpp"
 #include "../tools/stringtools.hpp"
 

src/tools/stringptr.hpp

@@ -39,7 +39,6 @@
 
 #include <cassert>
 #include <stdint.h>
-#include "debug.hpp"
 #include <numa.h>
 #include "stringset.hpp"
 
@@ -965,16 +964,15 @@ verify_lcp_cache(
     {
         if (lcps[0] != expectedFirstLcp)
         {
-            std::cout << "lcp[0] = " << lcps[0]
-                      << " excepted " << expectedFirstLcp << std::endl;
+            LOG1 << "lcp[0] = " << lcps[0]
+                 << " excepted " << expectedFirstLcp;
             allValid = false;
         }
         if (checkCache && expectedFirstLcp != 42 &&
             *cache != ss.get_char(ss[begin], lcps[0]))
         {
-            std::cout << "cache[0] = " << cache[0]
-                      << " excepted " << ss.get_char(ss[begin], lcps[0])
-                      << std::endl;
+            LOG1 << "cache[0] = " << cache[0]
+                 << " excepted " << ss.get_char(ss[begin], lcps[0]);
             allValid = false;
         }
     }
@@ -988,20 +986,20 @@ verify_lcp_cache(
 
         if (h != lcps[i])
         {
-            std::cout << "lcp[" << i << "] = " << lcps[i]
-                      << " excepted " << h << std::endl;
+            LOG1 << "lcp[" << i << "] = " << lcps[i]
+                 << " excepted " << h;
             allValid = false;
         }
         if (checkCache && cache[i] != ss.get_char(s2, lcps[i]))
         {
-            std::cout << "cache[" << i << "] = " << cache[i]
-                      << " excepted " << ss.get_char(s2, lcps[i]) << std::endl;
+            LOG1 << "cache[" << i << "] = " << cache[i]
+                 << " excepted " << ss.get_char(s2, lcps[i]);
             allValid = false;
         }
     }
 
     if (!allValid)
-        std::cout << "Found invalid LCPS and/or cache values!" << std::endl;
+        LOG1 << "Found invalid LCPS and/or cache values!";
 
     return allValid;
 }

src/tools/stringset.hpp

@@ -41,7 +41,7 @@
 #include <vector>
 #include <memory>
 
-#include "debug.hpp"
+#include <tlx/logger.hpp>
 
 namespace parallel_string_sorting {
 
@@ -277,8 +277,8 @@ class StringSetBase
         size_t i = 0;
         for (typename Traits::Iterator pi = ss.begin(); pi != ss.end(); ++pi)
         {
-            std::cout << "[" << i++ << "] = " << ss[pi]
-                      << " = " << ss.get_string(ss[pi], 0) << std::endl;
+            LOG1 << "[" << i++ << "] = " << ss[pi]
+                 << " = " << ss.get_string(ss[pi], 0);
 
             // for printing std::unique_ptr<std::string>
             // std::cout << "[" << i++ << "] = " << ss[pi].get();

src/tools/stringtools.hpp

@@ -25,7 +25,6 @@
 #define PSS_SRC_TOOLS_STRINGTOOLS_HEADER
 
 #include <cassert>
-#include "debug.hpp"
 #include <tlx/logger.hpp>
 
 namespace stringtools {
@@ -400,15 +399,15 @@ struct TreeCalculations
     {
         for (size_t i = 1; i <= numnodes; ++i)
         {
-            std::cout << toBinary(i, treebits) << " -> " << std::endl;
+            LOG1 << toBinary(i, treebits) << " -> ";
 
             size_t id = level_to_preorder(i);
-            std::cout << toBinary(id, treebits) << " -> " << std::endl;
+            LOG1 << toBinary(id, treebits) << " -> ";
 
             id = pre_to_levelorder(id);
-            std::cout << toBinary(id, treebits) << std::endl;
+            LOG1 << toBinary(id, treebits);
 
-            std::cout << std::endl;
+            LOG1 << "";
             assert(id == i);
         }
     }