Changes in / [467:a1155a9e8e09:462:9b082b3fb33f] in lemon-main

Files:

• lemon/adaptors.h (modified) (6 diffs)
• test/CMakeLists.txt (modified) (2 diffs)
• test/Makefile.am (modified) (4 diffs)
• test/adaptors_test.cc (deleted)
• test/graph_adaptor_test.cc (added)
• tools/lemon-0.x-to-1.x.sh (modified) (1 diff)

lemon/adaptors.h

@@ -2667 +2667 @@
   /// flow and circulation problems.
   ///
-  /// ResidualDigraph can be used for composing the \e residual digraph
-  /// for directed flow and circulation problems. Let \f$ G=(V, A) \f$
-  /// be a directed graph and let \f$ F \f$ be a number type.
-  /// Let \f$ flow, cap: A\to F \f$ be functions on the arcs.
+  /// Residual can be used for composing the \e residual digraph for directed
+  /// flow and circulation problems. Let \f$ G=(V, A) \f$ be a directed graph
+  /// and let \f$ F \f$ be a number type. Let \f$ flow, cap: A\to F \f$ be
+  /// functions on the arcs.
   /// This adaptor implements a digraph structure with node set \f$ V \f$
   /// and arc set \f$ A_{forward}\cup A_{backward} \f$,
@@ -2705 +2705 @@
 #ifdef DOXYGEN
   template<typename GR, typename CM, typename FM, typename TL>
-  class ResidualDigraph
+  class Residual
 #else
   template<typename GR,
@@ -2711 +2711 @@
            typename FM = CM,
            typename TL = Tolerance<typename CM::Value> >
-  class ResidualDigraph :
+  class Residual :
     public FilterArcs<
       Undirector<const GR>,
@@ -2731 +2731 @@
 
     typedef typename CapacityMap::Value Value;
-    typedef ResidualDigraph Adaptor;
+    typedef Residual Adaptor;
 
   protected:
@@ -2762 +2762 @@
     /// Constructor of the residual digraph adaptor. The parameters are the
     /// digraph, the capacity map, the flow map, and a tolerance object.
-    ResidualDigraph(const Digraph& digraph, const CapacityMap& capacity,
-                    FlowMap& flow, const Tolerance& tolerance = Tolerance())
+    Residual(const Digraph& digraph, const CapacityMap& capacity,
+             FlowMap& flow, const Tolerance& tolerance = Tolerance())
       : Parent(), _capacity(&capacity), _flow(&flow), _graph(digraph),
         _forward_filter(capacity, flow, tolerance),
@@ -2870 +2870 @@
   /// \relates Residual
   template<typename GR, typename CM, typename FM>
-  ResidualDigraph<GR, CM, FM>
-  residualDigraph(const GR& digraph, const CM& capacity_map, FM& flow_map) {
-    return ResidualDigraph<GR, CM, FM> (digraph, capacity_map, flow_map);
+  Residual<GR, CM, FM> residual(const GR& digraph,
+                                const CM& capacity_map,
+                                FM& flow_map) {
+    return Residual<GR, CM, FM> (digraph, capacity_map, flow_map);
   }
 

test/CMakeLists.txt

@@ -4 +4 @@
 
 SET(TESTS
-  adaptors_test
   bfs_test
   circulation_test
@@ -13 +12 @@
   dim_test
   error_test
+  graph_adaptor_test
   graph_copy_test
   graph_test

test/Makefile.am

@@ -7 +7 @@
 
 check_PROGRAMS += \
-        test/adaptors_test \
         test/bfs_test \
         test/circulation_test \
@@ -16 +15 @@
         test/dim_test \
         test/error_test \
+        test/graph_adaptor_test \
         test/graph_copy_test \
         test/graph_test \
@@ -44 +44 @@
 XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
 
-test_adaptors_test_SOURCES = test/adaptors_test.cc
 test_bfs_test_SOURCES = test/bfs_test.cc
 test_circulation_test_SOURCES = test/circulation_test.cc
@@ -53 +52 @@
 test_dim_test_SOURCES = test/dim_test.cc
 test_error_test_SOURCES = test/error_test.cc
+test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc
 test_graph_copy_test_SOURCES = test/graph_copy_test.cc
 test_graph_test_SOURCES = test/graph_test.cc

tools/lemon-0.x-to-1.x.sh

@@ -93 +93 @@
         -e "s/\<BoundingBox\>/Box/g"\
         -e "s/\<readNauty\>/readNautyGraph/g"\
-        -e "s/\<RevDigraphAdaptor\>/ReverseDigraph/g"\
-        -e "s/\<revDigraphAdaptor\>/reverseDigraph/g"\
-        -e "s/\<SubDigraphAdaptor\>/SubDigraph/g"\
-        -e "s/\<subDigraphAdaptor\>/subDigraph/g"\
-        -e "s/\<SubGraphAdaptor\>/SubGraph/g"\
-        -e "s/\<subGraphAdaptor\>/subGraph/g"\
-        -e "s/\<NodeSubDigraphAdaptor\>/FilterNodes/g"\
-        -e "s/\<nodeSubDigraphAdaptor\>/filterNodes/g"\
-        -e "s/\<ArcSubDigraphAdaptor\>/FilterArcs/g"\
-        -e "s/\<arcSubDigraphAdaptor\>/filterArcs/g"\
-        -e "s/\<UndirDigraphAdaptor\>/Undirector/g"\
-        -e "s/\<undirDigraphAdaptor\>/undirector/g"\
-        -e "s/\<ResDigraphAdaptor\>/ResidualDigraph/g"\
-        -e "s/\<resDigraphAdaptor\>/residualDigraph/g"\
-        -e "s/\<SplitDigraphAdaptor\>/SplitNodes/g"\
-        -e "s/\<splitDigraphAdaptor\>/splitNodes/g"\
-        -e "s/\<SubGraphAdaptor\>/SubGraph/g"\
-        -e "s/\<subGraphAdaptor\>/subGraph/g"\
-        -e "s/\<NodeSubGraphAdaptor\>/FilterNodes/g"\
-        -e "s/\<nodeSubGraphAdaptor\>/filterNodes/g"\
-        -e "s/\<ArcSubGraphAdaptor\>/FilterEdges/g"\
-        -e "s/\<arcSubGraphAdaptor\>/filterEdges/g"\
-        -e "s/\<DirGraphAdaptor\>/Orienter/g"\
-        -e "s/\<dirGraphAdaptor\>/orienter/g"\
     <$i > $TMP
     mv $TMP $i