Changeset 500


Ignore:
Timestamp:
Aug 25, 2005 4:58:50 PM (14 years ago)
Author:
andreasw
Message:

changed error message for tiny step

Location:
branches/dev
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/dev/Apps/AmplSolver/AmplTNLP.cpp

    r477 r500  
    458458    }
    459459    else if (status == MAXITER_EXCEEDED) {
    460       message = "Maximum Number of Iterations Exceeded";
     460      message = "Maximum Number of Iterations Exceeded.";
    461461    }
    462462    else if (status == STOP_AT_TINY_STEP) {
    463       message = "Solved To Best Possible Precision";
     463      message = "Search Direction becomes Too Small.";
    464464    }
    465465    else if (status == STOP_AT_ACCEPTABLE_POINT) {
    466       message = "Solved To Acceptable Level";
     466      message = "Solved To Acceptable Level.";
    467467    }
    468468    else if (status == LOCAL_INFEASIBILITY) {
  • branches/dev/Interfaces/IpIpoptApplication.cpp

    r493 r500  
    387387      }
    388388      else if (status == STOP_AT_TINY_STEP) {
    389         retValue = Solved_To_Best_Possible_Precision;
    390         jnlst_->Printf(J_SUMMARY, J_MAIN, "\nEXIT: Solved To Best Possible Precision.\n");
     389        retValue = Search_Direction_Becomes_Too_Small;
     390        jnlst_->Printf(J_SUMMARY, J_MAIN, "\nEXIT: Search Direction becomes Too Small.\n");
    391391      }
    392392      else if (status == STOP_AT_ACCEPTABLE_POINT) {
  • branches/dev/Interfaces/IpReturnCodes.inc

    r434 r500  
    1010      PARAMETER( IP_SOLVE_SUCCEEDED = 0 )
    1111
    12       INTEGER IP_BEST_POSSIBLE_PRECISION
    13       PARAMETER( IP_BEST_POSSIBLE_PRECISION = 1 )
    14 
    1512      INTEGER IP_ACCEPTABLE_LEVEL
    16       PARAMETER( IP_ACCEPTABLE_LEVEL = 2 )
     13      PARAMETER( IP_ACCEPTABLE_LEVEL = 1 )
    1714
    1815      INTEGER IP_INFEASIBLE_PROBLEM
    19       PARAMETER( IP_INFEASIBLE_PROBLEM = 3 )
     16      PARAMETER( IP_INFEASIBLE_PROBLEM = 2 )
     17
     18      INTEGER IP_SEARCH_DIRECTION_TOO_SMALL
     19      PARAMETER( IP_SEARCH_DIRECTION_TOO_SMALL = 3 )
    2020
    2121      INTEGER IP_ITERATION_EXCEEDED
  • branches/dev/Interfaces/IpReturnCodes_inc.h

    r436 r500  
    1717  {
    1818    Solve_Succeeded=0,
    19     Solved_To_Best_Possible_Precision=1,
    20     Solved_To_Acceptable_Level=2,
    21     Infeasible_Problem_Detected=3,
     19    Solved_To_Acceptable_Level=1,
     20    Infeasible_Problem_Detected=2,
     21    Search_Direction_Becomes_Too_Small=3,
    2222
    2323    Maximum_Iterations_Exceeded=-1,
Note: See TracChangeset for help on using the changeset viewer.