Add some missing operators between vector and scalar

Benjamin Renard
1 parent f1326d28
Showing 1 changed file with 64 additions and 31 deletions Show diff stats
src/Parameters/DataTypeMath.hh
@@ -156,7 +156,7 @@
 	 */
 	template <typename Type1, typename Type2>
 	std::vector<Type1> operator -(std::vector<Type1> a, std::vector<Type2> b) {
-			std::vector<Type1> r;
+		std::vector<Type1> r;
 		if(a.size() != b.size())  {
 			BOOST_THROW_EXCEPTION(AMDA::AMDA_exception() << AMDA::errno_code(AMDA_OPER_NOT_ALLOWED) << AMDA::ex_msg("Subtract two vector of different size"));
 		}
@@ -281,14 +281,27 @@
 	// vector with scalar operation
  
 	/**
-	 * @brief Operator addition between  a  vector and a scalar
+	 * @brief Operator division between  a  vector and a scalar
 	 * @details all member of vector are divided by the scalar
 	 */
-	template <typename Type>
-	std::vector<Type> operator /(std::vector<Type> a, double f) {
-		std::vector<Type> r;
-		for(typename std::vector<Type>::iterator it = a.begin(); it != a.end(); ++it) {
-			r.push_back((Type)(*it / f));
+	template <typename Type1, typename Type2>
+	std::vector<Type1> operator /(std::vector<Type1> a, Type2 b) {
+		std::vector<Type1> r;
+		for(typename std::vector<Type1>::iterator it = a.begin(); it != a.end(); ++it) {
+			r.push_back((Type1)(*it / b));
+		}
+		return r;
+	}
+
+	/**
+	 * @brief Operator division between a scalar and a vector
+	 * @details apply the division on each vector component
+	 */
+	template <typename Type1, typename Type2>
+	std::vector<Type2> operator /(Type1 a, std::vector<Type2> b) {
+		std::vector<Type2> r;
+		for(typename std::vector<Type2>::iterator it = b.begin(); it != b.end(); ++it) {
+			r.push_back((Type2)(a / *it));
 		}
 		return r;
 	}
@@ -298,47 +311,63 @@
 	 * @brief Operator addition between  a  vector and a scalar
 	 * @details all member of vector are added with the scalar
 	 */
-	template <typename Type>
-	std::vector<Type> operator +(std::vector<Type> a, double f) {
-		std::vector<Type> r;
-		for(typename std::vector<Type>::iterator it = a.begin(); it != a.end(); ++it) {
-			r.push_back((Type)(*it + f));
+	template <typename Type1, typename Type2>
+	std::vector<Type1> operator +(std::vector<Type1> a, Type2 b) {
+		std::vector<Type1> r;
+		for(typename std::vector<Type1>::iterator it = a.begin(); it != a.end(); ++it) {
+			r.push_back((Type1)(*it + b));
 		}
 		return r;
 	}
  
+	/**
+	 * @brief Operator addition between a scalar and a  vector
+	 * @details all member of vector are added with the scalar
+	 */
+        template <typename Type1, typename Type2>
+        std::vector<Type2> operator +( Type1 a, std::vector<Type2> b) {
+		std::vector<Type2> r;
+		for(typename std::vector<Type2>::iterator it = b.begin(); it != b.end(); ++it) {
+			r.push_back((Type2)(a + *it));
+		}
+                return r;
+        }
  
 	/**
-	 * @brief Operator subtraction  between a scalar and a  vector
-	 * @details all member of vector are subtracted with the scalar
+	 * @brief Operator subtraction  between a vector and a scalar
+	 * @details scalar is substracted to all vector components
 	 */
-	template <typename Type>
-	std::vector<Type> operator -( double f, std::vector<Type> a) {
-		std::vector<Type> r;
-		for(typename std::vector<Type>::iterator it = a.begin(); it != a.end(); ++it) {
-			r.push_back(f-*it);
+	template <typename Type1, typename Type2>
+	std::vector<Type1> operator -(std::vector<Type1> a, Type2 b) {
+		std::vector<Type1> r;
+		for(typename std::vector<Type1>::iterator it = a.begin(); it != a.end(); ++it) {
+			r.push_back((Type1)(*it-b));
 		}
 		return r;
 	}
  
 	/**
-	 * @brief Operator addition between a scalar and a  vector
-	 * @details all member of vector are added with the scalar
+	 * @brief Operator subtraction  between a scalar and a  vector
+	 * @details all member of vector are subtracted with the scalar
 	 */
-	template <typename Type>
-	std::vector<Type> operator +( double f, std::vector<Type> a) {
-		return a + f;
+	template <typename Type1, typename Type2>
+	std::vector<Type2> operator -(Type1 a, std::vector<Type2> b) {
+		std::vector<Type2> r;
+		for(typename std::vector<Type2>::iterator it = b.begin(); it != b.end(); ++it) {
+			r.push_back((Type2)(a-*it));
+		}
+		return r;
 	}
  
 	/**
 	 * @brief Operator product between a vector and a scalar
-	 * @details all member of vector are added by the scalar
+	 * @details product applied in all member of vector
 	 */
-	template <typename Type1>
-	std::vector<Type1> operator *(std::vector<Type1> a, double f) {
+	template <typename Type1, typename Type2>
+	std::vector<Type1> operator *(std::vector<Type1> a, Type2 b) {
 		std::vector<Type1> r;
 		for(typename std::vector<Type1>::iterator it = a.begin(); it != a.end(); ++it) {
-			r.push_back(*it * f);
+			r.push_back((Type1)((*it) * b));
 		}
 		return r;
 	}
@@ -347,9 +376,13 @@
 	 * @brief Operator product between a scalar and a vector
 	 * @details all member of vector are added by the scalar
 	 */
-	template <typename Type>
-	std::vector<Type> operator *( double f, std::vector<Type> a) {
-		return a * f;
+	template <typename Type1, typename Type2>
+	std::vector<Type2> operator *( Type1 a, std::vector<Type2> b) {
+		std::vector<Type2> r;
+		for(typename std::vector<Type2>::iterator it = b.begin(); it != b.end(); ++it) {
+			r.push_back((Type2)(a * (*it)));
+		}
+		return r;
 	}