Merge pull request #768 from hongriTianqi/develop

UT for container (vector & map) operators (+,-,*)

Author: caic99

source/module_base/container_operator.h

@@ -5,8 +5,6 @@
 #include <vector>
 #include <map>
 
-
-
 template< typename T>
 std::vector<T> operator + ( const std::vector<T> & x1, const std::vector<T> & x2 )
 {
@@ -30,23 +28,23 @@ std::vector<T> operator - ( const std::vector<T> & x1, const std::vector<T> & x2
 template< typename T1, typename T2 >
 std::map<T1,T2> operator + ( const std::map<T1,T2> & x1, const std::map<T1,T2> & x2 )
 {
+	assert(x1.size()==x2.size());
 	std::map<T1,T2> x;
 	for( const auto &x1i : x1 )
-		x.insert(make_pair( x1i.first, x1i.second + x2.at(x1i.first) ));
+		x.insert(std::make_pair( x1i.first, x1i.second + x2.at(x1i.first) ));
 	return x;
 }
 
 template< typename T1, typename T2 >
 std::map<T1,T2> operator - ( const std::map<T1,T2> & x1, const std::map<T1,T2> & x2 )
 {
+	assert(x1.size()==x2.size());
 	std::map<T1,T2> x;
 	for( const auto &x1i : x1 )
-		x.insert(make_pair( x1i.first, x1i.second - x2.at(x1i.first) ));
+		x.insert(std::make_pair( x1i.first, x1i.second - x2.at(x1i.first) ));
 	return x;
 }
 
-
-
 template< typename T1, typename T2 >
 std::vector<T2> operator * ( const T1 & x1, const std::vector<T2> & x2 )
 {
@@ -61,8 +59,8 @@ std::map<T21,T22> operator * ( const T1 & x1, const std::map<T21,T22> & x2 )
 {
 	std::map<T21,T22> x;
 	for( const auto & x2i : x2 )
-		x.insert(make_pair( x2i.first, x1*x2i.second ));
+		x.insert(std::make_pair( x2i.first, x1*x2i.second ));
 	return x;
 }
 
-#endif	// CONTAINER_OPERATOR_H
+#endif	// CONTAINER_OPERATOR_H

source/module_base/test/CMakeLists.txt

@@ -95,3 +95,7 @@ AddTest(
   TARGET base_mymath
   SOURCES mymath_test.cpp ../mymath3.cpp ../timer.cpp
 )
+AddTest(
+  TARGET base_container
+  SOURCES container_operator_test.cpp ../container_operator.h
+)

source/module_base/test/container_operator_test.cpp

@@ -0,0 +1,129 @@
+#include "../container_operator.h"
+#include "gtest/gtest.h"
+#include <iostream>
+
+/************************************************
+ *  unit test of container operator
+ ***********************************************/
+
+/**
+ * - Tested Functions:
+ *   - VectorPlus
+ *     - "+" operator for vectors
+ *   - VectorMinus
+ *     - "-" operator for vectors
+ *   - VectorMultiply
+ *     - "*" operator for scalar*vector
+ *   - MapPlus
+ *     - "+" operator for maps
+ *   - MapMinus
+ *     - "-" operator for maps
+ *   - MapMultiply
+ *     - "*" operator for scalar*map
+ */
+
+TEST(ContainerOperator,VectorPlus)
+{
+	std::vector<double> a(20,10.0);
+	std::vector<double> b(20,1.0);
+	std::vector<double> c(20);
+	c = a+b;
+	for (int i=0;i<c.size();i++)
+		EXPECT_EQ(c[i],11.0);
+}
+
+TEST(ContainerOperator,VectorMinus)
+{
+	std::vector<double> a(20,10.0);
+	std::vector<double> b(20,1.0);
+	std::vector<double> c(20);
+	c = a-b;
+	for (int i=0;i<c.size();i++)
+		EXPECT_EQ(c[i],9.0);
+}
+
+TEST(ContainerOperator,VectorMultiply)
+{
+	std::vector<double> a(20,10.0);
+	double b = 2.0;
+	std::vector<double> c(20);
+	c = b*a;
+	for (int i=0;i<c.size();i++)
+		EXPECT_EQ(c[i],20.0);
+}
+
+TEST(ContainerOperator,VectorLengthCheck)
+{
+	std::vector<double> a(20,10.0);
+	std::vector<double> b(19,1.0);
+	std::vector<double> c(20);
+	EXPECT_DEATH(c=a+b,"");
+	EXPECT_DEATH(c=a-b,"");
+}
+
+TEST(ContainerOperator,MapLengthCheck)
+{
+	std::map<int,double> a;
+	std::map<int,double> b;
+	std::map<int,double> c;
+	for (int i=0;i<10;i++)
+	{
+		a.insert(std::pair<int,double> (i, i*2.0));
+		if (i<9) b.insert(std::pair<int,double> (i, i*3.0));
+	}
+	EXPECT_DEATH(c=a+b,"");
+	EXPECT_DEATH(c=a-b,"");
+}
+
+TEST(ContainerOperator,MapPlus)
+{
+	std::map<int,double> a;
+	std::map<int,double> b;
+	std::map<int,double> c;
+	for (int i=0;i<10;i++)
+	{
+		a.insert(std::pair<int,double> (i, i*2.0));
+		b.insert(std::pair<int,double> (i, i*3.0));
+	}
+	c = a+b;
+	for (int i=0;i<10;i++)
+	{
+		//std::cout << c[i] << std::endl;
+		EXPECT_EQ(c[i],i*5.0);
+	}
+}
+
+TEST(ContainerOperator,MapMinus)
+{
+	std::map<int,double> a;
+	std::map<int,double> b;
+	std::map<int,double> c;
+	for (int i=0;i<10;i++)
+	{
+		a.insert(std::pair<int,double> (i, i*4.0));
+		b.insert(std::pair<int,double> (i, i*2.0));
+	}
+	c = a-b;
+	for (int i=0;i<10;i++)
+	{
+		//std::cout << c[i] << std::endl;
+		EXPECT_EQ(c[i],i*2.0);
+	}
+}
+
+TEST(ContainerOperator,MapMultiply)
+{
+	std::map<int,double> a;
+	double b = 3.0;
+	std::map<int,double> c;
+	for (int i=0;i<10;i++)
+	{
+		a.insert(std::pair<int,double> (i, i*4.0));
+	}
+	c = b*a;
+	for (int i=0;i<10;i++)
+	{
+		//std::cout << c[i] << std::endl;
+		EXPECT_EQ(c[i],i*4.0*3.0);
+	}
+}