fparser.hh (mathmod-11.0-source) | : | fparser.hh (mathmod-11.1-source) | ||
---|---|---|---|---|
skipping to change at line 16 | skipping to change at line 16 | |||
|* This library is distributed under the terms of the *| | |* This library is distributed under the terms of the *| | |||
|* GNU Lesser General Public License version 3. *| | |* GNU Lesser General Public License version 3. *| | |||
|* (See lgpl.txt and gpl.txt for the license text.) *| | |* (See lgpl.txt and gpl.txt for the license text.) *| | |||
\***************************************************************************/ | \***************************************************************************/ | |||
#ifndef ONCE_FPARSER_H_ | #ifndef ONCE_FPARSER_H_ | |||
#define ONCE_FPARSER_H_ | #define ONCE_FPARSER_H_ | |||
#include <string> | #include <string> | |||
#include <vector> | #include <vector> | |||
#include <complex> | ||||
#ifdef FUNCTIONPARSER_SUPPORT_DEBUGGING | #ifdef FUNCTIONPARSER_SUPPORT_DEBUGGING | |||
#include <iostream> | #include <iostream> | |||
#endif | #endif | |||
#ifdef _MSC_VER | #ifdef _MSC_VER | |||
// Visual Studio's warning about missing definitions for the explicit | // Visual Studio's warning about missing definitions for the explicit | |||
// FunctionParserBase instantiations is irrelevant here. | // FunctionParserBase instantiations is irrelevant here. | |||
#pragma warning(disable : 4661) | #pragma warning(disable : 4661) | |||
#endif | #endif | |||
skipping to change at line 71 | skipping to change at line 71 | |||
void setDelimiterChar(char); | void setDelimiterChar(char); | |||
static Value_t epsilon(); | static Value_t epsilon(); | |||
static void setEpsilon(Value_t); | static void setEpsilon(Value_t); | |||
const char* ErrorMsg() const; | const char* ErrorMsg() const; | |||
ParseErrorType GetParseErrorType() const; | ParseErrorType GetParseErrorType() const; | |||
Value_t Eval(const Value_t* Vars); | Value_t Eval(const Value_t* Vars); | |||
std::complex<double> EvalC(const std::complex<double>* ); | ||||
void AllocateStackMemory( unsigned int, int nbvar=0); | void AllocateStackMemory( unsigned int, int nbvar=0); | |||
Value_t Eval2(const Value_t* Vars, unsigned Nbvar, double* results, unsigned , int position=-1); | Value_t Eval2(const Value_t* Vars, unsigned Nbvar, Value_t* results, unsigne d, int position=-1); | |||
int EvalError() const; | int EvalError() const; | |||
bool AddConstant(const std::string& name, Value_t value); | bool AddConstant(const std::string& name, Value_t value); | |||
bool AddUnit(const std::string& name, Value_t value); | bool AddUnit(const std::string& name, Value_t value); | |||
typedef Value_t (*FunctionPtr)(const Value_t*); | typedef Value_t (*FunctionPtr)(const Value_t*); | |||
bool AddFunction(const std::string& name, | bool AddFunction(const std::string& name, | |||
FunctionPtr, unsigned paramsAmount); | FunctionPtr, unsigned paramsAmount); | |||
bool AddFunction(const std::string& name, FunctionParserBase&); | bool AddFunction(const std::string& name, FunctionParserBase&); | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 3 lines changed or added |