Skip to content

Commit

Permalink
Bugfix (compile error)
Browse files Browse the repository at this point in the history
  • Loading branch information
damien-masse committed Jan 12, 2024
1 parent f0de7ef commit 5e02e36
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions src/core/2/contractors/codac2_CtcDiffInclusion.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,45 +108,45 @@ using namespace ibex;

namespace codac2
{
templace<typename _TpP>
template<typename _TpP>
CtcDiffInclusion<_TpP>::CtcDiffInclusion(const TFunction& f)
: _f(f)
{

}

templace<typename _TpP>
template<typename _TpP>
const TFunction& CtcDiffInclusion<_TpP>::f() const
{
return _f;
}

templace<typename _TpP>
template<typename _TpP>
const IntervalVector CtcDiffInclusion<_TpP>::eval_function(const Interval &tim,
const IntervalVector& cdom, const IntervalVector *u) const {
if (u!=NULL)
return _f.eval_vector(tim,cdom,*u); else
return _f.eval_vector(tim,cdom);

}
templace<typename _TpP>
template<typename _TpP>
const IntervalVector CtcDiffInclusion<_TpP>::eval_function(const Interval &tim,
const _TpP& cdom, const IntervalVector* u) const {
return this->eval_function(tim, cdom.box(),u);
}
templace<typename _TpP>
template<typename _TpP>
const IntervalVector CtcDiffInclusion<_TpP>::eval_function(double tim,
const IntervalVector& cdom, const IntervalVector* u) const {
const Interval timI(tim);
return this->eval_function(timI,cdom,u);
}
templace<typename _TpP>
template<typename _TpP>
const IntervalVector CtcDiffInclusion<_TpP>::eval_function(double tim,
const _TpP& cdom, const IntervalVector* u) const {
const Interval timI(tim);
return this->eval_function(timI,cdom.box(),u);
}
templace<typename _TpP>
template<typename _TpP>
const IntervalVector CtcDiffInclusion<_TpP>::eval_function(double tim,
const Vector& cdom, const IntervalVector* u) const {
const Interval timI(tim);
Expand All @@ -156,7 +156,7 @@ namespace codac2


// basic enclosing for evolution
templace<typename _TpP>
template<typename _TpP>
_TpP CtcDiffInclusion<_TpP>::extend_box_basic(const _TpP& frame,
const _TpP& startIV, const IntervalVector* u,
const Interval& tim,
Expand Down Expand Up @@ -199,7 +199,7 @@ namespace codac2
}


templace<typename _TpP>
template<typename _TpP>
IntervalMatrix CtcDiffInclusion<_TpP>::jacobian(const _TpP& codom,
const IntervalVector* u,
const Interval& tdom,
Expand All @@ -225,7 +225,7 @@ namespace codac2
}


templace<typename _TpP>
template<typename _TpP>
bool CtcDiffInclusion<_TpP>::compute_step(const _TpP& frame,
const IntervalVector* u,
const _TpP& actState,
Expand Down Expand Up @@ -306,12 +306,12 @@ namespace codac2

/* next tauState, do NOT change the underlying matrices */
_TpP ntauState(actState);
cout << "avant ctau" << ntauState << "\ncent " << cent_tauState <<
"\ntauExpM " << tauExpM << "\ntauCent " << tauCent << "\n";
// cout << "avant ctau" << ntauState << "\ncent " << cent_tauState <<
// "\ntauExpM " << tauExpM << "\ntauCent " << tauCent << "\n";
ntauState.ctau_mult_and_add(cent_tauState,tauExpM,tauCent);

cout << "ntauState" << ntauState << "\ntauState " << tauState <<
"\n";
// cout << "ntauState" << ntauState << "\ntauState " << tauState <<
// "\n";


ntauState &= frame;
Expand Down Expand Up @@ -369,7 +369,7 @@ namespace codac2



templace<typename _TpP>
template<typename _TpP>
void CtcDiffInclusion<_TpP>::contract(Slice<_TpP>& x,
const std::shared_ptr<const _TpP>& uDom, TimePropag t_propa)
{
Expand Down Expand Up @@ -459,7 +459,7 @@ namespace codac2
}
}

templace<typename _TpP>
template<typename _TpP>
void CtcDiffInclusion<_TpP>::contract_from_slice(Tube<_TpP>& x, const Tube<_TpP>* u, std::shared_ptr<Slice<_TpP>>& gate, TimePropag t_propa)
{
bool sameslicing=false;
Expand Down Expand Up @@ -510,15 +510,15 @@ namespace codac2
}
}

templace<typename _TpP>
template<typename _TpP>
void CtcDiffInclusion<_TpP>::contract(Slice<_TpP>& x,
const Slice<_TpP>& u, TimePropag t_propa) {
const shared_ptr<const _TpP> du =
std::make_shared<const _TpP>(u.codomain());
this->contract(x,du,t_propa);
}

templace<typename _TpP>
template<typename _TpP>
void CtcDiffInclusion<_TpP>::contract(Tube<_TpP>& x, const Tube<_TpP>* u, TimePropag t_propa)
{
bool sameslicing=false;
Expand Down

0 comments on commit 5e02e36

Please sign in to comment.