Update tests for eye matrix

HPAC · Aug 20, 2017 · db9a008 · db9a008
1 parent 415b917
commit db9a008
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/include/generator/properties/eye.hpp b/include/generator/properties/eye.hpp
@@ -60,7 +60,7 @@ namespace generator { namespace property {
         static void fill(const intermediate::self_adjoint<T> & shape,
                         RndGen &&, Properties &&...)
         {
-            fill(shape.data, shape.rows, shape.rows);
+            fill(shape.data, shape.size.rows, shape.size.rows);
         }
 
         template<typename RndGen, typename... Properties>

diff --git a/tests/generator/eye.cpp b/tests/generator/eye.cpp
@@ -81,11 +81,11 @@ TYPED_TEST(eye_test, general_##name)                      \
     for(auto & sizes : test_settings<>::sizes_obj)      \
     {                                                   \
         uint32_t rows = std::get<0>(sizes), cols = std::get<1>(sizes);  \
-        auto mat = this->gen.generate(generator::shape::general(42, rows), generator::property::random());  \
-        auto eye = this->gen.generate(generator::shape::general(rows, cols), generator::property::eye());   \
+        auto mat = this->gen.generate({42, rows}, generator::property::random());  \
+        auto eye = this->gen.generate({rows, cols}, generator::property::eye());   \
         verify_left(mat, eye);  \
-        eye = this->gen.generate(generator::shape::general(rows, cols), generator::property::eye());    \
-        mat = this->gen.generate(generator::shape::general(cols, 42), generator::property::random());   \
+        eye = this->gen.generate({rows, cols}, generator::property::eye());    \
+        mat = this->gen.generate({cols, 42}, generator::property::random());   \
         verify_right(mat, eye); \
     }   \
 }
@@ -95,24 +95,28 @@ TYPED_TEST(eye_test, shape_type##_##name)                               \
 {                                                                   \
     for(auto size : test_settings<>::sizes_obj)                     \
     {                                                               \
-        auto mat = this->gen.generate(generator::shape::general(42, size), generator::property::random());  \
-        auto eye = this->gen.generate(generator::shape::shape_type(size), generator::property::eye());  \
+        auto mat = this->gen.generate({42, size}, generator::property::random());  \
+        auto eye = this->gen.generate({size, size}, generator::shape::shape_type{}, generator::property::eye());  \
         verify_left(mat, eye);  \
-        eye = this->gen.generate(generator::shape::shape_type(size), generator::property::eye());   \
-        mat = this->gen.generate(generator::shape::general(size, 42), generator::property::random());   \
+        eye = this->gen.generate({size, size}, generator::shape::shape_type{}, generator::property::eye());   \
+        mat = this->gen.generate({size, 42}, generator::property::random());   \
         verify_right(mat, eye); \
     }   \
 }
 
 
-
-
 GENERATE_GENERAL_MATRIX_TEST(small, small_sizes)
 GENERATE_GENERAL_MATRIX_TEST(medium, medium_sizes)
 
 GENERATE_HERMITIAN_MATRIX_TEST(small, self_adjoint, small_sq_sizes)
 GENERATE_HERMITIAN_MATRIX_TEST(medium, self_adjoint, medium_sq_sizes)
 
+GENERATE_HERMITIAN_MATRIX_TEST(small, upper_triangular, small_sq_sizes)
+GENERATE_HERMITIAN_MATRIX_TEST(medium, upper_triangular, medium_sq_sizes)
+
+GENERATE_HERMITIAN_MATRIX_TEST(small, lower_triangular, small_sq_sizes)
+GENERATE_HERMITIAN_MATRIX_TEST(medium, lower_triangular, medium_sq_sizes)
+
 GENERATE_HERMITIAN_MATRIX_TEST(small, diagonal, small_sq_sizes)
 GENERATE_HERMITIAN_MATRIX_TEST(medium, diagonal, medium_sq_sizes)