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

compatibility fix: __unused changed to __dumb

Browse Source
This commit is contained in:
Antonin Portelli 2015-06-15 15:20:29 +02:00
parent cb45b34ddc
commit 897dae5b2f
7 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Math.hpp
View File

@ -35,7 +35,7 @@ namespace MATH_NAMESPACE
{ {
// integer power function // integer power function
template <unsigned int n, typename T> template <unsigned int n, typename T>
typename std::enable_if<(n == 0), T>::type pow(const T x __unused) typename std::enable_if<(n == 0), T>::type pow(const T x __dumb)
{ {
return 1; return 1;
} }

2
lib/MathInterpreter.cpp
View File

@ -462,7 +462,7 @@ void VarNode::compile(Program &program, RunContext &context) const
} }
// CstNode compile ///////////////////////////////////////////////////////////// // CstNode compile /////////////////////////////////////////////////////////////
void CstNode::compile(Program &program, RunContext &context __unused) const void CstNode::compile(Program &program, RunContext &context __dumb) const
{ {
PUSH_INS(program, Push, strTo<double>(getName())); PUSH_INS(program, Push, strTo<double>(getName()));
} }

12
lib/Minimizer.cpp
View File

@ -43,7 +43,7 @@ double Minimizer::getHighLimit(const Index i) const
return highLimit_(i); return highLimit_(i);
} }
const DVec & Minimizer::getHighLimit(const PlaceHolder ph __unused) const const DVec & Minimizer::getHighLimit(const PlaceHolder ph __dumb) const
{ {
return highLimit_; return highLimit_;
} }
@ -53,7 +53,7 @@ double Minimizer::getLowLimit(const Index i) const
return lowLimit_(i); return lowLimit_(i);
} }
const DVec & Minimizer::getLowLimit(const PlaceHolder ph __unused) const const DVec & Minimizer::getLowLimit(const PlaceHolder ph __dumb) const
{ {
return lowLimit_; return lowLimit_;
} }
@ -81,7 +81,7 @@ void Minimizer::setHighLimit(const Index i, const double l)
} }
} }
void Minimizer::setHighLimit(const PlaceHolder ph __unused, const DVec &l) void Minimizer::setHighLimit(const PlaceHolder ph __dumb, const DVec &l)
{ {
if (l.size() != getDim()) if (l.size() != getDim())
{ {
@ -107,7 +107,7 @@ void Minimizer::setLowLimit(const Index i, const double l)
} }
} }
void Minimizer::setLowLimit(const PlaceHolder ph __unused, const DVec &l) void Minimizer::setLowLimit(const PlaceHolder ph __dumb, const DVec &l)
{ {
if (l.size() != getDim()) if (l.size() != getDim())
{ {
@ -132,7 +132,7 @@ void Minimizer::useHighLimit(const Index i, const bool use)
} }
} }
void Minimizer::useHighLimit(const PlaceHolder ph __unused, const bool use) void Minimizer::useHighLimit(const PlaceHolder ph __dumb, const bool use)
{ {
hasHighLimit_.fill(use); hasHighLimit_.fill(use);
} }
@ -149,7 +149,7 @@ void Minimizer::useLowLimit(const Index i, const bool use)
} }
} }
void Minimizer::useLowLimit(const PlaceHolder ph __unused, const bool use) void Minimizer::useLowLimit(const PlaceHolder ph __dumb, const bool use)
{ {
hasLowLimit_.fill(use); hasLowLimit_.fill(use);
} }

2
lib/MinuitMinimizer.cpp
View File

