Changeset 1422 for trunk/Bonmin/src


Ignore:
Timestamp:
Apr 24, 2009 6:33:59 PM (11 years ago)
Author:
pbonami
Message:

Remove debug output

Location:
trunk/Bonmin/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/src/Algorithms/BonSubMipSolver.cpp

    r1420 r1422  
    100100      cbc_->setCutoff(cutoff);
    101101
    102       cbc_->solver()->writeMpsNative("FP.mps", NULL, NULL, 1);
     102      //cbc_->solver()->writeMpsNative("FP.mps", NULL, NULL, 1);
    103103     
    104104      cbc_->branchAndBound();
     
    199199      cbc_->setCutoff(cutoff);
    200200
    201       cbc_->solver()->writeMpsNative("FP.mps", NULL, NULL, 1);
     201      //cbc_->solver()->writeMpsNative("FP.mps", NULL, NULL, 1);
    202202      cbc_->branchAndBound();
    203203      lowBound_ = cbc_->getBestPossibleObjValue();
  • trunk/Bonmin/src/Algorithms/OaGenerators/BonFpForMinlp.cpp

    r1421 r1422  
    4343              b.options()->GetIntegerValue("number_before_trust", nTrust, prefix);
    4444              b.options()->GetIntegerValue("Gomory_cuts", mig, prefix);
    45               b.options()->GetIntegerValue("probing_cuts",probe, prefix);
     45//            b.options()->GetIntegerValue("probing_cuts",probe, prefix);
    4646              b.options()->GetIntegerValue("mir_cuts",mir, prefix);
    4747              b.options()->GetIntegerValue("cover_cuts",cover,prefix);
    48              
     48              probe = 0;             
     49              //printf("Probing to 0\n");
    4950              CbcStrategy * strategy =
    5051                new CbcOaStrategy(mig, probe, mir, cover, nTrust,
     
    9899
    99100    bool interuptOnLimit = false;
    100     double lastPeriodicLog= CoinCpuTime();
     101    double lastPeriodicLog = CoinCpuTime();
    101102
    102103    const int numcols = nlp_->getNumCols();
     
    154155#endif
    155156    double * nlpSol = NULL;
    156 
     157    int major_iteration = 0;
    157158    while (colsol) {
    158159      numberPasses++;
     
    187188           //nlp is solved and feasible
    188189           // Update the cutoff
    189            printf("Cutoff increment %g\n", parameters_.cbcCutoffIncrement_);
    190190           cutoff = nlp_->getObjValue() -
    191191                    parameters_.cbcCutoffIncrement_;
    192192           cutoff = nlp_->getObjValue() - 0.1;
    193            printf("New cutoff value %g\n", cutoff);
    194193           numSols_++;
    195194         }
     
    205204           nlp_->setColLower(savedColLower());
    206205           nlp_->setColUpper(savedColUpper());
    207          if(restart)
    208            nlp_->resolve();
     206        if(restart){
     207          major_iteration++;
     208          handler_->message(FP_MAJOR_ITERATION, messages_)
     209          <<major_iteration<<cutoff<<CoinMessageEol;
     210          nlp_->resolve();
     211        }
     212
    209213         //}
    210214      }
     
    216220
    217221
    218       handler_->message(FP_ITERATION, messages_)
     222#if 0
     223      handler_->message(FP_MINOR_ITERATION, messages_)
    219224      <<nLocalSearch_<<cutoff<<CoinMessageEol;
    220 
     225#endif
     226     
    221227      int numberCuts = cs.sizeRowCuts() - numberCutsBefore;
    222228      assert(numberCuts);
     
    240246        lp->setColUpper(numcols, cutoff);
    241247     
    242         if(nLocalSearch_ == 13){
    243           printf("Here\n");
    244         }
    245248        subMip->find_good_sol(DBL_MAX, parameters_.subMilpLogLevel_,
    246249        //subMip->optimize(DBL_MAX, parameters_.subMilpLogLevel_,
  • trunk/Bonmin/src/Algorithms/OaGenerators/BonOACutGenerator2.cpp

    r1410 r1422  
    4343      b.options()->GetIntegerValue("number_before_trust", nTrust,prefix);
    4444      b.options()->GetIntegerValue("Gomory_cuts", mig,prefix);
    45       b.options()->GetIntegerValue("probing_cuts",probe,prefix);
     45      //b.options()->GetIntegerValue("probing_cuts",probe,prefix);
    4646      b.options()->GetIntegerValue("mir_cuts",mir,prefix);
    4747      b.options()->GetIntegerValue("cover_cuts",cover,prefix);
     
    9898
    9999    bool interuptOnLimit = false;
    100     double lastPeriodicLog= CoinCpuTime();
     100    double lastPeriodicLog = CoinCpuTime();
    101101
    102102    //const int numcols = nlp_->getNumCols();
  • trunk/Bonmin/src/Algorithms/OaGenerators/BonOAMessages.cpp

    r1421 r1422  
    3232    ADD_MSG(FP_DISTANCE, std_m,2,"NLP solution is %g from MILP sol");
    3333    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");
     34    ADD_MSG(FP_MAJOR_ITERATION, std_m,1,"Major iteration %i ub: %g");
     35    ADD_MSG(FP_MINOR_ITERATION, std_m,1,"Minor iteration %i ub: %g");
    3536  }
    3637
  • trunk/Bonmin/src/Algorithms/OaGenerators/BonOAMessages.hpp

    r1421 r1422  
    2727    FP_DISTANCE,
    2828    FP_MILP_VAL,
    29     FP_ITERATION,
     29    FP_MAJOR_ITERATION,
     30    FP_MINOR_ITERATION,
    3031    DUMMY_END
    3132  };
  • trunk/Bonmin/src/Algorithms/OaGenerators/BonOaNlpOptim.cpp

    r1360 r1422  
    153153        }
    154154        else
    155           printf("No auxiliary info in nlp solve!\n");
     155          fprintf(stderr,"No auxiliary info in nlp solve!\n");
    156156#endif
    157157
  • trunk/Bonmin/src/CbcBonmin/BonCbc.cpp

    r1413 r1422  
    380380    model_.setMaximumNodes(s.getIntParameter(BabSetupBase::MaxNodes));
    381381
     382    model_.setMaximumNumberIterations(s.getIntParameter(BabSetupBase::MaxIterations));
     383
    382384    model_.setMaximumSolutions(s.getIntParameter(BabSetupBase::MaxSolutions));
    383385
  • trunk/Bonmin/src/Interfaces/BonOsiTMINLPInterface.cpp

    r1414 r1422  
    19541954    }
    19551955    else{
    1956       printf("Objective is linear\n");
    19571956    }
    19581957
Note: See TracChangeset for help on using the changeset viewer.