portelli/LatAnalyze
1
0
Fork 0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2025-10-28 21:59:33 +00:00
Code Releases Activity

Merge branch 'master' of github.com:aportelli/LatAnalyze3

Browse Source
This commit is contained in:
Matt Spraggs
2015-11-13 16:25:57 +00:00
parent aa1ae67b60 abd8bfc91c
commit dccdefa238
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Minimizer.cpp
View File

@@ -25,7 +25,6 @@ using namespace Latan;
// constructor ///////////////////////////////////////////////////////////////// // constructor /////////////////////////////////////////////////////////////////
Minimizer::Minimizer(const Index dim) Minimizer::Minimizer(const Index dim)
: Solver(dim)
{ {
resize(dim); resize(dim);
} }
@@ -33,11 +32,21 @@ Minimizer::Minimizer(const Index dim)
// access ////////////////////////////////////////////////////////////////////// // access //////////////////////////////////////////////////////////////////////
void Minimizer::resize(const Index dim) void Minimizer::resize(const Index dim)
{ {
const Index oldDim = getDim();
Solver::resize(dim); Solver::resize(dim);
highLimit_.conservativeResize(dim); highLimit_.conservativeResize(dim);
lowLimit_.conservativeResize(dim); lowLimit_.conservativeResize(dim);
hasHighLimit_.conservativeResize(dim); hasHighLimit_.conservativeResize(dim);
hasLowLimit_.conservativeResize(dim); hasLowLimit_.conservativeResize(dim);
if (dim > oldDim)
{
highLimit_.segment(oldDim, dim - oldDim).fill(0.);
highLimit_.segment(oldDim, dim - oldDim).fill(0.);
lowLimit_.segment(oldDim, dim - oldDim).fill(0.);
hasHighLimit_.segment(oldDim, dim - oldDim).fill(false);
hasLowLimit_.segment(oldDim, dim - oldDim).fill(false);
}
} }
// limits ////////////////////////////////////////////////////////////////////// // limits //////////////////////////////////////////////////////////////////////