@ -75,7 +75,7 @@ double MinuitMinimizer::getPrecision(void) const
return 0.; return 0.;
} }
void MinuitMinimizer::setPrecision(const double precision __unused) void MinuitMinimizer::setPrecision(const double precision __dumb)
{ {
LATAN_ERROR(Implementation, LATAN_ERROR(Implementation,
"Minuit minimizer precision cannot be accessed"); "Minuit minimizer precision cannot be accessed");

2
lib/StatArray.hpp
View File

@ -247,7 +247,7 @@ namespace ReducOp
} }
template <typename T> template <typename T>
inline T tensProd(const T &v1 __unused, const T &v2 __unused) inline T tensProd(const T &v1 __dumb, const T &v2 __dumb)
{ {
LATAN_ERROR(Implementation, LATAN_ERROR(Implementation,
"tensorial product not implemented for this type"); "tensorial product not implemented for this type");

38
lib/XYSampleData.cpp
View File

@ -31,7 +31,7 @@ double SampleFitResult::getChi2(const Index s) const
return chi2_[s]; return chi2_[s];
} }
const DSample & SampleFitResult::getChi2(const PlaceHolder ph __unused) const const DSample & SampleFitResult::getChi2(const PlaceHolder ph __dumb) const
{ {
return chi2_; return chi2_;
} }
@ -41,7 +41,7 @@ double SampleFitResult::getChi2PerDof(const Index s) const
return chi2_[s]/getNDof(); return chi2_[s]/getNDof();
} }
DSample SampleFitResult::getChi2PerDof(const PlaceHolder ph __unused) const DSample SampleFitResult::getChi2PerDof(const PlaceHolder ph __dumb) const
{ {
return chi2_/getNDof(); return chi2_/getNDof();
} }
@ -58,7 +58,7 @@ const DoubleFunction & SampleFitResult::getModel(const Index s,
} }
const DoubleFunctionSample & SampleFitResult::getModel( const DoubleFunctionSample & SampleFitResult::getModel(
const PlaceHolder ph __unused, const PlaceHolder ph __dumb,
const Index j) const const Index j) const
{ {
return model_[static_cast<unsigned int>(j)]; return model_[static_cast<unsigned int>(j)];
@ -94,23 +94,23 @@ void XYSampleData::resize(const Index nData, const Index xDim,
isCovarianceInit_ = false; isCovarianceInit_ = false;
} }
XYSampleData::SampleBlock XYSampleData::x(const PlaceHolder ph1 __unused, XYSampleData::SampleBlock XYSampleData::x(const PlaceHolder ph1 __dumb,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
{ {
isCovarianceInit_ = false; isCovarianceInit_ = false;
return x_.block(0, 0, getNData(), getXDim()); return x_.block(0, 0, getNData(), getXDim());
} }
XYSampleData::ConstSampleBlock XYSampleData::x(const PlaceHolder ph1 __unused, XYSampleData::ConstSampleBlock XYSampleData::x(const PlaceHolder ph1 __dumb,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
const const
{ {
return x_.block(0, 0, getNData(), getXDim()); return x_.block(0, 0, getNData(), getXDim());
} }
XYSampleData::SampleBlock XYSampleData::x(const Index i, XYSampleData::SampleBlock XYSampleData::x(const Index i,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
{ {
isCovarianceInit_ = false; isCovarianceInit_ = false;
@ -118,13 +118,13 @@ XYSampleData::SampleBlock XYSampleData::x(const Index i,
} }
XYSampleData::ConstSampleBlock XYSampleData::x(const Index i, XYSampleData::ConstSampleBlock XYSampleData::x(const Index i,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
const const
{ {
return x_.block(0, i, getNData(), 1); return x_.block(0, i, getNData(), 1);
} }
XYSampleData::SampleBlock XYSampleData::x(const PlaceHolder ph1 __unused, XYSampleData::SampleBlock XYSampleData::x(const PlaceHolder ph1 __dumb,
const Index k) const Index k)
{ {
isCovarianceInit_ = false; isCovarianceInit_ = false;
@ -132,7 +132,7 @@ XYSampleData::SampleBlock XYSampleData::x(const PlaceHolder ph1 __unused,
return x_.block(k, 0, 1, getXDim()); return x_.block(k, 0, 1, getXDim());
} }
XYSampleData::ConstSampleBlock XYSampleData::x(const PlaceHolder ph1 __unused, XYSampleData::ConstSampleBlock XYSampleData::x(const PlaceHolder ph1 __dumb,
const Index k) const const Index k) const
{ {
return x_.block(k, 0, 1, getXDim()); return x_.block(k, 0, 1, getXDim());
@ -151,23 +151,23 @@ XYSampleData::ConstSampleBlock XYSampleData::x(const Index i, const Index k)
return x_.block(k, i, 1, 1); return x_.block(k, i, 1, 1);
} }
XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __unused, XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __dumb,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
{ {
isCovarianceInit_ = false; isCovarianceInit_ = false;
return y_.block(0, 0, getNData(), getYDim()); return y_.block(0, 0, getNData(), getYDim());
} }
XYSampleData::ConstSampleBlock XYSampleData::y(const PlaceHolder ph1 __unused, XYSampleData::ConstSampleBlock XYSampleData::y(const PlaceHolder ph1 __dumb,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
const const
{ {
return y_.block(0, 0, getNData(), getYDim()); return y_.block(0, 0, getNData(), getYDim());
} }
XYSampleData::SampleBlock XYSampleData::y(const Index j, XYSampleData::SampleBlock XYSampleData::y(const Index j,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
{ {
isCovarianceInit_ = false; isCovarianceInit_ = false;
@ -175,13 +175,13 @@ XYSampleData::SampleBlock XYSampleData::y(const Index j,
} }
XYSampleData::ConstSampleBlock XYSampleData::y(const Index j, XYSampleData::ConstSampleBlock XYSampleData::y(const Index j,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
const const
{ {
return y_.block(0, j, getNData(), 1); return y_.block(0, j, getNData(), 1);
} }
XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __unused, XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __dumb,
const Index k) const Index k)
{ {
isCovarianceInit_ = false; isCovarianceInit_ = false;
@ -189,7 +189,7 @@ XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __unused,
return y_.block(k, 0, 1, getYDim()); return y_.block(k, 0, 1, getYDim());
} }
XYSampleData::ConstSampleBlock XYSampleData::y(const PlaceHolder ph1 __unused, XYSampleData::ConstSampleBlock XYSampleData::y(const PlaceHolder ph1 __dumb,
const Index k) const const Index k) const
{ {
return y_.block(k, 0, 1, getYDim()); return y_.block(k, 0, 1, getYDim());

32
lib/XYStatData.cpp
View File

@ -89,39 +89,39 @@ void XYStatData::reinitChi2(const bool doReinit)
reinitChi2_ = doReinit; reinitChi2_ = doReinit;
} }
Block<MatBase<double>> XYStatData::x(const PlaceHolder ph1 __unused, Block<MatBase<double>> XYStatData::x(const PlaceHolder ph1 __dumb,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
{ {
return x_.block(0, 0, getNData(), getXDim()); return x_.block(0, 0, getNData(), getXDim());
} }
ConstBlock<MatBase<double>> XYStatData::x(const PlaceHolder ph1 __unused, ConstBlock<MatBase<double>> XYStatData::x(const PlaceHolder ph1 __dumb,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
const const
{ {
return x_.block(0, 0, getNData(), getXDim()); return x_.block(0, 0, getNData(), getXDim());
} }
Block<MatBase<double>> XYStatData::x(const Index i, Block<MatBase<double>> XYStatData::x(const Index i,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
{ {
return x_.block(0, i, getNData(), 1); return x_.block(0, i, getNData(), 1);
} }
ConstBlock<MatBase<double>> XYStatData::x(const Index i, ConstBlock<MatBase<double>> XYStatData::x(const Index i,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
const const
{ {
return x_.block(0, i, getNData(), 1); return x_.block(0, i, getNData(), 1);
} }
Block<MatBase<double>> XYStatData::x(const PlaceHolder ph1 __unused, Block<MatBase<double>> XYStatData::x(const PlaceHolder ph1 __dumb,
const Index k) const Index k)
{ {
return x_.block(k, 0, 1, getXDim()); return x_.block(k, 0, 1, getXDim());
} }
ConstBlock<MatBase<double>> XYStatData::x(const PlaceHolder ph1 __unused, ConstBlock<MatBase<double>> XYStatData::x(const PlaceHolder ph1 __dumb,
const Index k) const const Index k) const
{ {
return x_.block(k, 0, 1, getXDim()); return x_.block(k, 0, 1, getXDim());
@ -137,38 +137,38 @@ const double & XYStatData::x(const Index i, const Index k) const
return x_(k, i); return x_(k, i);
} }
Block<MatBase<double>> XYStatData::y(const PlaceHolder ph1 __unused, Block<MatBase<double>> XYStatData::y(const PlaceHolder ph1 __dumb,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
{ {
return y_.block(0, 0, getNData(), getYDim()); return y_.block(0, 0, getNData(), getYDim());
} }
ConstBlock<MatBase<double>> XYStatData::y(const PlaceHolder ph1 __unused, ConstBlock<MatBase<double>> XYStatData::y(const PlaceHolder ph1 __dumb,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
const const
{ {
return y_.block(0, 0, getNData(), getYDim()); return y_.block(0, 0, getNData(), getYDim());
} }
Block<MatBase<double>> XYStatData::y(const Index j, Block<MatBase<double>> XYStatData::y(const Index j,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
{ {
return y_.block(0, j, getNData(), 1); return y_.block(0, j, getNData(), 1);
} }
ConstBlock<MatBase<double>> XYStatData::y(const Index j, ConstBlock<MatBase<double>> XYStatData::y(const Index j,
const PlaceHolder ph2 __unused) const PlaceHolder ph2 __dumb)
const const
{ {
return y_.block(0, j, getNData(), 1); return y_.block(0, j, getNData(), 1);
} }
Block<MatBase<double>> XYStatData::y(const PlaceHolder ph1 __unused, const Index k) Block<MatBase<double>> XYStatData::y(const PlaceHolder ph1 __dumb, const Index k)
{ {
return y_.block(k, 0, 1, getYDim()); return y_.block(k, 0, 1, getYDim());
} }
ConstBlock<MatBase<double>> XYStatData::y(const PlaceHolder ph1 __unused, ConstBlock<MatBase<double>> XYStatData::y(const PlaceHolder ph1 __dumb,
const Index k) const const Index k) const
{ {
return y_.block(k, 0, 1, getYDim()); return y_.block(k, 0, 1, getYDim());