Commit 72ffb6c2 authored by Manuel Günther's avatar Manuel Günther

Fixed usage of linsolve in LPInteriorPoint

parent c4021d4e
Pipeline #10301 passed with stages
in 18 minutes and 57 seconds
......@@ -252,7 +252,7 @@ void bob::math::LPInteriorPoint::centeringV(const blitz::Array<double,2>& A,
// 2) Update the big system and solve it
updateLargeSystem( x, 1., m);
bob::math::linsolve( m_cache_A_large, m_cache_x_large, m_cache_b_large);
bob::math::linsolve( m_cache_A_large, m_cache_b_large, m_cache_x_large);
// 4) Find alpha and update x, lamda and mu
double alpha=1.;
......@@ -406,7 +406,7 @@ void bob::math::LPInteriorPointShortstep::solve(const blitz::Array<double,2>& A,
// 2) Update the big system and solve it
updateLargeSystem( x, sigma, m);
bob::math::linsolve( m_cache_A_large, m_cache_x_large, m_cache_b_large);
bob::math::linsolve( m_cache_A_large, m_cache_b_large, m_cache_x_large);
// 3) Update x, lamda and mu
m_lambda += m_cache_x_large( r_m+n);
......@@ -527,7 +527,7 @@ void bob::math::LPInteriorPointPredictorCorrector::solve(const blitz::Array<doub
// 2) Update the big system and solve it
updateLargeSystem( x, 0., m);
bob::math::linsolve( m_cache_A_large, m_cache_x_large, m_cache_b_large);
bob::math::linsolve( m_cache_A_large, m_cache_b_large, m_cache_x_large);
// 3) alpha=1
double alpha = 1.;
......@@ -560,7 +560,7 @@ void bob::math::LPInteriorPointPredictorCorrector::solve(const blitz::Array<doub
// 7) Update the big system and solve it
updateLargeSystem( x, 1., m);
bob::math::linsolve( m_cache_A_large, m_cache_x_large, m_cache_b_large);
bob::math::linsolve( m_cache_A_large, m_cache_b_large, m_cache_x_large);
// 8) Update x
m_lambda += m_cache_x_large(r_m+n);
......@@ -690,7 +690,7 @@ void bob::math::LPInteriorPointLongstep::solve(const blitz::Array<double,2>& A,
// 2) Update the big system and solve it
updateLargeSystem(x, m_sigma, m);
bob::math::linsolve(m_cache_A_large, m_cache_x_large, m_cache_b_large);
bob::math::linsolve(m_cache_A_large, m_cache_b_large, m_cache_x_large);
// 3) alpha=1
double alpha = 1.;
......@@ -737,4 +737,3 @@ void bob::math::LPInteriorPointLongstep::solve(const blitz::Array<double,2>& A,
// Launch the long step algorithm
solve(A, b, c, x, m_lambda, m_mu);
}
......@@ -134,7 +134,7 @@ BOB_TRY
bob::math::linsolve(
*PyBlitzArrayCxx_AsBlitz<double,2>(A),
*PyBlitzArrayCxx_AsBlitz<double,1>(b),
*PyBlitzArrayCxx_AsBlitz<double,1>((PyBlitzArrayObject*)retval)
*PyBlitzArrayCxx_AsBlitz<double,1>(retval)
);
break;
......@@ -145,7 +145,7 @@ BOB_TRY
bob::math::linsolve(
*PyBlitzArrayCxx_AsBlitz<double,2>(A),
*PyBlitzArrayCxx_AsBlitz<double,2>(b),
*PyBlitzArrayCxx_AsBlitz<double,2>((PyBlitzArrayObject*)retval)
*PyBlitzArrayCxx_AsBlitz<double,2>(retval)
);
break;
......@@ -300,7 +300,7 @@ BOB_TRY
bob::math::linsolveSympos(
*PyBlitzArrayCxx_AsBlitz<double,2>(A),
*PyBlitzArrayCxx_AsBlitz<double,1>(b),
*PyBlitzArrayCxx_AsBlitz<double,1>((PyBlitzArrayObject*)retval)
*PyBlitzArrayCxx_AsBlitz<double,1>(retval)
);
break;
......@@ -311,7 +311,7 @@ BOB_TRY
bob::math::linsolveSympos(
*PyBlitzArrayCxx_AsBlitz<double,2>(A),
*PyBlitzArrayCxx_AsBlitz<double,2>(b),
*PyBlitzArrayCxx_AsBlitz<double,2>((PyBlitzArrayObject*)retval)
*PyBlitzArrayCxx_AsBlitz<double,2>(retval)
);
break;
......@@ -465,7 +465,7 @@ BOB_TRY
bob::math::linsolveCGSympos(
*PyBlitzArrayCxx_AsBlitz<double,2>(A),
*PyBlitzArrayCxx_AsBlitz<double,1>(b),
*PyBlitzArrayCxx_AsBlitz<double,1>((PyBlitzArrayObject*)retval),
*PyBlitzArrayCxx_AsBlitz<double,1>(retval),
acc, max_iter
);
break;
......
......@@ -83,9 +83,6 @@ static bob::extension::FunctionDoc s_kullback_leibler = bob::extension::Function
;
static bob::extension::FunctionDoc s_pavx = bob::extension::FunctionDoc(
"pavx",
"Applies the Pool-Adjacent-Violators Algorithm",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment