From bb53b926bf7e0c844965f61c889ebbc4884f1100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronsolutions.com>
Date: Wed, 7 Feb 2018 13:10:36 +0100
Subject: [PATCH] #2345 Add + and * operators to the tensor class, to make
 averaging possible.

---
 .../UnitTests/ScalarMapper-Test.cpp           | 30 +++++++++++++++-
 Fwk/AppFwk/cafTensor/cafTensor3.h             |  2 ++
 Fwk/AppFwk/cafTensor/cafTensor3.inl           | 36 +++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/ApplicationCode/UnitTests/ScalarMapper-Test.cpp b/ApplicationCode/UnitTests/ScalarMapper-Test.cpp
index 71ef74b9f9..1e13ec3d40 100644
--- a/ApplicationCode/UnitTests/ScalarMapper-Test.cpp
+++ b/ApplicationCode/UnitTests/ScalarMapper-Test.cpp
@@ -124,7 +124,7 @@ TEST(OffshoreSphericalCoords, OffshoreSphericalCoords)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-TEST(TensorRotation, TensorRotation)
+TEST(Tensor, TensorRotation)
 {
 
     {
@@ -232,4 +232,32 @@ TEST(TensorRotation, TensorRotation)
         EXPECT_NEAR(0.0f, rotT[caf::Ten3f::SYZ], 1e-4);
     }
 
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+TEST(Tensor, TensorAddScale)
+{
+    caf::Ten3f orgT1(1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f);
+    caf::Ten3f orgT2(1.6f, 1.5f, 1.4f, 1.3f, 1.2f, 1.1f);
+
+    caf::Ten3f newT = orgT1 + orgT2;
+
+    EXPECT_NEAR(2.7f, newT[caf::Ten3f::SXX], 1e-4);
+    EXPECT_NEAR(2.7f, newT[caf::Ten3f::SYY], 1e-4);
+    EXPECT_NEAR(2.7f, newT[caf::Ten3f::SZZ], 1e-4);
+    EXPECT_NEAR(2.7f, newT[caf::Ten3f::SXY], 1e-4);
+    EXPECT_NEAR(2.7f, newT[caf::Ten3f::SZX], 1e-4);
+    EXPECT_NEAR(2.7f, newT[caf::Ten3f::SYZ], 1e-4);
+
+    newT = newT*0.5;
+
+    EXPECT_NEAR(1.35f, newT[caf::Ten3f::SXX], 1e-4);
+    EXPECT_NEAR(1.35f, newT[caf::Ten3f::SYY], 1e-4);
+    EXPECT_NEAR(1.35f, newT[caf::Ten3f::SZZ], 1e-4);
+    EXPECT_NEAR(1.35f, newT[caf::Ten3f::SXY], 1e-4);
+    EXPECT_NEAR(1.35f, newT[caf::Ten3f::SZX], 1e-4);
+    EXPECT_NEAR(1.35f, newT[caf::Ten3f::SYZ], 1e-4);
+
 }
\ No newline at end of file
diff --git a/Fwk/AppFwk/cafTensor/cafTensor3.h b/Fwk/AppFwk/cafTensor/cafTensor3.h
index 8e3af7030c..c943821cb8 100644
--- a/Fwk/AppFwk/cafTensor/cafTensor3.h
+++ b/Fwk/AppFwk/cafTensor/cafTensor3.h
@@ -34,6 +34,8 @@ public:
     Tensor3(const Tensor3& other);
 
     inline Tensor3&     operator=(const Tensor3& rhs);
+    inline Tensor3      operator+(const Tensor3& rhs) const;
+    inline Tensor3      operator*(S scale) const;
 
     bool                equals(const Tensor3& mat) const;
     bool                operator==(const Tensor3& rhs) const;
diff --git a/Fwk/AppFwk/cafTensor/cafTensor3.inl b/Fwk/AppFwk/cafTensor/cafTensor3.inl
index ed24808baa..8a55e55e40 100644
--- a/Fwk/AppFwk/cafTensor/cafTensor3.inl
+++ b/Fwk/AppFwk/cafTensor/cafTensor3.inl
@@ -62,6 +62,42 @@ inline Tensor3<S>& Tensor3<S>::operator=(const Tensor3& obj)
     return *this;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// Component-wise addition
+//--------------------------------------------------------------------------------------------------
+template< typename S>
+Tensor3<S> caf::Tensor3<S>::operator+(const Tensor3& rhs) const
+{
+    Tensor3<S> result(*this);
+
+    result.m_tensor[0] += rhs.m_tensor[0];
+    result.m_tensor[1] += rhs.m_tensor[1];
+    result.m_tensor[2] += rhs.m_tensor[2];
+    result.m_tensor[3] += rhs.m_tensor[3];
+    result.m_tensor[4] += rhs.m_tensor[4];
+    result.m_tensor[5] += rhs.m_tensor[5];
+
+    return result;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+template< typename S>
+Tensor3<S> caf::Tensor3<S>::operator*(S scale) const
+{
+    Tensor3<S> result(*this);
+
+    result.m_tensor[0] *= scale;
+    result.m_tensor[1] *= scale;
+    result.m_tensor[2] *= scale;
+    result.m_tensor[3] *= scale;
+    result.m_tensor[4] *= scale;
+    result.m_tensor[5] *= scale;
+
+    return result;
+}
+
 
 //----------------------------------------------------------------------------------------------------
 /// Check if matrices are equal using exact comparisons.