COIN-OR::LEMON - Graph Library

Changeset 2392:4bbeaf115cdb in lemon-0.x


Ignore:
Timestamp:
03/05/07 18:10:58 (16 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3223
Message:

Bug whit Parent typedef in SplitGraphAdaptor::CombinedEdgeMap?
Fixing graph to eps parameters for demo

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • demo/disjoint_paths_demo.cc

    r2391 r2392  
    4646
    4747int main() {
    48   cout << "This program calculates the number " <<
    49     "of disjoint paths in a graph" << endl;
     48  cout << "This program calculates the number "
     49    "disjoint paths in a graph" << endl;
    5050  cout << "The graph is read from the disjoint_paths_demo.lgf file" << endl;
    5151  typedef SmartGraph Graph;
     
    7171
    7272  graphToEps(graph, "edge_disjoint_paths.eps").
    73     title("edge disjoint path").copyright("(C) 2003-2007 LEMON Project").drawArrows().
     73    title("edge disjoint paths").scaleToA4().
     74    copyright("(C) 2003-2007 LEMON Project").drawArrows().
    7475    edgeColors(composeMap(functorMap(color), flow)).
    75     coords(coords).autoNodeScale().run();
     76    coords(coords).run();
    7677
    7778
     
    9798
    9899  graphToEps(sgraph, "node_disjoint_paths.eps").
    99     title("node disjoint path").copyright("(C) 2003-2007 LEMON Project").drawArrows().
     100    title("node disjoint paths").scaleToA4().
     101    copyright("(C) 2003-2007 LEMON Project").drawArrows().
    100102    edgeColors(composeMap(functorMap(color), sflow)).
    101103    coords(SGraph::combinedNodeMap(coords,
    102104                                   shiftMap(coords,
    103105                                            dim2::Point<double>(5, 0)))).
    104     autoNodeScale().run();
     106    run();
    105107
    106108  cout << "The paths are written into node_disjoint_paths.eps" << endl;
  • lemon/graph_adaptor.h

    r2391 r2392  
    26062606    /// get an edge map on the adapted graph.
    26072607    template <typename GraphEdgeMap, typename GraphNodeMap>
    2608     class CombinedEdgeMap
    2609       : public MapBase<Edge, typename GraphEdgeMap::Value> {
     2608    class CombinedEdgeMap {
    26102609    public:
    2611       typedef MapBase<Edge, typename GraphEdgeMap::Value> Parent;
    2612 
    2613       typedef typename Parent::Key Key;
    2614       typedef typename Parent::Value Value;
    2615 
     2610     
     2611      typedef Edge Key;
     2612      typedef typename GraphEdgeMap::Value Value;
     2613     
    26162614      /// \brief Constructor
    26172615      ///
Note: See TracChangeset for help on using the changeset viewer.