Changeset 1438

Timestamp:

Jun 21, 2009 6:28:02 AM (10 years ago)

Author:

pbonami

Message:

Merge r1435 into trunk

Location:

trunk/Bonmin/src

Files:

• CbcBonmin/BonCbc.cpp (modified) (1 diff)
• CbcBonmin/BonCbc.hpp (modified) (1 diff)
• Interfaces/Ampl/BonAmplTMINLP.cpp (modified) (2 diffs)
• Interfaces/Ampl/BonAmplTMINLP.hpp (modified) (1 diff)
• Interfaces/BonTMINLP.hpp (modified) (1 diff)

trunk/Bonmin/src/CbcBonmin/BonCbc.cpp

@@ -591 +591 @@
     }
     if (model_.status() == 0) {
+      if(model_.isContinuousUnbounded()){
+        status = TMINLP::CONTINUOUS_UNBOUNDED;
+        mipStatus_ = UnboundedOrInfeasible;
+      }
+      else
       if (bestSolution_) {
         status = TMINLP::SUCCESS;

trunk/Bonmin/src/CbcBonmin/BonCbc.hpp

@@ -24 +24 @@
         ProvenInfeasible /** Problem has been proven to be infeasible.*/,
         Feasible /** An integer solution to the problem has been found.*/,
+        UnboundedOrInfeasible /*Coninuous relaxation is unbounded.*/,
         NoSolutionKnown/** No feasible solution to the problem is known*/};
     /** Constructor.*/

trunk/Bonmin/src/Interfaces/Ampl/BonAmplTMINLP.cpp

@@ -113 +113 @@
                         )
   {
+    appName_ = appName;
     options->GetEnumValue("file_solution",writeAmplSolFile_,"bonmin.");
     jnlst_ = jnlst;
@@ -659 +660 @@
     if (status == TMINLP::SUCCESS) {
       status_str = "\t\"Finished\"";
-      message = "\nbonmin: Optimal";
+      message = "\n" + appName_ +": Optimal";
     }
     else if (status == TMINLP::INFEASIBLE) {
       status_str = "\t\"Finished\"";
-      message = "\nbonmin: Infeasible problem";
+      message = "\n" + appName_ + ": Infeasible problem";
     }
     else if (status == TMINLP::LIMIT_EXCEEDED) {
       status_str = "\t\"Not finished\"";
-      message = "\n Optimization interupted on limit.";
+      message = "\n" + appName_ + ": Optimization interupted on limit.";
     }
     else if (status == TMINLP::MINLP_ERROR) {
       status_str = "\t\"Aborted\"";
-      message = "\n Error encountered in optimization.";
+      message = "\n" + appName_ + ": Error encountered in optimization.";
     }
     if (writeAmplSolFile_) {

trunk/Bonmin/src/Interfaces/Ampl/BonAmplTMINLP.hpp

@@ -269 +269 @@
     //@}
 
+     /** Name of application.*/
+    std::string appName_;
+
     /** Index of the objective to use for upper bounding*/
     int upperBoundingObj_;

trunk/Bonmin/src/Interfaces/BonTMINLP.hpp

@@ -66 +66 @@
       SUCCESS,
       INFEASIBLE,
+      CONTINUOUS_UNBOUNDED,
       LIMIT_EXCEEDED,
       MINLP_ERROR};