Changeset 1034 for trunk

Timestamp:

Dec 15, 2013 1:05:05 PM (6 years ago)

Author:

pbelotti

Message:

consistent FPLP output, better options

Location:

trunk/Couenne/src/bound_tightening

Files:

• BTPerfIndicatorConstr.cpp (modified) (1 diff)
• FixPointConstructors.cpp (modified) (1 diff)
• FixPointGenCuts.cpp (modified) (3 diffs)

trunk/Couenne/src/bound_tightening/BTPerfIndicatorConstr.cpp

@@ -31 +31 @@
   nRuns_           (0),
   problem_         (p),
-  stats_           ((p             != NULL) && 
+  stats_           ((p != NULL) && 
                     (GetRawPtr (p -> Jnlst ()) != NULL) && 
                     (p -> Jnlst () -> ProduceOutput (Ipopt::J_ERROR, J_COUENNE))) {}

trunk/Couenne/src/bound_tightening/FixPointConstructors.cpp

@@ -59 +59 @@
      "Choose whether to add an extended fixpoint LP model or a more compact one.",
      "compact",
-     "extended", "",
-     "compact", "",
-     "");
+     "extended", "Extended model with variables for lower/upper bounds of right-hand sides (see paper by Belotti, Cafieri, Lee, Liberti)",
+     "compact", "Compact equivalent model obtained by projecting lower/upper bounds of rhs",
+     "The \"extended\" option is for debugging purposes; the compact formulation is equivalent and this option should be used");
 }

trunk/Couenne/src/bound_tightening/FixPointGenCuts.cpp

@@ -394 +394 @@
 
     if (treeInfo.inTree && 
-        treeInfo.level <= 0) {
-
+        treeInfo.level <= 0)
       problem_ -> Jnlst () -> Printf (J_ERROR, J_COUENNE, "%d bounds tightened (%g seconds)\n", 
                                       nTightened_ - nInitTightened, CoinCpuTime () - now); 
-    }
 
   } else if (fplp -> isProvenPrimalInfeasible ()) {
@@ -404 +402 @@
     if (treeInfo.inTree &&
         treeInfo.level <= 0)
-      problem_ -> Jnlst () -> Printf (J_ERROR, J_BOUNDTIGHTENING, " FPLP infeasible.\n");
+      problem_ -> Jnlst () -> Printf (J_ERROR, J_COUENNE, " FPLP infeasible.\n");
 
     WipeMakeInfeas (cs);
@@ -416 +414 @@
     // performance indicator that nothing should change.
 
-    problem_ -> Jnlst () -> Printf (J_ERROR, J_BOUNDTIGHTENING, " FPLP inconclusive, won't be used.\n");
+    if (treeInfo.inTree && 
+        treeInfo.level <= 0)
+      problem_ -> Jnlst () -> Printf (J_ERROR, J_COUENNE, " FPLP inconclusive, won't be used.\n");
 
     newLB = oldLB;