Changeset 533


Ignore:
Timestamp:
May 7, 2007 1:42:39 PM (12 years ago)
Author:
pbelotti
Message:

moved include files to make them doxygenable. Introduced three-way branching, with fixed intervals for now. Added check for small bound interval within all generateCuts()

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/configure

    r481 r533  
    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)
  • trunk/Bonmin/experimental/NotConvex/BonCouenne.cpp

    r522 r533  
    44//
    55// Authors :
    6 // Pietro Belloti, Carnegie Mellon University,
     6// Pietro Belotti, Carnegie Mellon University,
    77// Pierre Bonami, International Business Machines Corporation
    88//
     
    8181
    8282      ////////////////////////////////
    83       int nr, nt;
    84       double st;
     83      int nr=-1, nt=-1;
     84      double st=-1;
    8585
    8686      CouenneCutGenerator *cg = dynamic_cast <CouenneCutGenerator *>
    8787        (bonmin.cutGenerators (). begin () -> cgl);
    8888
    89       cg -> getStats (nr, nt, st);
     89      if (cg)
     90        cg -> getStats (nr, nt, st);
    9091
    9192      char *basename = strrchr (pbName, '/');
     
    9394      else basename++;
    9495
    95       printf ("::: %-25s & %6d & %6d & %6d & %6d & %6d & %6d & %8.3f & ",
     96      printf ("::: %-15s & %6d & %6d & %6d & %6d & %10d & %10d & %8.3f & ",
    9697              basename,
    97               cg -> Problem () -> nVars (),
    98               cg -> Problem () -> nIntVars(),
    99               cg -> Problem () -> nNLCons (),
    100               cg -> Problem () -> nAuxs (),
     98              (cg) ? cg -> Problem () -> nVars   () : -1,
     99              (cg) ? cg -> Problem () -> nIntVars() : -1,
     100              (cg) ? cg -> Problem () -> nNLCons () : -1,
     101              (cg) ? cg -> Problem () -> nAuxs   () : -1,
    101102              nr, nt, st);
    102103
     
    108109
    109110        if (fabs (bb.bestBound()) < 1e12 - 1)
    110           printf (" %12.3f &", bb.bestObj ());
     111          printf    (" %12.3f &", bb.bestObj ());
    111112        else printf (" %8s     &", "inf_dual");
    112          
     113
    113114        if (fabs (bb.bestObj()) < 1e40)
    114           printf (" (%12.3f) &", bb.bestBound ());
    115         else printf (" %8s     &", "inf_prim");
     115          printf    (" (%12.3f) &", bb.bestBound ());
     116        else printf (" %8s       &", "inf_prim");
    116117      }
    117118      else {
     
    119120
    120121        if (fabs (bb.bestBound()) < 1e12 - 1)
    121           printf (" %12.3f &", bb.bestObj ());
     122          printf    (" %12.3f &", bb.bestObj ());
    122123        else printf (" %8s     &", "inf_dual");
    123124         
    124125        if (fabs (bb.bestObj()) < 1e40)
    125           printf ("  %12.3f  &", CoinCpuTime () - time1);
    126         else printf (" %8s     &", "inf_prim");
     126          printf    (" %12.3f   &", CoinCpuTime () - time1);
     127        else printf (" %8s       &", "inf_prim");
    127128      }
    128129
  • trunk/Bonmin/experimental/NotConvex/BonCouenneCbc.cpp

    r502 r533  
    438438                  << violation << std::endl << "Objective: " << obj
    439439                  << " (was "<< model.getObjValue () << " returned by Cbc)." << std::endl;
    440       /*     
     440      /*
    441441      printf ("lp solution: {");
    442442      for (int i=0; i < ecpGen -> getnvars (); i++)
     
    464464    }
    465465    delete si;
    466     std::cout<<"Finished"<<std::endl;
    467 
    468 
    469     if (0) { // print some statistics in LaTeX format
     466
     467    if (1) { // print some statistics in LaTeX format
    470468
    471469      int nr, nt;
  • trunk/Bonmin/experimental/NotConvex/BonCouenneSetup.cpp

    r519 r533  
    218218 
    219219}
    220 
  • trunk/Bonmin/experimental/NotConvex/Makefile.am

    r502 r533  
    8888if COIN_HAS_COUENNE
    8989  AM_CPPFLAGS += \
    90         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/include`\
    91         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/include/operators`\
     90        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
     91        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
     92        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression/operators` \
     93        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/util` \
     94        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/problem` \
    9295        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/branch`
    9396endif
     
    115118# libraries.
    116119fun_LDFLAGS = -rpath $(libdir)
    117 
    118 
  • trunk/Bonmin/experimental/NotConvex/Makefile.in

    r503 r533  
    5555@COIN_HAS_FILTERSQP_TRUE@am__append_4 = -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Filter`
    5656@COIN_HAS_COUENNE_TRUE@am__append_5 = \
    57 @COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/include`\
    58 @COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/include/operators`\
     57@COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
     58@COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
     59@COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression/operators` \
     60@COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/util` \
     61@COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/problem` \
    5962@COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/branch`
    6063
  • trunk/configure

    r500 r533  
    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)
  • trunk/doxydoc/doxygen.conf.in

    r179 r533  
    118118WARN_LOGFILE           =
    119119
    120 INPUT                  = @abs_source_dir@/Bonmin/src @abs_source_dir@/Bonmin/examples/CppExample/MyBonmin.cpp
     120INPUT                  = @abs_source_dir@/Bonmin/src @abs_source_dir@/Bonmin/examples/CppExample/MyBonmin.cpp @abs_source_dir@/Couenne/src
    121121
    122122FILE_PATTERNS          = *.hpp *.h
Note: See TracChangeset for help on using the changeset viewer.