Changeset 104


Ignore:
Timestamp:
Nov 2, 2006 2:08:51 PM (12 years ago)
Author:
pbonami
Message:

Fixes too few degrees of freedom

Location:
branches/devel/Bonmin/src/Interfaces
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/src/Interfaces/BonOsiTMINLPInterface.cpp

    r101 r104  
    21032103
    21042104#if 1
    2105   if(optimization_status_ == -10)//Too few degrees of freedom
     2105  if(optimization_status_ == TNLPSolver::notEnoughFreedom)//Too few degrees of freedom
    21062106    {
    21072107      std::cout<<"Too few degrees of freedom...."<<std::endl;
     
    21612161  else
    21622162#endif
    2163     if(optimization_status_ < -9)//Ipopt failed and the error can not be recovered, throw it
     2163    if(optimization_status_ < -1)//Ipopt failed and the error can not be recovered, throw it
    21642164  {
    21652165    throw newUnsolvedError(optimization_status_);
  • branches/devel/Bonmin/src/Interfaces/BonTNLPSolver.hpp

    r90 r104  
    2828
    2929  enum ReturnStatus /** Standard return statuses for a solver*/{
    30     iterationLimit/** Solver reached iteration limit. */,
    31     computationError /** Some error was made in the computations. */,
    32     illDefinedProblem /** The solver finds that the problem is not well defined. */,
    33     illegalOption /** An option is not valid. */,
    34     externalException /** Some unrecovered exception occured in an external tool used by the solver. */,
    35     exception /** Some unrocevered exception */,
    36     solvedOptimal /** Problem solved to an optimal solution.*/,
    37     solvedOptimalTol /** Problem solved to "acceptable level of tolerance. */,
    38     provenInfeasible /** Infeasibility Proven. */,
    39     unbounded /** Problem is unbounded.*/
     30    iterationLimit = -3/** Solver reached iteration limit. */,
     31    computationError = -2/** Some error was made in the computations. */,
     32    notEnoughFreedom = -1/** not enough degrees of freedom.*/,
     33    illDefinedProblem = -4/** The solver finds that the problem is not well defined. */,
     34    illegalOption =-5/** An option is not valid. */,
     35    externalException =-6/** Some unrecovered exception occured in an external tool used by the solver. */,
     36    exception =-7/** Some unrocevered exception */,
     37    solvedOptimal = 1/** Problem solved to an optimal solution.*/,
     38    solvedOptimalTol =2/** Problem solved to "acceptable level of tolerance. */,
     39    provenInfeasible =3/** Infeasibility Proven. */,
     40    unbounded = 4/** Problem is unbounded.*/
    4041  };
    4142
  • branches/devel/Bonmin/src/Interfaces/Ipopt/BonIpoptSolver.cpp

    r96 r104  
    166166      return computationError;
    167167    case Ipopt::Not_Enough_Degrees_Of_Freedom:
     168      return notEnoughFreedom;
    168169    case Ipopt::Invalid_Problem_Definition:
    169170      return illDefinedProblem;
Note: See TracChangeset for help on using the changeset viewer.