Commit a3db81b4 authored by Kirill Terekhov's avatar Kirill Terekhov

Correct verbosity output in MLMPTILUC solver

parent 8e8cd3b2
...@@ -3938,12 +3938,17 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -3938,12 +3938,17 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
{ {
if (k % 100 == 0) if (k % 100 == 0)
{ {
std::ios save(NULL); #if defined(USE_OMP_FACT)
save.copyfmt(std::cout); #pragma omp critical
std::cout << "LF " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend)); #endif
std::cout << " nnz " << std::setw(10) << LF_Entries.size() << " drops " << std::setw(10) << ndrops_lf; {
std::cout << "\r" << std::flush; std::ios save(NULL);
std::cout.copyfmt(save); save.copyfmt(std::cout);
std::cout << "LF " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend));
std::cout << " nnz " << std::setw(10) << LF_Entries.size() << " drops " << std::setw(10) << ndrops_lf;
std::cout << "\r" << std::flush;
std::cout.copyfmt(save);
}
} }
} }
// iteration done! // iteration done!
...@@ -4194,12 +4199,17 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -4194,12 +4199,17 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
{ {
if (k % 100 == 0) if (k % 100 == 0)
{ {
std::ios save(NULL); #if defined(USE_OMP_FACT)
save.copyfmt(std::cout); #pragma omp critical
std::cout << "EU " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend)); #endif
std::cout << " nnz " << std::setw(10) << EU_Entries.size() << " drops " << std::setw(10) << ndrops_eu; {
std::cout << "\r" << std::flush; std::ios save(NULL);
std::cout.copyfmt(save); save.copyfmt(std::cout);
std::cout << "EU " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend));
std::cout << " nnz " << std::setw(10) << EU_Entries.size() << " drops " << std::setw(10) << ndrops_eu;
std::cout << "\r" << std::flush;
std::cout.copyfmt(save);
}
} }
} }
} }
...@@ -4263,11 +4273,16 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -4263,11 +4273,16 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
{ {
if (k % 100 == 0) if (k % 100 == 0)
{ {
std::ios save(NULL); #if defined(USE_OMP_FACT)
save.copyfmt(std::cout); #pragma omp critical
std::cout << "Schur column norm " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend)); #endif
std::cout << "\t\t\r" << std::flush; {
std::cout.copyfmt(save); std::ios save(NULL);
save.copyfmt(std::cout);
std::cout << "Schur column norm " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend));
std::cout << "\t\t\r" << std::flush;
std::cout.copyfmt(save);
}
} }
} }
} }
...@@ -4347,12 +4362,17 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -4347,12 +4362,17 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
{ {
if (k % 100 == 0) if (k % 100 == 0)
{ {
std::ios save(NULL); #if defined(USE_OMP_FACT)
save.copyfmt(std::cout); #pragma omp critical
std::cout << "Schur " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend)); #endif
std::cout << " nnz " << std::setw(10) << S_Entries.size() << " drop S " << ndrops_s; {
std::cout << "\t\t\r" << std::flush; std::ios save(NULL);
std::cout.copyfmt(save); save.copyfmt(std::cout);
std::cout << "Schur " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend));
std::cout << " nnz " << std::setw(10) << S_Entries.size() << " drop S " << ndrops_s;
std::cout << "\t\t\r" << std::flush;
std::cout.copyfmt(save);
}
} }
} }
} }
......
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