Bug Fix + adding of unit tests for new operators.

Stefan Eschbach
1 parent 23d56fb3
Showing 3 changed files with 29 additions and 2 deletions
include/GMatrix.hpp
src/linalg/GMatrix.cpp
test/test_GMatrix.cpp
@@ -256,7 +256,7 @@ GMatrix GMatrix::operator-(const GMatrix&amp; matrix) const
  * the value of scalar. The method makes use of the unary subtraction operator.
  ***************************************************************************/
 inline
-GMatrix GMatrix::operator+(const double& scalar) const
+GMatrix GMatrix::operator-(const double& scalar) const
 {
     GMatrix result = *this;
     result -= scalar;
@@ -420,7 +420,7 @@ GMatrix&amp; GMatrix::operator-=(const GMatrix&amp; matrix)
  *
  * This method subtracts a given scalar from each matrix element.
  ***************************************************************************/
-GMatrix& GMatrix::operator+=(const double& scalar)
+GMatrix& GMatrix::operator-=(const double& scalar)
 {
     // Add all matrix elements
     double* dst = m_data;
@@ -532,7 +532,34 @@ void TestGMatrix::matrix_arithmetics(void)
     test_assert(check_matrix(m_test), "Test source matrix");
     test_assert(check_matrix(test, 1.0/3.0, 0.0), "Test GMatrix / 3.0",
                 "Unexpected result matrix:\n"+test.print());
+   
+	// GMatrix + 3.0
+	test = m_test + 3.0;
+    test_assert(check_matrix(m_test), "Test source matrix");
+    test_assert(check_matrix(test, 1.0, 3.0), "Test GMatrix + 3.0",
+                "Unexpected result matrix:\n"+test.print());
+
+	// GMatrix += 3.0
+        test = m_test;
+        test += 3.0;
+    test_assert(check_matrix(m_test), "Test source matrix");
+    test_assert(check_matrix(test, 1.0, 3.0), "Test GMatrix + 3.0",
+                "Unexpected result matrix:\n"+test.print());
+    
+	// GMatrix - 5.0
+	test = m_test - 5.0;
+    test_assert(check_matrix(m_test), "Test source matrix");
+    test_assert(check_matrix(test, 1.0, -5.0), "Test GMatrix -= 5.0",
+                "Unexpected result matrix:\n"+test.print());
+
+	// GMatrix -= 3.0
+        test = m_test;
+        test -= 3.0;
+    test_assert(check_matrix(m_test), "Test source matrix");
+    test_assert(check_matrix(test, 1.0, -3.0), "Test GMatrix -= 3.0",
+                "Unexpected result matrix:\n"+test.print());
  
+    
     // Test invalid matrix addition
     test_try("Test invalid matrix addition");
     try {