Check that Primitive doesn't exceed the dimensionality of the lattice

dean0x7d · Jul 12, 2017 · 2ba0276 · 2ba0276
1 parent d1484ac
commit 2ba0276
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/cppcore/src/Model.cpp b/cppcore/src/Model.cpp
@@ -7,6 +7,11 @@ namespace cpb {
 
 void Model::add(Primitive new_primitive) {
     primitive = new_primitive;
+    for (auto i = lattice.ndim(); i < 3; ++i) {
+        if (primitive.size[i] != 1) {
+            throw std::logic_error("Primitive shape has more dimensions than the lattice");
+        }
+    }
     clear_structure();
 }
 

diff --git a/cppcore/tests/test_shape.cpp b/cppcore/tests/test_shape.cpp
@@ -3,6 +3,11 @@
 #include "fixtures.hpp"
 using namespace cpb;
 
+TEST_CASE("Primitive") {
+    REQUIRE_THROWS_WITH(Model(lattice::square(), Primitive(2, 2, 2)),
+                        Catch::Contains("more dimensions than the lattice"));
+}
+
 TEST_CASE("FreeformShape", "[shape]") {
     auto const contains = [](CartesianArrayConstRef p) -> ArrayX<bool> { return p.x() > 0.5f; };
     auto const shape = FreeformShape(contains, {1, 1, 1}, {0.5f, 0.5f, 0.5f});