stuff

GraphStreamingProject · Dec 22, 2024 · 07cd7dd · 07cd7dd
1 parent 106f2de
commit 07cd7dd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/include/bucket_buffer.h b/include/bucket_buffer.h
@@ -103,6 +103,11 @@ class BucketBuffer {
     ~BucketBuffer() {
     }
 
+    BucketBuffer(size_t capacity): _capacity(capacity) {
+        entries = std::vector<BufferEntry>();
+        entries.reserve(_capacity);
+    }
+
     bool over_capacity() const {
         return entries.size() >= _capacity / 2;
     }

diff --git a/include/cc_sketch_alg.h b/include/cc_sketch_alg.h
@@ -166,8 +166,11 @@ class CCSketchAlg {
     num_delta_sketches = num_workers;
     delta_sketches = new Sketch *[num_delta_sketches];
     for (size_t i = 0; i < num_delta_sketches; i++) {
+      // delta_sketches[i] =
+      //     new Sketch(Sketch::calc_vector_length(num_vertices), seed,
+      //                Sketch::calc_cc_samples(num_vertices, config.get_sketches_factor()));
       delta_sketches[i] =
-          new Sketch(Sketch::calc_vector_length(num_vertices), seed,
+          new Sketch(5, seed,
                      Sketch::calc_cc_samples(num_vertices, config.get_sketches_factor()));
     }
   }

diff --git a/include/sketch.h b/include/sketch.h
@@ -90,10 +90,10 @@ class Sketch {
    * @return              The length of the vector to sketch
    */
   static vec_t calc_vector_length(node_id_t num_vertices) {
-    // return ceil(double(num_vertices) * (num_vertices - 1) / 2);
+    return ceil(double(num_vertices) * (num_vertices - 1) / 2);
     // return num_vertices * 4;
     // return 50; // round to something thats approx 2^6
-    return 3;
+    // return 3;
     // return 15;
     // return 1 + num_vertices / 16 ;
   }
@@ -304,8 +304,8 @@ class Sketch {
   inline size_t get_buckets() const { return num_buckets; }
   inline size_t get_num_samples() const { return num_samples; }
 
-  // static size_t calc_bkt_per_col(size_t n) { return ceil(log2(n)) + 4;}
-  static size_t calc_bkt_per_col(size_t n) { return 1;}
+  static size_t calc_bkt_per_col(size_t n) { return ceil(log2(n)) + 4;}
+  // static size_t calc_bkt_per_col(size_t n) { return 1;}
 
 #ifdef L0_SAMPLING
   static constexpr size_t default_cols_per_sample = 7;

diff --git a/src/cc_sketch_alg.cpp b/src/cc_sketch_alg.cpp
@@ -113,6 +113,7 @@ void CCSketchAlg::apply_update_batch(int thr_id, node_id_t src_vertex,
 
   for (const auto &dst : dst_vertices) {
     delta_sketch.update(static_cast<vec_t>(concat_pairing_fn(src_vertex, dst)));
+    // std::cout << delta_sketch.bkt_per_col << std::endl;
 // #ifdef EAGER_BUCKET_CHECK
 //     delta_sketch.unsafe_update(static_cast<vec_t>(concat_pairing_fn(src_vertex, dst)));
 //   }

diff --git a/src/sketch.cpp b/src/sketch.cpp
@@ -281,7 +281,7 @@ void Sketch::zero_contents() {
   }
   reset_sample_state();
   // TODO - dont do this. Or figure out a way to make it configurable
-  reallocate(5);
+  // reallocate(5);
   bucket_buffer.clear();
 }