aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use standard math constants.

Browse Source 
--HG--
branch : feature
This commit is contained in:
dismine 2014-04-26 10:40:44 +03:00
parent 21c38b446d
commit d8f0cc2824
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/qmuparser/qmuparser.cpp
View File

@ -25,16 +25,9 @@
#include <QtGlobal> #include <QtGlobal>
//--- Standard includes ------------------------------------------------------------------------ //--- Standard includes ------------------------------------------------------------------------
#include <cmath>
#include <algorithm> #include <algorithm>
#include <numeric> #include <numeric>
/** \brief Pi (what else?). */
#define QmuParser_CONST_PI 3.141592653589793238462643
/** \brief The eulerian number. */
#define QmuParser_CONST_E 2.718281828459045235360287
using namespace std; using namespace std;
/** \file /** \file
@ -80,7 +73,7 @@ namespace qmu
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// misc // misc
qreal QmuParser::Abs(qreal v) { return (v>=0) ? v : -v; } qreal QmuParser::Abs(qreal v) { return qAbs(v); }
qreal QmuParser::Rint(qreal v) { return qFloor(v + (qreal)0.5); } qreal QmuParser::Rint(qreal v) { return qFloor(v + (qreal)0.5); }
qreal QmuParser::Sign(qreal v) { return (qreal)((v<0) ? -1 : (v>0) ? 1 : 0); } qreal QmuParser::Sign(qreal v) { return (qreal)((v<0) ? -1 : (v>0) ? 1 : 0); }
@ -269,8 +262,8 @@ void QmuParser::InitFun()
*/ */
void QmuParser::InitConst() void QmuParser::InitConst()
{ {
DefineConst("_pi", (qreal)QmuParser_CONST_PI); DefineConst("_pi", (qreal)M_PI);
DefineConst("_e", (qreal)QmuParser_CONST_E); DefineConst("_e", (qreal)M_E);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------