Fix decrement operators for DiscreteVector

CExA-project · May 18, 2024 · 389553d · 389553d
1 parent c009a9b
commit 389553d
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/include/ddc/discrete_vector.hpp b/include/ddc/discrete_vector.hpp
@@ -381,15 +381,15 @@ class DiscreteVector : public detail::DiscreteVectorConversionOperators<Discrete
     template <std::size_t N = sizeof...(Tags), class = std::enable_if_t<N == 1>>
     KOKKOS_FUNCTION constexpr DiscreteVector& operator--()
     {
-        ++m_values[0];
+        --m_values[0];
         return *this;
     }
 
     template <std::size_t N = sizeof...(Tags), class = std::enable_if_t<N == 1>>
     KOKKOS_FUNCTION constexpr DiscreteVector operator--(int)
     {
         DiscreteVector const tmp = *this;
-        ++m_values[0];
+        --m_values[0];
         return tmp;
     }
 

diff --git a/tests/discrete_vector.cpp b/tests/discrete_vector.cpp
@@ -48,6 +48,42 @@ TEST(DiscreteVectorXYZTest, ConstructorFromDiscreteVectors)
     EXPECT_EQ(ixyz.get<DDimZ>(), dv_z);
 }
 
+TEST(DiscreteVectorXTest, PreIncrement)
+{
+    DVectX const ix0(3);
+    DVectX ix1(ix0);
+    DVectX const ix2 = ++ix1;
+    EXPECT_EQ(ix1, ix0 + 1);
+    EXPECT_EQ(ix2, ix0 + 1);
+}
+
+TEST(DiscreteVectorXTest, PostIncrement)
+{
+    DVectX const ix0(3);
+    DVectX ix1(ix0);
+    DVectX const ix2 = ix1++;
+    EXPECT_EQ(ix1, ix0 + 1);
+    EXPECT_EQ(ix2, ix0);
+}
+
+TEST(DiscreteVectorXTest, PreDecrement)
+{
+    DVectX const ix0(3);
+    DVectX ix1(ix0);
+    DVectX const ix2 = --ix1;
+    EXPECT_EQ(ix1, ix0 - 1);
+    EXPECT_EQ(ix2, ix0 - 1);
+}
+
+TEST(DiscreteVectorXTest, PostDecrement)
+{
+    DVectX const ix0(3);
+    DVectX ix1(ix0);
+    DVectX const ix2 = ix1--;
+    EXPECT_EQ(ix1, ix0 - 1);
+    EXPECT_EQ(ix2, ix0);
+}
+
 TEST(DiscreteVectorTest, ExternalBinaryOperatorPlus)
 {
     std::size_t const dv_x = 7;