Commit: 8c7c25238ed835851b897abf5e6c76393092faad - MolDS (git)

Commit MetaInfo

• Revisão: 8c7c25238ed835851b897abf5e6c76393092faad (tree)
• Hora: 2013-01-22 05:19:05
• Autor: Katsuhiko Nishimra <ktns.87@gmai...>
• Commiter: Katsuhiko Nishimra

Mensagem de Log

Call boost::math::factorial in MolDS_base::Factorial if available. #30557

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/branches/automake@1240 1136aad2-a195-0410-b898-f5ea1d11b9d8

Mudança Sumário

• modified: src/base/MathUtilities.cpp

Diff

--- a/src/base/MathUtilities.cpp
+++ b/src/base/MathUtilities.cpp
@@ -23,10 +23,13 @@
 #include<math.h>
 #include<stdexcept>
 #include<boost/format.hpp>
+#include"config.h"
+#ifdef HAVE_BOOST_MATH_SPECIAL_FUNCTIONS_FACTORIALS_HPP
+#include<boost/math/special_functions/factorials.hpp>
+#endif
 #include"PrintController.h"
 #include"MolDSException.h"
 #include"Uncopyable.h"
-#include"config.h"
 #include"../wrappers/Lapack.h"
 #include"Enums.h"
 #include"MathUtilities.h"
@@ -42,12 +45,16 @@ int Factorial(int n){
       ss << "Error in base::MathUtility::Factorial: n<0 \n";
       throw MolDSException(ss.str());
    }
+#ifdef HAVE_BOOST_MATH_SPECIAL_FUNCTIONS_FACTORIALS_HPP
+   return static_cast<int>(boost::math::factorial<double>(n));
+#else
    else if (n>1){
       return n*Factorial(n-1);
    }
    else{
       return 1;
    }
+#endif
 }
 
 // nCk