Changeset 1034 for trunk


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/bound_tightening/BTPerfIndicatorConstr.cpp

    r1004 r1034  
    3131  nRuns_           (0),
    3232  problem_         (p),
    33   stats_           ((p             != NULL) &&
     33  stats_           ((p != NULL) &&
    3434                    (GetRawPtr (p -> Jnlst ()) != NULL) &&
    3535                    (p -> Jnlst () -> ProduceOutput (Ipopt::J_ERROR, J_COUENNE))) {}
  • trunk/Couenne/src/bound_tightening/FixPointConstructors.cpp

    r1004 r1034  
    5959     "Choose whether to add an extended fixpoint LP model or a more compact one.",
    6060     "compact",
    61      "extended", "",
    62      "compact", "",
    63      "");
     61     "extended", "Extended model with variables for lower/upper bounds of right-hand sides (see paper by Belotti, Cafieri, Lee, Liberti)",
     62     "compact", "Compact equivalent model obtained by projecting lower/upper bounds of rhs",
     63     "The \"extended\" option is for debugging purposes; the compact formulation is equivalent and this option should be used");
    6464}
  • trunk/Couenne/src/bound_tightening/FixPointGenCuts.cpp

    r1033 r1034  
    394394
    395395    if (treeInfo.inTree &&
    396         treeInfo.level <= 0) {
    397 
     396        treeInfo.level <= 0)
    398397      problem_ -> Jnlst () -> Printf (J_ERROR, J_COUENNE, "%d bounds tightened (%g seconds)\n",
    399398                                      nTightened_ - nInitTightened, CoinCpuTime () - now);
    400     }
    401399
    402400  } else if (fplp -> isProvenPrimalInfeasible ()) {
     
    404402    if (treeInfo.inTree &&
    405403        treeInfo.level <= 0)
    406       problem_ -> Jnlst () -> Printf (J_ERROR, J_BOUNDTIGHTENING, " FPLP infeasible.\n");
     404      problem_ -> Jnlst () -> Printf (J_ERROR, J_COUENNE, " FPLP infeasible.\n");
    407405
    408406    WipeMakeInfeas (cs);
     
    416414    // performance indicator that nothing should change.
    417415
    418     problem_ -> Jnlst () -> Printf (J_ERROR, J_BOUNDTIGHTENING, " FPLP inconclusive, won't be used.\n");
     416    if (treeInfo.inTree &&
     417        treeInfo.level <= 0)
     418      problem_ -> Jnlst () -> Printf (J_ERROR, J_COUENNE, " FPLP inconclusive, won't be used.\n");
    419419
    420420    newLB = oldLB;
Note: See TracChangeset for help on using the changeset viewer.