Changeset 2001


Ignore:
Timestamp:
Jun 7, 2012 10:17:22 AM (7 years ago)
Author:
pbonami
Message:

Put solver_result_num

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/src/Interfaces/Ampl/BonAmplTMINLP.cpp

    r1999 r2001  
    732732      solve_result_num = 300;
    733733    }
    734     else if (status == TMINLP::LIMIT_EXCEEDED || status == TMINLP::USER_INTERRUPT) {
     734    else if (status == TMINLP::LIMIT_EXCEEDED) {
    735735      status_str = "\t\"Not finished\"";
    736       message = "\n" + appName_ + ": Optimization interrupted " + (status == TMINLP::LIMIT_EXCEEDED ? "on limit." : "by user.");
     736      message = "\n" + appName_ + ": Optimization interrupted on limit.";
    737737      if(x)
    738738        solve_result_num = 421; /* Limit reached or user interrupt with integer feasible solution.*/
    739739      else
    740740        solve_result_num = 410; /* Limit reached or user interrupt without solution.*/
     741    }
     742    else if (status == TMINLP::USER_INTERRUPT) {
     743      status_str = "\t\"Not finished\"";
     744      message = "\n" + appName_ + ": Optimization interrupted by user.";
     745      if(x)
     746        solve_result_num = 422; /* Limit reached or user interrupt with integer feasible solution.*/
     747      else
     748        solve_result_num = 411; /* Limit reached or user interrupt without solution.*/
    741749    }
    742750    else if (status == TMINLP::MINLP_ERROR) {
Note: See TracChangeset for help on using the changeset viewer.