fixed hardcoded SOC cond bypasses

Author: cnpetra

src/Optimization/hiopAlgFilterIPM.cpp

@@ -1441,12 +1441,12 @@ hiopSolveStatus hiopAlgFilterIPMQuasiNewton::run()
                          theta_trial,
                          _alpha_primal);
         nlp->runStats.tmSolverInternal.stop();
-        //break;
+        break;
       }
 
       nlp->runStats.tmSolverInternal.start();
       // second order correction
-      if(true || iniStep && theta <= theta_trial) {
+      if(iniStep && theta <= theta_trial) {
 
         bool grad_phi_dx_soc_computed = false;
         double grad_phi_dx_soc = 0.0;

src/Optimization/hiopResidual.cpp

@@ -485,13 +485,8 @@ void hiopResidual::update_soc(const hiopIterate& it,
   assert(it.sxu->matchesPattern(nlp->get_ixu()));
 #endif
   // rx = -grad_f - J_c^t*x - J_d^t*x+M*zl-M*zu - linear damping term in x
-  //rx->copyFrom(grad);
-  //jac_c.transTimesVec(1.0, *rx, 1.0, *it.yc);
-  //jac_d.transTimesVec(1.0, *rx, 1.0, *it.yd);
-  //rx->axpy(-1.0, *it.zl);
-  //rx->axpy(1.0, *it.zu);
 
-//using rxl as auxiliary variable to compute -M*zl+M*zu
+  //using rxl as auxiliary variable to compute -M*zl+M*zu
   rxl->copyFrom(*it.zu);
   rxl->axpy(-1.0, *it.zl);
   nlp->inner_prod()->apply_M_lumped(*rxl, *rx);
@@ -503,13 +498,10 @@ void hiopResidual::update_soc(const hiopIterate& it,
   //buf = rx->infnorm_local();
   buf = nlp->inner_prod()->norm_stationarity(*rx);
   nrmInf_nlp_optim = fmax(nrmInf_nlp_optim, buf);
-  //nrmOne_nlp_optim += rx->onenorm();
-  nrmOne_nlp_optim += nlp->inner_prod()->norm_M_one(*rx);
+    nrmOne_nlp_optim += nlp->inner_prod()->norm_M_one(*rx);
   nlp->log->printf(hovScalars, "NLP resid [update_soc]: inf norm rx=%22.17e\n", buf);
   logprob.addNonLogBarTermsToGrad_x(1.0, *rx);
   rx->negate();
-  //nrmInf_bar_optim = fmax(nrmInf_bar_optim, rx->infnorm_local());
-  //nrmOne_bar_optim += rx->onenorm();
   nrmInf_bar_optim = fmax(nrmInf_bar_optim, nlp->inner_prod()->norm_stationarity(*rx));
   nrmOne_bar_optim += nlp->inner_prod()->norm_M_one(*rx);