Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 2cb44ec4 authored by hhakim's avatar hhakim
Browse files

Update cpp StoppingCriterion: add copy ctor, assignment operator overload and...

Update cpp StoppingCriterion: add copy ctor, assignment operator overload and integrate erreps in to_string().
parent 3f695e3d
No related branches found
No related tags found
No related merge requests found
......@@ -68,11 +68,14 @@ namespace Faust
StoppingCriterion(int nb_it, bool isCriterionError, T errorThreshold, int maxIteration=10000, T epsErr=-1);
StoppingCriterion(const StoppingCriterion& s);
StoppingCriterion& operator=(const StoppingCriterion& s);
~StoppingCriterion(){}
bool do_continue(int current_ite, T error=-2.0)const;
int get_crit() const{return nb_it;}
int get_crit() const{return nb_it;} //TODO: rename this function, this is misleading (should be get_nb_its or something similar)
bool isCriterionErr() const {return isCriterionError;}
bool isCriterionEpsErr() const {return epsErr > -1;}
/**
......
......@@ -51,6 +51,22 @@ const T Faust::StoppingCriterion<T>::NO_ERROR_PASSED = -10000;
template<typename T>
const char * Faust::StoppingCriterion<T>::m_className="Faust::StoppingCriterion::";
template<typename T>
Faust::StoppingCriterion<T>::StoppingCriterion(const StoppingCriterion& s)
{
*this = s;
}
template<typename T>
Faust::StoppingCriterion<T>& Faust::StoppingCriterion<T>::operator=(const StoppingCriterion& s)
{
isCriterionError = s.isCriterionError;
nb_it = s.nb_it;
epsErr = s.epsErr;
lastErr = s.lastErr;
return *this;
}
template<typename T>
Faust::StoppingCriterion<T>::StoppingCriterion(bool isCriterionError_) : isCriterionError(isCriterionError_), epsErr(-1)
{
......@@ -150,6 +166,8 @@ string Faust::StoppingCriterion<T>::to_string() const
else
s += "nb_it :"+std::to_string(nb_it)+"\r\n";
s += "maxIteration: "+std::to_string(maxIteration);
if(epsErr > -1)
s += +"\r\nerreps: "+std::to_string(epsErr);
return s;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment