Changeset 575


Ignore:
Timestamp:
Nov 2, 2005 3:38:15 PM (14 years ago)
Author:
andreasw
Message:

astyle...

Location:
branches/dev/Algorithm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/dev/Algorithm/IpBacktrackingLineSearch.cpp

    r574 r575  
    320320      // the tiny step and continue with regular line search
    321321      try {
    322         IpCq().trial_barrier_obj();
    323         IpCq().trial_constraint_violation();
     322        IpCq().trial_barrier_obj();
     323        IpCq().trial_constraint_violation();
    324324      }
    325325      catch(IpoptNLP::Eval_Error& e) {
    326         tiny_step = false;
     326        tiny_step = false;
    327327      }
    328328
    329329      if (tiny_step) {
    330         IpData().Set_info_ls_count(0);
    331 
    332         if (tiny_step_last_iteration_) {
    333           IpData().Set_info_alpha_primal_char('T');
    334           IpData().Set_tiny_step_flag(true);
    335         }
     330        IpData().Set_info_ls_count(0);
     331
     332        if (tiny_step_last_iteration_) {
     333          IpData().Set_info_alpha_primal_char('T');
     334          IpData().Set_tiny_step_flag(true);
     335        }
    336336      }
    337337      else {
  • branches/dev/Algorithm/IpRestoFilterConvCheck.cpp

    r574 r575  
    159159        // ToDo make the factor in following line an option
    160160        if (orig_trial_primal_inf <= 1e2*orig_ip_data->tol()) {
    161           Jnlst().Printf(J_WARNING, J_LINE_SEARCH,
    162                         "Restoration phase converged to a feasible point that is\n"
    163                         "unacceptable to the filter for the original problem.\n");
     161          Jnlst().Printf(J_WARNING, J_LINE_SEARCH,
     162                        "Restoration phase converged to a feasible point that is\n"
     163                        "unacceptable to the filter for the original problem.\n");
    164164          THROW_EXCEPTION(RESTORATION_CONVERGED_TO_FEASIBLE_POINT,
    165165                          "Restoration phase converged to a feasible point that is "
  • branches/dev/Algorithm/IpRestoMinC_1Nrm.cpp

    r574 r575  
    192192    else if (resto_status == MAXITER_EXCEEDED) {
    193193      THROW_EXCEPTION(RESTORATION_MAXITER_EXCEEDED,
    194                       "Maximal number of iterations exceeded in restoration phase.");
     194                      "Maximal number of iterations exceeded in restoration phase.");
    195195    }
    196196    else if (resto_status == LOCAL_INFEASIBILITY) {
     
    200200    else if (resto_status == RESTORATION_FAILURE) {
    201201      Jnlst().Printf(J_WARNING, J_LINE_SEARCH,
    202                      "Restoration phase in the restoration phase failed.\n");
     202                     "Restoration phase in the restoration phase failed.\n");
    203203      THROW_EXCEPTION(RESTORATION_FAILED, "Restoration phase in the restoration phase failed.");
    204204    }
Note: See TracChangeset for help on using the changeset viewer.