Remove redundant code in RGG test cases, add test case for RHG graphs

KarlsruheGraphGeneration · Nov 28, 2023 · b9f2463 · b9f2463
1 parent 688dad2
commit b9f2463
Show file tree

Hide file tree

Showing 11 changed files with 373 additions and 459 deletions.
diff --git a/kagen/generators/hyperbolic/hyperbolic.cpp b/kagen/generators/hyperbolic/hyperbolic.cpp
@@ -358,11 +358,11 @@ void Hyperbolic<Double>::GenerateVertices(const SInt annulus_id, SInt chunk_id,
         cell_vertices.emplace_back(angle, radius, x, y, gamma, offset + i);
         // if (rank_ == 2)
         //   printf("p %lld %f %f %d\n", offset + i, radius, angle, rank_);
-        if (pe_min_phi_ <= angle && pe_max_phi_ > angle)
+        if (pe_min_phi_ <= angle && pe_max_phi_ > angle) {
             num_nodes_++;
-
-        if (config_.coordinates) { // @todo only generate coordinates for local vertices
-            PushCoordinate(x, y);
+            if (config_.coordinates) {
+                PushCoordinate(x, y);
+            }
         }
     }
     std::get<3>(cell) = true;

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -43,14 +43,15 @@ kagen_add_test(test_generic_file_generator
     CORES 1 2 3 4 8 16)
 
 # Geometric Generator
-kagen_add_test(test_geometric_one_PE
-        FILES geometric/geometric_one_PE_test.cpp
-        CORES 1)
-
-kagen_add_test(geometric_2d_test
-        FILES geometric/geometric_2d_test.cpp
+kagen_add_test(test_rgg2d
+        FILES geometric/rgg2d_test.cpp
         CORES 1 2 3 4 5 6)
 
-kagen_add_test(geometric_3d_test
-        FILES geometric/geometric_3d_test.cpp
+kagen_add_test(test_rgg3d
+        FILES geometric/rgg3d_test.cpp
         CORES 1 2 3 4 5 6)
+
+kagen_add_test(test_hyperbolic
+        FILES geometric/hyperbolic_test.cpp
+        CORES 1 2 3 4 5 6)
+
diff --git a/tests/geometric/geometric_2d_test.cpp b/tests/geometric/geometric_2d_test.cpp
diff --git a/tests/geometric/geometric_3d_test.cpp b/tests/geometric/geometric_3d_test.cpp
diff --git a/tests/geometric/geometric_one_PE_test.cpp b/tests/geometric/geometric_one_PE_test.cpp