introduced member versions of TiledRange1::make_uniform

ValeevGroup · Sep 16, 2024 · 057df5a · 057df5a
1 parent 4d4c06b
commit 057df5a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/TiledArray/tiled_range1.h b/src/TiledArray/tiled_range1.h
@@ -318,6 +318,21 @@ class TiledRange1 {
     return make_uniform(Range1(0, range_extent), target_tile_size);
   }
 
+  /// same as make_uniform(const Range1&, std::size_t), using the element_range
+  /// of this TiledRange1
+  TiledRange1 make_uniform(std::size_t target_tile_size) const {
+    return make_uniform(this->elements_range(), target_tile_size);
+  }
+
+  /// make as uniformly-tiled range as possible out of this TiledRange1, with
+  /// the same number of tiles as this
+  TiledRange1 make_uniform() const {
+    return make_uniform(
+        this->elements_range(),
+        (this->elements_range().extent() + this->tile_extent() - 1) /
+            this->tile_extent());
+  }
+
   /// shifts this TiledRange1
 
   /// @param[in] shift the shift to apply

diff --git a/tests/tiled_range1.cpp b/tests/tiled_range1.cpp
@@ -380,6 +380,14 @@ BOOST_AUTO_TEST_CASE(make_uniform) {
   BOOST_REQUIRE_NO_THROW(TiledRange1::make_uniform(59, 10));
   BOOST_CHECK(TiledRange1::make_uniform(59, 10) ==
               (TiledRange1{0, 10, 20, 30, 40, 50, 59}));
+
+  // member versions
+  BOOST_REQUIRE_NO_THROW((TiledRange1{0, 10, 20, 30, 40, 50}.make_uniform(30)));
+  BOOST_CHECK((TiledRange1{0, 10, 20, 30, 40, 50}.make_uniform(30) ==
+               TiledRange1{0, 25, 50}));
+  BOOST_REQUIRE_NO_THROW((TiledRange1{0, 40, 50}.make_uniform()));
+  BOOST_CHECK(
+      (TiledRange1{0, 40, 50}.make_uniform() == TiledRange1{0, 25, 50}));
 }
 
 BOOST_AUTO_TEST_CASE(shift) {