1.1 --- a/lemon/core.h Fri Aug 09 14:07:27 2013 +0200
1.2 +++ b/lemon/core.h Fri Aug 09 11:28:17 2013 +0200
1.3 @@ -2,7 +2,7 @@
1.4 *
1.5 * This file is a part of LEMON, a generic C++ optimization library.
1.6 *
1.7 - * Copyright (C) 2003-2010
1.8 + * Copyright (C) 2003-2013
1.9 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.10 * (Egervary Research Group on Combinatorial Optimization, EGRES).
1.11 *
1.12 @@ -254,7 +254,7 @@
1.13 }
1.14
1.15 namespace _graph_utils_bits {
1.16 -
1.17 +
1.18 template <typename Graph, typename Enable = void>
1.19 struct CountRedNodesSelector {
1.20 static int count(const Graph &g) {
1.21 @@ -264,13 +264,13 @@
1.22
1.23 template <typename Graph>
1.24 struct CountRedNodesSelector<
1.25 - Graph, typename
1.26 - enable_if<typename Graph::NodeNumTag, void>::type>
1.27 + Graph, typename
1.28 + enable_if<typename Graph::NodeNumTag, void>::type>
1.29 {
1.30 static int count(const Graph &g) {
1.31 return g.redNum();
1.32 }
1.33 - };
1.34 + };
1.35 }
1.36
1.37 /// \brief Function to count the red nodes in the graph.
1.38 @@ -279,7 +279,7 @@
1.39 /// The complexity of the function is O(n) but for some
1.40 /// graph structures it is specialized to run in O(1).
1.41 ///
1.42 - /// If the graph contains a \e redNum() member function and a
1.43 + /// If the graph contains a \e redNum() member function and a
1.44 /// \e NodeNumTag tag then this function calls directly the member
1.45 /// function to query the cardinality of the node set.
1.46 template <typename Graph>
1.47 @@ -288,7 +288,7 @@
1.48 }
1.49
1.50 namespace _graph_utils_bits {
1.51 -
1.52 +
1.53 template <typename Graph, typename Enable = void>
1.54 struct CountBlueNodesSelector {
1.55 static int count(const Graph &g) {
1.56 @@ -298,13 +298,13 @@
1.57
1.58 template <typename Graph>
1.59 struct CountBlueNodesSelector<
1.60 - Graph, typename
1.61 - enable_if<typename Graph::NodeNumTag, void>::type>
1.62 + Graph, typename
1.63 + enable_if<typename Graph::NodeNumTag, void>::type>
1.64 {
1.65 static int count(const Graph &g) {
1.66 return g.blueNum();
1.67 }
1.68 - };
1.69 + };
1.70 }
1.71
1.72 /// \brief Function to count the blue nodes in the graph.
1.73 @@ -313,7 +313,7 @@
1.74 /// The complexity of the function is O(n) but for some
1.75 /// graph structures it is specialized to run in O(1).
1.76 ///
1.77 - /// If the graph contains a \e blueNum() member function and a
1.78 + /// If the graph contains a \e blueNum() member function and a
1.79 /// \e NodeNumTag tag then this function calls directly the member
1.80 /// function to query the cardinality of the node set.
1.81 template <typename Graph>
1.82 @@ -1865,7 +1865,7 @@
1.83
1.84 /// The Digraph type
1.85 typedef GR Digraph;
1.86 -
1.87 +
1.88 protected:
1.89
1.90 class AutoNodeMap : public ItemSetTraits<GR, Node>::template Map<Arc>::Type