From ed347ab0d90718256e2137de8537d5702958aef3 Mon Sep 17 00:00:00 2001
From: Alejandro Gallo <aamsgallo@gmail.com>
Date: Sat, 8 Oct 2022 16:04:03 +0200
Subject: [PATCH] Rename NAIVE_SLOW into ATRIP_NAIVE_SLOW

---
 src/atrip/DatabaseCommunicator.cxx | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/atrip/DatabaseCommunicator.cxx b/src/atrip/DatabaseCommunicator.cxx
index 0af51a1..b98fb64 100644
--- a/src/atrip/DatabaseCommunicator.cxx
+++ b/src/atrip/DatabaseCommunicator.cxx
@@ -4,8 +4,10 @@
 
 namespace atrip {
 
-  /*   This function is really too slow, below are more performant
-   functions to get tuples.
+#if defined(ATRIP_NAIVE_SLOW)
+  /*
+   * This function is really too slow, below are more performant
+   * functions to get tuples.
    */
   static
   ABCTuples get_nth_naive_tuples(size_t Nv, size_t np, int64_t i) {
@@ -248,38 +250,25 @@ namespace atrip {
     using Database = typename Slice<F>::Database;
     Database db;
 
-#ifdef NAIVE_SLOW
+#ifdef ATRIP_NAIVE_SLOW
     WITH_CHRONO("db:comm:naive:tuples",
                 const auto tuples = get_nth_naive_tuples(nv,
                                                          np,
                                                          iteration);
                 const auto prev_tuples = get_nth_naive_tuples(nv,
                                                               np,
-                                                              (int64_t)iteration - 1);
+                                                              iteration - 1);
                 )
 #else
     WITH_CHRONO("db:comm:naive:tuples",
-                const auto tuples = nth_atrip_distributed((int64_t)iteration,
+                const auto tuples = nth_atrip_distributed(iteration,
                                                           nv,
                                                           np);
-                const auto prev_tuples = nth_atrip_distributed((int64_t)iteration - 1,
+                const auto prev_tuples = nth_atrip_distributed(iteration - 1,
                                                                nv,
                                                                np);
                 )
 
-      if (false)
-      for (size_t rank = 0; rank < np; rank++) {
-        std::cout << Atrip::rank << ":"
-                  << " :tuples< " << rank << ">" << iteration
-                  << " :abc " << tuples[rank][0]
-                  << ", " << tuples[rank][1]
-                  << ", " << tuples[rank][2] << "\n";
-        std::cout << Atrip::rank << ":"
-                  << " :prev-tuples< " << rank << ">" << iteration
-                  << " :abc-prev " << prev_tuples[rank][0]
-                  << ", " << prev_tuples[rank][1]
-                  << ", " << prev_tuples[rank][2] << "\n";
-      }
 #endif
 
     for (size_t rank = 0; rank < np; rank++) {