cleaning up

Author: cnpetra

src/Optimization/hiopResidual.hpp

@@ -87,7 +87,8 @@ class hiopResidual
    *      c_soc = c_rhs - c_body and d_soc = d - d_body
    *
    * computed in c_eval and d_eval, respectively.
-   * The method modifies 'this', in particular ryd,ryc, rxl,rxu, rdl, rdu in an attemp
+   * The method modifies 'this', in particular ryd, ryc, rxl,rxu, rdl, rdu in an attempt
+   * to reuse storage/buffers
    */
   virtual void update_soc(const hiopIterate& it,
                           const hiopVector& c_soc,
@@ -115,11 +116,14 @@ class hiopResidual
   inline double getInfeasInfNorm() const { return nrmInf_nlp_feasib; }
   /* get the previously computed Infeasibility */
   inline double get_theta() const { return nrmOne_nlp_feasib; }
-  /* evaluate the Infeasibility at the new iterate, which has eq and ineq functions
+  
+  /**
+   * Evaluate the infeasibility at the new iterate, which has eq and ineq functions
    * computed in c_eval and d_eval, respectively.
    * The method modifies 'this', in particular ryd,ryc, rxl,rxu, rdl, rdu in an attempt
    * to reuse storage/buffers, but does not update the cached nrmInf_XXX members.
-   * It computes and returns the one norm of [ryc ryd] */
+   * It computes and returns the one norm of [ryc ryd] 
+   */
   double compute_nlp_infeasib_onenorm(const hiopIterate& iter, const hiopVector& c_eval, const hiopVector& d_eval);
 
   /* residual printing function - calls hiopVector::print
@@ -170,6 +174,7 @@ class hiopResidual
    *  for the nlp (\mu=0)
    */
   double nrmInf_nlp_optim, nrmInf_nlp_feasib, nrmInf_nlp_complem;
+
   /** storage for the norm of [rx,rd], [rxl,...,rdu,ryc,ryd], and [rszl,...,rsvu]
    *  for the barrier subproblem
    */
@@ -185,6 +190,8 @@ class hiopResidual
   /** inf norm of constraint violation */
   double nrmInf_cons_violation;
 
+  
+  
   // and associated info from problem formulation
   hiopNlpFormulation* nlp;
 

src/Utils/hiopRunStats.hpp

@@ -376,10 +376,10 @@ class hiopRunStats
        << (tmEvalObj.getElapsedTime() + tmEvalGrad_f.getElapsedTime() + tmEvalCons.getElapsedTime() +
            tmEvalJac_con.getElapsedTime() + tmEvalHessL.getElapsedTime())
        << "s  "
-       << "( obj=" << tmEvalObj.getElapsedTime() << " grad=" << tmEvalGrad_f.getElapsedTime()
+       << "(obj=" << tmEvalObj.getElapsedTime() << " grad=" << tmEvalGrad_f.getElapsedTime()
        << " cons=" << tmEvalCons.getElapsedTime() << " Jac=" << tmEvalJac_con.getElapsedTime()
        << " Hess=" << tmEvalHessL.getElapsedTime() << ") " 
-       << " WeigInProd=(" << tm_eval_M_apply.getElapsedTime() << " " << tm_eval_H_apply.getElapsedTime() << " "
+       << " WIProd=(" << tm_eval_M_apply.getElapsedTime() << " " << tm_eval_H_apply.getElapsedTime() << " "
        << tm_eval_Hinv_apply.getElapsedTime() << ")" << std::endl;
 
 #ifdef HIOP_USE_MPI
@@ -402,7 +402,7 @@ class hiopRunStats
 #endif
     ss << "Fcn/deriv #: obj " << nEvalObj << " grad " << nEvalGrad_f << " eq cons " << nEvalCons_eq << " ineq cons "
        << nEvalCons_ineq << " eq Jac " << nEvalJac_con_eq << " ineq Jac " << nEvalJac_con_ineq
-       << "WeigInProd (" << n_eval_M_apply << " " << n_eval_H_apply << " " << n_eval_Hinv_apply << ")" << std::endl;
+       << "  WIProd (" << n_eval_M_apply << " " << n_eval_H_apply << " " << n_eval_Hinv_apply << ")" << std::endl;
 
     return ss.str();
   }