remove pht changes, turn off query print

Author: etwest

CMakeLists.txt

@@ -48,7 +48,7 @@ FetchContent_Declare(
   GutterTree
 
   GIT_REPOSITORY  https://github.com/GraphStreamingProject/GutterTree.git
-  GIT_TAG         better_pht
+  GIT_TAG         main
 )
 
 # Get StreamingUtilities

include/graph_sketch_driver.h

@@ -152,29 +152,28 @@ class GraphSketchDriver {
 #endif
 
       while (true) {
-        bool got_breakpoint = false;
         size_t updates = stream->get_update_buffer(update_array, update_array_size);
-
-        if (update_array[updates - 1].type == BREAKPOINT) {
-          --updates;
-          got_breakpoint = true;
-        }
-        gts->process_stream_upd_batch(update_array, updates, thr_id);
-
         for (size_t i = 0; i < updates; i++) {
-          GraphUpdate upd = {update_array[i].edge, (UpdateType) update_array[i].type};
-          sketching_alg->pre_insert(upd, thr_id);
+          GraphUpdate upd;
+          upd.edge = update_array[i].edge;
+          upd.type = static_cast<UpdateType>(update_array[i].type);
+          if (upd.type == BREAKPOINT) {
+            // reached the breakpoint. Update verifier if applicable and return
 #ifdef VERIFY_SAMPLES_F
-          local_verifier.edge_update(upd.edge);
+            std::lock_guard<std::mutex> lk(verifier_mtx);
+            verifier->combine(local_verifier);
 #endif
-        }
-
-        if (got_breakpoint) {
+            return;
+          }
+          else {
+            sketching_alg->pre_insert(upd, thr_id);
+            Edge edge = upd.edge;
+            gts->insert({edge.src, edge.dst}, thr_id);
+            gts->insert({edge.dst, edge.src}, thr_id);
 #ifdef VERIFY_SAMPLES_F
-          std::lock_guard<std::mutex> lk(verifier_mtx);
-          verifier->combine(local_verifier);
+            local_verifier.edge_update(edge);
 #endif
-          return;
+          }
         }
       }
     };
@@ -227,4 +226,4 @@ class GraphSketchDriver {
   // time hooks for experiments
   std::chrono::steady_clock::time_point flush_start;
   std::chrono::steady_clock::time_point flush_end;
-};
+};

src/cc_sketch_alg.cpp

@@ -486,27 +486,27 @@ void CCSketchAlg::boruvka_emulation() {
   }
   size_t round_num = 0;
   bool modified = true;
-  std::cout << std::endl;
-  std::cout << "  pre boruvka processing = "
-              << std::chrono::duration<double>(std::chrono::steady_clock::now() - start).count()
-              << std::endl;
+  // std::cout << std::endl;
+  // std::cout << "  pre boruvka processing = "
+  //             << std::chrono::duration<double>(std::chrono::steady_clock::now() - start).count()
+  //             << std::endl;
 
   while (true) {
-    std::cout << "   Round: " << round_num << std::endl;
+    // std::cout << "   Round: " << round_num << std::endl;
     start = std::chrono::steady_clock::now();
     modified = perform_boruvka_round(round_num, merge_instr, global_merges);
-    std::cout << "     perform_boruvka_round = "
-              << std::chrono::duration<double>(std::chrono::steady_clock::now() - start).count()
-              << std::endl;
+    // std::cout << "     perform_boruvka_round = "
+    //           << std::chrono::duration<double>(std::chrono::steady_clock::now() - start).count()
+    //           << std::endl;
 
     if (!modified) break;
 
     // calculate updated merge instructions for next round
     start = std::chrono::steady_clock::now();
     create_merge_instructions(merge_instr);
-    std::cout << "     create_merge_instructions = "
-              << std::chrono::duration<double>(std::chrono::steady_clock::now() - start).count()
-              << std::endl;
+    // std::cout << "     create_merge_instructions = "
+    //           << std::chrono::duration<double>(std::chrono::steady_clock::now() - start).count()
+    //           << std::endl;
     ++round_num;
   }
   last_query_rounds = round_num;