Ignore:
Timestamp:
May 7, 2007 1:44:28 PM (13 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()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/Couenne/Couenne/src/Makefile.in

    r531 r534  
    413413# Here list all include flags, relative to this "srcdir" directory.  This
    414414# "cygpath" stuff is necessary to compile with native compilers on Windows.
    415 AM_CPPFLAGS = -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/include` \
    416         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/include/operators` \
     415AM_CPPFLAGS = -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
     416        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression/operators` \
    417417        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/branch` -I`$(CYGPATH_W) \
     418        $(COUENNESRCDIR)/src/util` -I`$(CYGPATH_W) \
     419        $(COUENNESRCDIR)/src/convex` -I`$(CYGPATH_W) \
     420        $(COUENNESRCDIR)/src/problem` -I`$(CYGPATH_W) \
    418421        $(OSISRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    419422        -I`$(CYGPATH_W) $(OSIOBJDIR)/inc` -I`$(CYGPATH_W) \
     
    449452        branch/CouenneBranchingObject.hpp \
    450453        branch/CouenneChooseVariable.hpp \
    451         include/operators/exprAbs.h \
    452         include/operators/exprExp.h \
    453         include/operators/exprInv.h \
    454         include/operators/exprMul.h \
    455         include/operators/exprOpp.h \
    456         include/operators/exprBMul.h \
    457         include/operators/exprLog.h \
    458         include/operators/exprDiv.h \
    459         include/operators/exprMin.h \
    460         include/operators/exprBDiv.h \
    461         include/operators/exprSum.h \
    462         include/operators/exprMax.h \
    463         include/operators/exprPow.h \
    464         include/operators/exprSin.h \
    465         include/operators/exprCos.h \
    466         include/operators/exprBSin.h \
    467         include/operators/exprBCos.h \
    468         include/operators/exprSub.h \
    469         include/operators/exprGroup.h \
    470         include/exprConst.h \
    471         include/exprIVar.h \
    472         include/exprVar.h \
    473         include/exprAux.h \
    474         include/exprUnary.h \
    475         include/expression.h \
    476         include/exprClone.h \
    477         include/exprBound.h \
    478         include/exprCopy.h \
    479         include/exprOp.h \
    480         include/CouennePrecisions.h \
    481         include/CouenneProblemElem.h \
    482         include/CouenneProblem.h \
    483         include/CouenneTypes.h \
    484         include/rootQ.h \
    485         include/CouenneCutGenerator.h
     454        expression/operators/exprAbs.h \
     455        expression/operators/exprExp.h \
     456        expression/operators/exprInv.h \
     457        expression/operators/exprMul.h \
     458        expression/operators/exprOpp.h \
     459        expression/operators/exprBMul.h \
     460        expression/operators/exprLog.h \
     461        expression/operators/exprDiv.h \
     462        expression/operators/exprMin.h \
     463        expression/operators/exprBDiv.h \
     464        expression/operators/exprSum.h \
     465        expression/operators/exprMax.h \
     466        expression/operators/exprPow.h \
     467        expression/operators/exprSin.h \
     468        expression/operators/exprCos.h \
     469        expression/operators/exprBSin.h \
     470        expression/operators/exprBCos.h \
     471        expression/operators/exprSub.h \
     472        expression/operators/exprGroup.h \
     473        expression/exprConst.h \
     474        expression/exprIVar.h \
     475        expression/exprVar.h \
     476        expression/exprAux.h \
     477        expression/exprUnary.h \
     478        expression/expression.h \
     479        expression/exprClone.h \
     480        expression/exprBound.h \
     481        expression/exprCopy.h \
     482        expression/exprOp.h \
     483        expression/CouennePrecisions.h \
     484        problem/CouenneProblemElem.h \
     485        problem/CouenneProblem.h \
     486        expression/CouenneTypes.h \
     487        util/rootQ.h \
     488        convex/CouenneCutGenerator.h
    486489
    487490
     
    12001203
    12011204distdir: $(DISTFILES)
    1202         $(mkdir_p) $(distdir)/../inc $(distdir)/branch $(distdir)/include $(distdir)/include/operators
     1205        $(mkdir_p) $(distdir)/../inc $(distdir)/branch $(distdir)/convex $(distdir)/expression $(distdir)/expression/operators $(distdir)/problem $(distdir)/util
    12031206        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    12041207        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
Note: See TracChangeset for help on using the changeset viewer.