Commit a3db81b4 authored by Kirill Terekhov's avatar Kirill Terekhov
Browse files

Correct verbosity output in MLMPTILUC solver

parent 8e8cd3b2
...@@ -3938,6 +3938,10 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -3938,6 +3938,10 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
{ {
if (k % 100 == 0) if (k % 100 == 0)
{ {
#if defined(USE_OMP_FACT)
#pragma omp critical
#endif
{
std::ios save(NULL); std::ios save(NULL);
save.copyfmt(std::cout); 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 << "LF " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend));
...@@ -3946,6 +3950,7 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -3946,6 +3950,7 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
std::cout.copyfmt(save); std::cout.copyfmt(save);
} }
} }
}
// iteration done! // iteration done!
} }
tt = Timer() - tt; tt = Timer() - tt;
...@@ -4194,6 +4199,10 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -4194,6 +4199,10 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
{ {
if (k % 100 == 0) if (k % 100 == 0)
{ {
#if defined(USE_OMP_FACT)
#pragma omp critical
#endif
{
std::ios save(NULL); std::ios save(NULL);
save.copyfmt(std::cout); 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 << "EU " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend));
...@@ -4203,6 +4212,7 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -4203,6 +4212,7 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
} }
} }
} }
}
tt = Timer() - tt; tt = Timer() - tt;
if (verbosity > 1) if (verbosity > 1)
{ {
...@@ -4263,6 +4273,10 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -4263,6 +4273,10 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
{ {
if (k % 100 == 0) if (k % 100 == 0)
{ {
#if defined(USE_OMP_FACT)
#pragma omp critical
#endif
{
std::ios save(NULL); std::ios save(NULL);
save.copyfmt(std::cout); 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 << "Schur column norm " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend));
...@@ -4271,6 +4285,7 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -4271,6 +4285,7 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
} }
} }
} }
}
#if defined(USE_OMP_FACT) #if defined(USE_OMP_FACT)
#pragma omp for #pragma omp for
#endif #endif
...@@ -4347,6 +4362,10 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -4347,6 +4362,10 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
{ {
if (k % 100 == 0) if (k % 100 == 0)
{ {
#if defined(USE_OMP_FACT)
#pragma omp critical
#endif
{
std::ios save(NULL); std::ios save(NULL);
save.copyfmt(std::cout); 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 << "Schur " << std::setw(6) << std::fixed << std::setprecision(2) << 100.f * (k - cend + 1) / (1.f * (wend - cend));
...@@ -4356,6 +4375,7 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1; ...@@ -4356,6 +4375,7 @@ const INMOST_DATA_ENUM_TYPE UNDEF = ENUMUNDEF, EOL = ENUMUNDEF - 1;
} }
} }
} }
}
// Schur complement row done // Schur complement row done
} }
......
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