Commit: bc389f6a4dffa2e708011d9995bbdc01be540b54 - MolDS (git)

Commit MetaInfo

• Revision: bc389f6a4dffa2e708011d9995bbdc01be540b54 (tree)
• Zeit: 2013-08-22 18:04:45
• Autor: Mikiya Fujii <mikiya.fujii@gmai...>
• Commiter: Mikiya Fujii

Log Message

MolDS_base::MathUtilities::Max and MolDS_base::MathUtilities::min is replaced with std::max and std::min.

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/trunk@1482 1136aad2-a195-0410-b898-f5ea1d11b9d8

Ändern Zusammenfassung

• modified: src/base/MathUtilities.cpp
• modified: src/base/MathUtilities.h
• modified: src/optimization/BFGS.cpp

Diff

--- a/src/base/MathUtilities.cpp
+++ b/src/base/MathUtilities.cpp
@@ -32,7 +32,6 @@
 #include"../mpi/MpiProcess.h"
 #include"../wrappers/Lapack.h"
 #include"MathUtilities.h"
-#include"MallocerFreer.h"
 using namespace std;
 
 namespace MolDS_base{
@@ -69,26 +68,6 @@ int Conbination(int n, int k){
    }
 }
 
-// max
-template <typename T> T Max(T a, T b){
-   if(a<b){
-      return b;
-   }
-   else{
-      return a;
-   }
-}
-
-// min
-template <typename T> T min(T a, T b){
-   if(a<b){
-      return a;
-   }
-   else{
-      return b;
-   }
-}
-
 // rotating matrix
 void CalcRotatingMatrix(double matrix[][3], double theta, CartesianType cartesianType){
    if(cartesianType == XAxis){

--- a/src/base/MathUtilities.h
+++ b/src/base/MathUtilities.h
@@ -23,10 +23,6 @@ namespace MolDS_base{
 int Factorial(int n);
 // nCk
 int Conbination(int n, int k);
-// max
-template <typename T> T Max(T a, T b);
-// min
-template <typename T> T min(T a, T b);
 // rotating matrix
 void CalcRotatingMatrix(double matrix[][3], double theta, CartesianType cartesianType);
 // calculate determinant of the matrix. Note taht the matrix will be destroid

--- a/src/optimization/BFGS.cpp
+++ b/src/optimization/BFGS.cpp
@@ -21,6 +21,7 @@
 #include<stdlib.h>
 #include<string.h>
 #include<iostream>
+#include<algorithm>
 #include<sstream>
 #include<math.h>
 #include<string>