removing plugin Magnitude

Hacene SI HADJ MOHAND
1 parent b00e7329
Showing 7 changed files with 8 additions and 90 deletions Show diff stats
CMakeLists.txt
src/ExternLib/Magnitude/CMakeLists.txt
src/ExternLib/Magnitude/magnitude.cc
src/ExternLib/Magnitude/magnitude.hh
src/Parameters/DataTypeMath.hh
test/FitNesseRoot/ReleaseS/SecondPart/ReLease1/SprinT2/UserStory43/.txt
test/data/functions.xml
@@ -144,7 +144,6 @@ add_subdirectory(src/ParamGetImpl/LocalFileInterface)
 add_subdirectory(src/ParamGetImpl/ConstantInterface)
 add_subdirectory(src/InternLib)
 add_subdirectory(src/ExternLib/Deriv)
-add_subdirectory(src/ExternLib/Magnitude)
 add_subdirectory(src/ExternLib/Morschhauser)
 add_subdirectory(src/ExternLib/Ram_Presure)
 add_subdirectory(src/ExternLib/TimeShifted)
@@ -1,23 +0,0 @@
-
-PROJECT(Magnitude)
-
-set(LIBRARY_OUTPUT_PATH ${PLUGIN_OUTPUT_PATH}/magnitude)
-
-include_directories(
-)
-
-#Library configuration
-file(
-	GLOB_RECURSE
-	source_files
-	./*
-)
-
-ADD_LIBRARY( Magnitude SHARED ${source_files} )
-
-target_link_libraries(
-	Magnitude
-)
-
-FILE( GLOB_RECURSE PROJ_HEADERS *.hh )
-INSTALL(FILES ${PROJ_HEADERS} DESTINATION ${LIBRARY_OUTPUT_PATH}  PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
@@ -1,35 +0,0 @@
-/**
- * Magnitude.cc
- *
- *  Created on: 31 oct. 2012
- *      Author: AKKA IS
- */
-
-#include "magnitude.hh"
-
-#include <math.h>
-
-float magnitude(const std::vector<float>& vec)
-{
-	return sqrtf(vec[0] * vec[0] + vec[1] * vec[1] + vec[2] * vec[2]);
-}
-
-double magnitude(const std::vector<double>& vec)
-{
-	return sqrt(vec[0] * vec[0] + vec[1] * vec[1] + vec[2] * vec[2]);
-}
-
-long double magnitude(const std::vector<long double>& vec)
-{
-	return sqrtl(vec[0] * vec[0] + vec[1] * vec[1] + vec[2] * vec[2]);
-}
-
-int magnitude(const std::vector<int>& vec)
-{
-	return sqrt(vec[0] * vec[0] + vec[1] * vec[1] + vec[2] * vec[2]);
-}
-
-short magnitude(const std::vector<short>& vec)
-{
-	return sqrt(vec[0] * vec[0] + vec[1] * vec[1] + vec[2] * vec[2]);
-}
@@ -1,23 +0,0 @@
-/**
- * Magnitude.hh
- *
- *  Created on: 31 oct. 2012
- *      Author: AKKA IS
- */
-
-#ifndef MAGNITUDE_HH_
-#define MAGNITUDE_HH_
-
-#include <vector>
-
-/**
- * @bried Compute the magnitude of el
- * @return  sqrtf(vec[0] * vec[0] + vec[1] * vec[1] + vec[2] * vec[2]);
- */
-float magnitude(const std::vector<float>& el);
-
-double magnitude(const std::vector<double>& vec);
-
-int magnitude(const std::vector<int>& vec);
-
-#endif /* MAGNITUDE_HH_ */
@@ -279,19 +279,19 @@ Type1 dot(std::vector&lt;Type1&gt; a, std::vector&lt;Type2&gt; b) {
 }
  
 template <typename Type>
-Type magnitude_(std::vector<Type> a) {
-   Type magnitude = 0;
+Type magnitude(std::vector<Type> a) {
+   Type mag = 0;
    for (unsigned int i = 0; i < a.size(); ++i) 
-      magnitude += a[i]*a[i]; 
-   return std::sqrt(magnitude);
+      mag += a[i]*a[i]; 
+   return std::sqrt(mag);
 }
  
 template <typename Type1, typename Type2>
 Type1 angle(std::vector<Type1> a, std::vector<Type2> b) {
-    if(magnitude_(a) ==0 || magnitude_(b) == 0){
+    if(magnitude(a) ==0 || magnitude(b) == 0){
           BOOST_THROW_EXCEPTION(AMDA::AMDA_exception() << AMDA::errno_code(AMDA_OPER_NOT_ALLOWED) << AMDA::ex_msg("One of the two vectors is NULL"));
      }
-    return std::acos(dot(a,b)/magnitude_(a)/magnitude_(b));
+    return std::acos(dot(a,b)/magnitude(a)/magnitude(b));
 }
  
 /**
 # Union between ;
 # Name: ;
 # Historic: ;
-# Creation Date: 2018-06-06T12:19:56;
+# Creation Date: 2020-02-24T14:22:26;
  
@@ -100,7 +100,7 @@
  
    <function name="magnitude_(,)" args="2" kind="vectors">
      <info_brief>magnitude of a vector</info_brief>
-     <new_kernel>magnitude_</new_kernel>
+     <new_kernel>magnitude</new_kernel>
    </function> 
  
    <function name="dot(,)" args="2" kind="vectors">