COIN-OR::LEMON - Graph Library

Changeset 366:efbd0ab50a77 in lemon-main


Ignore:
Timestamp:
11/06/08 15:40:32 (16 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
367:9194a12c52e6, 368:a7e8ad460d66
Parents:
363:a637fb9d457b (diff), 365:a12eef1f82b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r363 r366  
    3232        lemon/graph_to_eps.h \
    3333        lemon/grid_graph.h \
     34        lemon/hypercube_graph.h \
    3435        lemon/kruskal.h \
    3536        lemon/lgf_reader.h \
  • lemon/Makefile.am

    r364 r366  
    1313        lemon/random.cc
    1414
    15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
     15#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)
    1616#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
    1717
  • tools/lemon-0.x-to-1.x.sh

    r359 r366  
    8282        -e "s/\<copyGraph\>/graphCopy/g"\
    8383        -e "s/\<copyDigraph\>/digraphCopy/g"\
     84        -e "s/\<HyperCubeDigraph\>/HypercubeGraph/g"\
    8485        -e "s/\<IntegerMap\>/RangeMap/g"\
    8586        -e "s/\<integerMap\>/rangeMap/g"\
  • tools/lemon-0.x-to-1.x.sh

    r365 r366  
    9292        -e "s/\<storeBoolMap\>/loggerBoolMap/g"\
    9393        -e "s/\<BoundingBox\>/Box/g"\
     94        -e "s/\<readNauty\>/readNautyGraph/g"\
    9495    <$i > $TMP
    9596    mv $TMP $i
Note: See TracChangeset for help on using the changeset viewer.