fix namespace

release/4.3a0
thduynguyen 2014-11-26 15:27:28 -05:00
parent ca640ac54d
commit 12ca4317a2
1 changed files with 1 additions and 1 deletions

View File

@ -444,7 +444,7 @@ pair<VectorValues, Key> QPSolver::initialValuesLP() const {
Vector sigmas = jacobian->get_model()->sigmas(); Vector sigmas = jacobian->get_model()->sigmas();
for (size_t i = 0; i < sigmas.size(); ++i) { for (size_t i = 0; i < sigmas.size(); ++i) {
if (sigmas[i] < 0) { if (sigmas[i] < 0) {
slackInit[i] = max(errorAtZero[i], 0.0); slackInit[i] = std::max(errorAtZero[i], 0.0);
} else if (sigmas[i] == 0.0) { } else if (sigmas[i] == 0.0) {
errorAtZero[i] = fabs(errorAtZero[i]); errorAtZero[i] = fabs(errorAtZero[i]);
} // if it has >0 sigma, i.e. normal Gaussian noise, initialize it at 0 } // if it has >0 sigma, i.e. normal Gaussian noise, initialize it at 0