Commit 1aacdfbb authored by Florian Wittkamp's avatar Florian Wittkamp

Bugfix: Workflow && CG abort criterium

parent c1297e4c
......@@ -3962,7 +3962,7 @@ int main(int argc, char **argv){
/* ------------------------------------------- */
/* Check when Workflow is used */
/* ------------------------------------------- */
if(USE_WORKFLOW && (diff<=pro || wolfe_SLS_failed)){
if(USE_WORKFLOW && ( diff<=pro || wolfe_SLS_failed || step3==1 )){
if(workflow_lines==WORKFLOW_STAGE){
fprintf(FP,"\n Reached the abort criterion of pro = %4.2f: diff = %4.2f \n",pro,diff);
......@@ -3995,7 +3995,7 @@ int main(int argc, char **argv){
wolfe_SLS_failed=0;
step3=0;
step3=0;
JOINT_EQUAL_new_max=1;
}
......@@ -4033,8 +4033,8 @@ int main(int argc, char **argv){
wolfe_SLS_failed=0;
alpha_SL_old=1;
step3=0;
JOINT_EQUAL_new_max=1;
step3=0;
JOINT_EQUAL_new_max=1;
}
/* ------------------------------------------------- */
......@@ -4071,8 +4071,8 @@ int main(int argc, char **argv){
wolfe_SLS_failed=0;
alpha_SL_old=1;
step3=0;
JOINT_EQUAL_new_max=1;
step3=0;
JOINT_EQUAL_new_max=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