portelli/LatAnalyze
1
0
Fork 0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2024-09-20 05:25:37 +01:00
Code Releases Activity

Function classes: default function replaced by nullptr

Browse Source
This commit is contained in:
Antonin Portelli 2014-04-07 15:56:08 +01:00
parent dc659991d0
commit 749818d9cc
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Function.cpp
View File

@ -26,8 +26,6 @@ using namespace Latan;
/******************************************************************************
* DoubleFunction implementation *
******************************************************************************/
const DoubleFunction::vecFunc DoubleFunction::nullFunction_ = nullptr;
// constructor /////////////////////////////////////////////////////////////////
DoubleFunction::DoubleFunction(const Index nArg, const vecFunc &f)
: buffer_(new DVec)

3
lib/Function.hpp
View File

@ -39,7 +39,7 @@ private:
public:
// constructor
explicit DoubleFunction(const Index nArg = 0,
const vecFunc &f = nullFunction_);
const vecFunc &f = nullptr);
// destructor
virtual ~DoubleFunction(void) = default;
// access
@ -59,7 +59,6 @@ private:
private:
std::shared_ptr<DVec> buffer_{nullptr};
vecFunc f_;
static const vecFunc nullFunction_;
};
template <typename... Ts>

5
lib/Model.hpp
View File

@ -38,14 +38,14 @@ private:
public:
// constructor
DoubleModel(const Index nArg = 0, const Index nPar = 0,
const vecFunc &f = nullFunction_);
const vecFunc &f = nullptr);
// destructor
virtual ~DoubleModel(void) = default;
// access
virtual Index getNArg(void) const;
virtual Index getNPar(void) const;
void setFunction(const Index nArg = 0, const Index nPar = 0,
const vecFunc &f = nullFunction_);
const vecFunc &f = nullptr);
// function call
double operator()(const DVec &data, const DVec &par) const;
double operator()(const std::vector<double> &data,
@ -59,7 +59,6 @@ private:
private:
std::shared_ptr<ModelSize> size_;
vecFunc f_;
static const vecFunc nullFunction_;
};
END_NAMESPACE