Skip to content
Snippets Groups Projects

amfe v1.0.5

Merged Adrien Crovato requested to merge adri into master
All threads resolved!
3 files
+ 33
26
Compare changes
  • Side-by-side
  • Inline
Files
3
+ 13
13
@@ -111,7 +111,7 @@ double FleuryLS::run()
double phit = fct.eval(h);
fevalIt = 2;
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Starting Backeting \n";
std::cout << "\t" << std::setprecision(16) << "phi1(" << 0 << ") = " << phi1 << '\n';
@@ -128,14 +128,14 @@ double FleuryLS::run()
{
if (h > hU)
{
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Positive slope detected (in ascending bracketing #1)!\n";
}
if (revAllowed)
{
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Reverse Direction of Line Search (in ascending bracketing #1)!"
<< "\n";
@@ -146,7 +146,7 @@ double FleuryLS::run()
}
else
{
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Error in ascending bracketing #1:\n"
<< std::setprecision(16) << "a1=" << 0 << " a2=" << h << " a3 =" << 2.0 * h << '\n'
@@ -164,7 +164,7 @@ double FleuryLS::run()
phit = fct.eval(2 * h);
fevalIt++;
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Ascending bracketing iteration # " << nB << ": \n";
std::cout << "\t"
@@ -185,14 +185,14 @@ double FleuryLS::run()
{
if (h < hL)
{
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Positive slope detected (in descending bracketing #2)!\n";
}
if (revAllowed)
{
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Reverse Direction of Line Search (in descending bracketing #2) !"
<< "\n";
@@ -203,7 +203,7 @@ double FleuryLS::run()
}
else
{
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Error in descending bracketing #2:\n"
<< std::setprecision(16) << "a1=" << 0 << " a2=" << h << " a3 =" << 2.0 * h << '\n'
@@ -220,7 +220,7 @@ double FleuryLS::run()
phi3 = phit;
phit = fct.eval(h / 2);
fevalIt++;
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Descending bracketing iteration # " << nB << ": \n";
std::cout << "\t"
@@ -241,7 +241,7 @@ double FleuryLS::run()
double a3 = 2 * h;
double a4 = h * (4 * phi2 - 3 * phi1 - phi3) / (4 * phi2 - 2 * phi1 - 2 * phi3);
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Backeting succeeds in " << nB << " iterations : \n";
std::cout << "\t" << std::setprecision(16) << "phi1(" << a1 << ") = " << phi1 << '\n';
@@ -276,7 +276,7 @@ double FleuryLS::run()
throw std::runtime_error(msg.str());
}
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Line search iteration # " << nLS << ": \n";
std::cout << "\t" << std::setprecision(16) << "phi1(" << a1 << ") = " << phi1 << '\n';
@@ -319,7 +319,7 @@ double FleuryLS::run()
A = (a2 - a3) * phi1 + (a3 - a1) * phi2 + (a1 - a2) * phi3;
if (verbose > 2)
if (verbose > 3)
{
std::cout << "\t" << std::setprecision(16) << "|A| = " << fabs(A) << "><" << tol << '\n';
}
@@ -337,7 +337,7 @@ double FleuryLS::run()
(A);
}
if (verbose > 2)
if (verbose > 3)
{
std::cout << "Line search succeeds in " << nLS << " iterations : \n";
std::cout << "\t" << std::setprecision(16) << "|A| = " << fabs(A) << '\n';
Loading