COIN-OR::LEMON - Graph Library

Changeset 1284:ad40f7d32846 in lemon for test


Ignore:
Timestamp:
08/11/13 15:28:12 (6 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1266:70b199792735 (diff), 1260:a337a0dd3f75 (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 >=1.2 branch heads

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • test/connectivity_test.cc

    r1259 r1268  
    9898    check(simpleGraph(g), "This graph is simple.");
    9999  }
     100
     101  {
     102    ListGraph g;
     103    ListGraph::NodeMap<bool> map(g);
     104
     105    ListGraph::Node n1 = g.addNode();
     106    ListGraph::Node n2 = g.addNode();
     107
     108    ListGraph::Edge e1 = g.addEdge(n1, n2);
     109    ::lemon::ignore_unused_variable_warning(e1);
     110    check(biNodeConnected(g), "Graph is bi-node-connected");
     111
     112    ListGraph::Node n3 = g.addNode();
     113    ::lemon::ignore_unused_variable_warning(n3);
     114    check(!biNodeConnected(g), "Graph is not bi-node-connected");
     115  }
     116
    100117
    101118  {
  • test/connectivity_test.cc

    r1265 r1268  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2009
     5 * Copyright (C) 2003-2010
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
     
    3030  typedef ListDigraph Digraph;
    3131  typedef Undirector<Digraph> Graph;
    32  
     32
    3333  {
    3434    Digraph d;
    3535    Digraph::NodeMap<int> order(d);
    3636    Graph g(d);
    37    
     37
    3838    check(stronglyConnected(d), "The empty digraph is strongly connected");
    3939    check(countStronglyConnectedComponents(d) == 0,
     
    4949    check(countBiEdgeConnectedComponents(g) == 0,
    5050          "The empty graph has 0 bi-edge-connected component");
    51          
     51
    5252    check(dag(d), "The empty digraph is DAG.");
    5353    check(checkedTopologicalSort(d, order), "The empty digraph is DAG.");
     
    8484    check(countBiEdgeConnectedComponents(g) == 1,
    8585          "This graph has 1 bi-edge-connected component");
    86          
     86
    8787    check(dag(d), "This digraph is DAG.");
    8888    check(checkedTopologicalSort(d, order), "This digraph is DAG.");
     
    120120    Digraph::NodeMap<int> order(d);
    121121    Graph g(d);
    122    
     122
    123123    Digraph::Node n1 = d.addNode();
    124124    Digraph::Node n2 = d.addNode();
     
    127127    Digraph::Node n5 = d.addNode();
    128128    Digraph::Node n6 = d.addNode();
    129    
     129
    130130    d.addArc(n1, n3);
    131131    d.addArc(n3, n2);
     
    155155    check(!parallelFree(g), "This graph is not parallel-free.");
    156156    check(!simpleGraph(g), "This graph is not simple.");
    157    
     157
    158158    d.addArc(n3, n3);
    159    
     159
    160160    check(!loopFree(d), "This digraph is not loop-free.");
    161161    check(!loopFree(g), "This graph is not loop-free.");
    162162    check(!simpleGraph(d), "This digraph is not simple.");
    163    
     163
    164164    d.addArc(n3, n2);
    165    
     165
    166166    check(!parallelFree(d), "This digraph is not parallel-free.");
    167167  }
    168  
     168
    169169  {
    170170    Digraph d;
    171171    Digraph::ArcMap<bool> cutarcs(d, false);
    172172    Graph g(d);
    173    
     173
    174174    Digraph::Node n1 = d.addNode();
    175175    Digraph::Node n2 = d.addNode();
     
    191191    d.addArc(n6, n7);
    192192    d.addArc(n7, n6);
    193    
     193
    194194    check(!stronglyConnected(d), "This digraph is not strongly connected");
    195195    check(countStronglyConnectedComponents(d) == 3,
     
    254254    Digraph d;
    255255    Digraph::NodeMap<int> order(d);
    256    
     256
    257257    Digraph::Node belt = d.addNode();
    258258    Digraph::Node trousers = d.addNode();
     
    275275    d.addArc(shirt, necktie);
    276276    d.addArc(necktie, coat);
    277    
     277
    278278    check(dag(d), "This digraph is DAG.");
    279279    topologicalSort(d, order);
     
    287287    ListGraph g;
    288288    ListGraph::NodeMap<bool> map(g);
    289    
     289
    290290    ListGraph::Node n1 = g.addNode();
    291291    ListGraph::Node n2 = g.addNode();
     
    303303    g.addEdge(n4, n7);
    304304    g.addEdge(n5, n7);
    305    
     305
    306306    check(bipartite(g), "This graph is bipartite");
    307307    check(bipartitePartitions(g, map), "This graph is bipartite");
    308    
     308
    309309    check(map[n1] == map[n2] && map[n1] == map[n6] && map[n1] == map[n7],
    310310          "Wrong bipartitePartitions()");
Note: See TracChangeset for help on using the changeset viewer.