Changeset 1184:3c00344f49c9 in lemon-main

Timestamp:

10/17/18 19:14:07 (6 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

1185:c8d0179a32a2, 1197:f179aa1045a4

Parents:

1183:cd72eae05bdf (diff), 1182:6b79d93e812f (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:

• Makefile.am (deleted)
• cmake/FindCPLEX.cmake (deleted)
• configure.ac (deleted)
• demo/Makefile.am (deleted)
• doc/Makefile.am (deleted)
• lemon/Makefile.am (deleted)
• lemon/adaptors.h (modified) (4 diffs)
• lemon/adaptors.h (modified) (1 diff)
• lemon/config.h.cmake (deleted)
• lemon/lemon.pc.cmake (deleted)
• m4/lx_check_coin.m4 (deleted)
• m4/lx_check_cplex.m4 (deleted)
• m4/lx_check_glpk.m4 (deleted)
• m4/lx_check_soplex.m4 (deleted)
• scripts/Makefile.am (deleted)
• scripts/bib2dox.py (deleted)
• scripts/bootstrap.sh (deleted)
• scripts/chg-len.py (deleted)
• scripts/mk-release.sh (deleted)
• test/Makefile.am (deleted)
• test/preflow_test.cc (deleted)
• tools/Makefile.am (deleted)

lemon/adaptors.h

@@ -3447 +3447 @@
     /// This map adaptor class adapts two node maps of the original digraph
     /// to get a node map of the split digraph.
-    /// Its value type is inherited from the first node map type (\c IN).
-    /// \tparam IN The type of the node map for the in-nodes.
-    /// \tparam OUT The type of the node map for the out-nodes.
-    template <typename IN, typename OUT>
+    /// Its value type is inherited from the first node map type (\c In).
+    /// \tparam In The type of the node map for the in-nodes.
+    /// \tparam Out The type of the node map for the out-nodes.
+    template <typename In, typename Out>
     class CombinedNodeMap {
     public:
@@ -3457 +3457 @@
       typedef Node Key;
       /// The value type of the map
-      typedef typename IN::Value Value;
-
-      typedef typename MapTraits<IN>::ReferenceMapTag ReferenceMapTag;
-      typedef typename MapTraits<IN>::ReturnValue ReturnValue;
-      typedef typename MapTraits<IN>::ConstReturnValue ConstReturnValue;
-      typedef typename MapTraits<IN>::ReturnValue Reference;
-      typedef typename MapTraits<IN>::ConstReturnValue ConstReference;
+      typedef typename In::Value Value;
+
+      typedef typename MapTraits<In>::ReferenceMapTag ReferenceMapTag;
+      typedef typename MapTraits<In>::ReturnValue ReturnValue;
+      typedef typename MapTraits<In>::ConstReturnValue ConstReturnValue;
+      typedef typename MapTraits<In>::ReturnValue Reference;
+      typedef typename MapTraits<In>::ConstReturnValue ConstReference;
 
       /// Constructor
-      CombinedNodeMap(IN& in_map, OUT& out_map)
+      CombinedNodeMap(In& in_map, Out& out_map)
         : _in_map(in_map), _out_map(out_map) {}
 
@@ -3498 +3498 @@
     private:
 
-      IN& _in_map;
-      OUT& _out_map;
+      In& _in_map;
+      Out& _out_map;
 
     };
@@ -3507 +3507 @@
     ///
     /// This function just returns a combined node map.
-    template <typename IN, typename OUT>
-    static CombinedNodeMap<IN, OUT>
-    combinedNodeMap(IN& in_map, OUT& out_map) {
-      return CombinedNodeMap<IN, OUT>(in_map, out_map);
-    }
-
-    template <typename IN, typename OUT>
-    static CombinedNodeMap<const IN, OUT>
-    combinedNodeMap(const IN& in_map, OUT& out_map) {
-      return CombinedNodeMap<const IN, OUT>(in_map, out_map);
-    }
-
-    template <typename IN, typename OUT>
-    static CombinedNodeMap<IN, const OUT>
-    combinedNodeMap(IN& in_map, const OUT& out_map) {
-      return CombinedNodeMap<IN, const OUT>(in_map, out_map);
-    }
-
-    template <typename IN, typename OUT>
-    static CombinedNodeMap<const IN, const OUT>
-    combinedNodeMap(const IN& in_map, const OUT& out_map) {
-      return CombinedNodeMap<const IN, const OUT>(in_map, out_map);
+    template <typename In, typename Out>
+    static CombinedNodeMap<In, Out>
+    combinedNodeMap(In& in_map, Out& out_map) {
+      return CombinedNodeMap<In, Out>(in_map, out_map);
+    }
+
+    template <typename In, typename Out>
+    static CombinedNodeMap<const In, Out>
+    combinedNodeMap(const In& in_map, Out& out_map) {
+      return CombinedNodeMap<const In, Out>(in_map, out_map);
+    }
+
+    template <typename In, typename Out>
+    static CombinedNodeMap<In, const Out>
+    combinedNodeMap(In& in_map, const Out& out_map) {
+      return CombinedNodeMap<In, const Out>(in_map, out_map);
+    }
+
+    template <typename In, typename Out>
+    static CombinedNodeMap<const In, const Out>
+    combinedNodeMap(const In& in_map, const Out& out_map) {
+      return CombinedNodeMap<const In, const Out>(in_map, out_map);
     }
 

lemon/adaptors.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2010
+ * Copyright (C) 2003-2013
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).