Changeset 528 for branches/0.2a


Ignore:
Timestamp:
Apr 30, 2007 4:22:25 PM (12 years ago)
Author:
pbonami
Message:

Test a 0.2a branch

Location:
branches/0.2a
Files:
7 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/0.2a

    • Property svn:externals
      •  

        old new  
        1414Clp           https://projects.coin-or.org/svn/Clp/branches/devel/Clp
        1515Ipopt         https://projects.coin-or.org/svn/Ipopt/trunk/Ipopt
        16 Osi           https://projects.coin-or.org/svn/Osi/branches/devel/Osi
         16Osi           https://projects.coin-or.org/svn/Osi/stable/1.0/Osi
        1717Bcp           https://projects.coin-or.org/svn/Bcp/trunk/Bcp
        1818Couenne       https://projects.coin-or.org/svn/Bonmin/branches/Couenne/Couenne
  • branches/0.2a/Bonmin/configure

    r481 r528  
    26332633        coin_add_cflags="-pipe"
    26342634        coin_dbg_cflags="-g"
    2635         coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall"
     2635        coin_warn_cflags="-pedantic-errors -Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall"
    26362636        case $enable_doscompile in
    26372637          mingw)
     
    34623462        coin_add_cxxflags="-pipe"
    34633463        coin_dbg_cxxflags="-g"
    3464         coin_warn_cxxflags="-Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion"
     3464        coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion"
    34653465        case $enable_doscompile in
    34663466          mingw)
  • branches/0.2a/Bonmin/experimental/Bcp/BM_lp.cpp

    r508 r528  
    251251        if (lower_bound_ > upper_bound()-get_param(BCP_lp_par::Granularity) &&
    252252            par.entry(BM_par::PrintBranchingInfo)) {
    253             printf("\
    254 BM_lp: At node %i : will fathom because of high lower bound\n",
     253            printf("BM_lp: At node %i : will fathom because of high lower bound\n",
    255254                   current_index());
    256255        }
     
    262261        numNlpFailed_ = 0;
    263262        if (par.entry(BM_par::PrintBranchingInfo)) {
    264             printf("\
    265 BM_lp: At node %i : will fathom because of infeasibility\n",
     263            printf("BM_lp: At node %i : will fathom because of infeasibility\n",
    266264                   current_index());
    267265        }
  • branches/0.2a/Bonmin/experimental/NotConvex/BonCouenneSetup.cpp

    r519 r528  
    101101   
    102102    continuousSolver_->findIntegersAndSOS(false);
     103    {
    103104    int numberIntegerObjects = continuousSolver_->numberObjects() > 0;
    104     {
    105105      int numAuxs = couenneProb->nAuxs();
    106106      OsiObject ** objects = new OsiObject*[numAuxs];
     
    214214   
    215215  }
    216   //  OsiTMINLPInterface * BonminAmplSetup::createOsiInterface{
    217   //}
    218  
     216
    219217}
    220218
  • branches/0.2a/Bonmin/src/Algorithms/BonBonminSetup.cpp

    r514 r528  
    348348      options_->SetNumericValue("nlp_solve_frequency", 0, true, true);
    349349    }
    350     //#define GREAT_STUFF_FOR_ANDREAS
     350#define GREAT_STUFF_FOR_ANDREAS
    351351#ifdef GREAT_STUFF_FOR_ANDREAS
    352352    printf("ToDo: Clean me up in Bab::branchAndBound\n");
    353353    OsiCuts cuts;
    354354    nonlinearSolver_->getOuterApproximation(cuts, true, NULL, true);
    355     si->applyCuts(cuts);
     355    continuousSolver_->applyCuts(cuts);
    356356#endif
    357357
  • branches/0.2a/Bonmin/src/Interfaces/BonTMINLP.hpp

    r514 r528  
    347347      upper bounding (to use it hasUpperBoundingObjective should return true).*/
    348348    virtual bool eval_upper_bound_f(Index n, const Number* x,
    349                                     Number& obj_value){}
     349                                    Number& obj_value){
     350    return 0;}
    350351  private:
    351352    /**@name Default Compiler Generated Methods
     
    392393
    393394#endif
     395
  • branches/0.2a/Externals

    r430 r528  
    1414Clp           https://projects.coin-or.org/svn/Clp/branches/devel/Clp
    1515Ipopt         https://projects.coin-or.org/svn/Ipopt/trunk/Ipopt
    16 Osi           https://projects.coin-or.org/svn/Osi/branches/devel/Osi
     16Osi           https://projects.coin-or.org/svn/Osi/stable/1.0/Osi
    1717Bcp           https://projects.coin-or.org/svn/Bcp/trunk/Bcp
    1818Couenne       https://projects.coin-or.org/svn/Bonmin/branches/Couenne/Couenne
  • branches/0.2a/configure

    r500 r528  
    25952595        coin_add_cflags="-pipe"
    25962596        coin_dbg_cflags="-g"
    2597         coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall"
     2597        coin_warn_cflags="-pedantic-errors -Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall"
    25982598        case $enable_doscompile in
    25992599          mingw)
     
    34263426        coin_add_cxxflags="-pipe"
    34273427        coin_dbg_cxxflags="-g"
    3428         coin_warn_cxxflags="-Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion"
     3428        coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion"
    34293429        case $enable_doscompile in
    34303430          mingw)
Note: See TracChangeset for help on using the changeset viewer.