Commit a59e771e authored by Sebastian Wolf's avatar Sebastian Wolf

Restore accidentally removed code.

parent 13648b59
Pipeline #907 passed with stages
in 8 minutes and 58 seconds
......@@ -42,7 +42,7 @@ namespace xerus {
double controlSetFraction = 0.1;
double initialRankEps = 5e-2;
double initialRankEps = 5e-3;
/// Basic constructor
ASDVariant(const size_t _maxIterations, const double _targetRelativeResidual, const double _minimalResidualNormDecrease)
......
......@@ -479,7 +479,7 @@ namespace xerus { namespace impl_TrASD {
// }
if(P > 1 && nonImprovementCounter > 2) {
rankEps = std::min(0.25, 2*rankEps);
rankEps = std::min(0.32, 2*rankEps);
perfData << rankEps;
}
......
......@@ -172,6 +172,20 @@ namespace xerus { namespace uq { namespace impl_uqRaAdf {
} else { // _corePosition > 0
const Tensor shuffledX = reshuffle(x.get_component(_position), {1, 0, 2});
Tensor measCmp, tmp;
#pragma omp parallel for firstprivate(measCmp, tmp)
for(size_t j = 0; j < N; ++j) {
contract(measCmp, positions[_position][j], shuffledX, 1);
if(_position > 1) {
contract(tmp, measCmp, true, leftIsStack[_position-1][j], false, 1);
contract(leftIsStack[_position][j], tmp, measCmp, 1);
} else { // _corePosition == 1
contract(leftIsStack[_position][j], measCmp, true, measCmp, false, 1);
}
contract(leftOughtStack[_position][j], leftOughtStack[_position-1][j], measCmp, 1);
}
}
}
......
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