Changeset 1421


Ignore:
Timestamp:
Apr 24, 2009 10:09:22 AM (11 years ago)
Author:
pbonami
Message:

Messages for Debug

Location:
trunk/Bonmin/src/Algorithms/OaGenerators
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/src/Algorithms/OaGenerators/BonFpForMinlp.cpp

    r1420 r1421  
    132132      set_fp_objective(*lp, nlp_->getColSolution());
    133133      lp->initialSolve();
    134       //lp->setColUpper(numcols, cutoff);
     134      lp->setColUpper(numcols, cutoff);
    135135      subMip->find_good_sol(DBL_MAX, parameters_.subMilpLogLevel_,
    136136      //subMip->optimize(DBL_MAX, parameters_.subMilpLogLevel_,
     
    216216
    217217
     218      handler_->message(FP_ITERATION, messages_)
     219      <<nLocalSearch_<<cutoff<<CoinMessageEol;
    218220
    219221      int numberCuts = cs.sizeRowCuts() - numberCutsBefore;
     
    236238        set_fp_objective(*lp, nlp_->getColSolution());
    237239
    238         //lp->setColUpper(numcols, cutoff);
    239 
     240        lp->setColUpper(numcols, cutoff);
    240241     
     242        if(nLocalSearch_ == 13){
     243          printf("Here\n");
     244        }
    241245        subMip->find_good_sol(DBL_MAX, parameters_.subMilpLogLevel_,
    242246        //subMip->optimize(DBL_MAX, parameters_.subMilpLogLevel_,
  • trunk/Bonmin/src/Algorithms/OaGenerators/BonOAMessages.cpp

    r1410 r1421  
    3030    ADD_MSG(LP_ERROR,std_m,2,"Error of LP approximation %g");
    3131    ADD_MSG(PERIODIC_MSG, std_m,1,"After %7.1f seconds, upper bound %10g, lower bound %10g");
    32     ADD_MSG(FP_DISTANCE, std_m,1,"NLP solution is %g from MILP sol");
    33     ADD_MSG(FP_MILP_VAL, std_m,1,"MILP solution has value w.r.t original objective: %10g");
     32    ADD_MSG(FP_DISTANCE, std_m,2,"NLP solution is %g from MILP sol");
     33    ADD_MSG(FP_MILP_VAL, std_m,2,"MILP solution has value w.r.t original objective: %10g");
     34    ADD_MSG(FP_ITERATION, std_m,1,"Major iteration %i ub: %g");
    3435  }
    3536
  • trunk/Bonmin/src/Algorithms/OaGenerators/BonOAMessages.hpp

    r1407 r1421  
    2727    FP_DISTANCE,
    2828    FP_MILP_VAL,
     29    FP_ITERATION,
    2930    DUMMY_END
    3031  };
Note: See TracChangeset for help on using the changeset viewer.