COIN-OR::LEMON - Graph Library

Changeset 1402:3c00344f49c9 in lemon


Ignore:
Timestamp:
10/17/18 19:14:07 (2 months ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
1403:e5af35e6c93f, 1404:c8d0179a32a2, 1416:f179aa1045a4
Parents:
1401:cd72eae05bdf (diff), 1400: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:
20 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/adaptors.h

    r1270 r1402  
    34473447    /// This map adaptor class adapts two node maps of the original digraph
    34483448    /// to get a node map of the split digraph.
    3449     /// Its value type is inherited from the first node map type (\c IN).
    3450     /// \tparam IN The type of the node map for the in-nodes.
    3451     /// \tparam OUT The type of the node map for the out-nodes.
    3452     template <typename IN, typename OUT>
     3449    /// Its value type is inherited from the first node map type (\c In).
     3450    /// \tparam In The type of the node map for the in-nodes.
     3451    /// \tparam Out The type of the node map for the out-nodes.
     3452    template <typename In, typename Out>
    34533453    class CombinedNodeMap {
    34543454    public:
     
    34573457      typedef Node Key;
    34583458      /// The value type of the map
    3459       typedef typename IN::Value Value;
    3460 
    3461       typedef typename MapTraits<IN>::ReferenceMapTag ReferenceMapTag;
    3462       typedef typename MapTraits<IN>::ReturnValue ReturnValue;
    3463       typedef typename MapTraits<IN>::ConstReturnValue ConstReturnValue;
    3464       typedef typename MapTraits<IN>::ReturnValue Reference;
    3465       typedef typename MapTraits<IN>::ConstReturnValue ConstReference;
     3459      typedef typename In::Value Value;
     3460
     3461      typedef typename MapTraits<In>::ReferenceMapTag ReferenceMapTag;
     3462      typedef typename MapTraits<In>::ReturnValue ReturnValue;
     3463      typedef typename MapTraits<In>::ConstReturnValue ConstReturnValue;
     3464      typedef typename MapTraits<In>::ReturnValue Reference;
     3465      typedef typename MapTraits<In>::ConstReturnValue ConstReference;
    34663466
    34673467      /// Constructor
    3468       CombinedNodeMap(IN& in_map, OUT& out_map)
     3468      CombinedNodeMap(In& in_map, Out& out_map)
    34693469        : _in_map(in_map), _out_map(out_map) {}
    34703470
     
    34983498    private:
    34993499
    3500       IN& _in_map;
    3501       OUT& _out_map;
     3500      In& _in_map;
     3501      Out& _out_map;
    35023502
    35033503    };
     
    35073507    ///
    35083508    /// This function just returns a combined node map.
    3509     template <typename IN, typename OUT>
    3510     static CombinedNodeMap<IN, OUT>
    3511     combinedNodeMap(IN& in_map, OUT& out_map) {
    3512       return CombinedNodeMap<IN, OUT>(in_map, out_map);
    3513     }
    3514 
    3515     template <typename IN, typename OUT>
    3516     static CombinedNodeMap<const IN, OUT>
    3517     combinedNodeMap(const IN& in_map, OUT& out_map) {
    3518       return CombinedNodeMap<const IN, OUT>(in_map, out_map);
    3519     }
    3520 
    3521     template <typename IN, typename OUT>
    3522     static CombinedNodeMap<IN, const OUT>
    3523     combinedNodeMap(IN& in_map, const OUT& out_map) {
    3524       return CombinedNodeMap<IN, const OUT>(in_map, out_map);
    3525     }
    3526 
    3527     template <typename IN, typename OUT>
    3528     static CombinedNodeMap<const IN, const OUT>
    3529     combinedNodeMap(const IN& in_map, const OUT& out_map) {
    3530       return CombinedNodeMap<const IN, const OUT>(in_map, out_map);
     3509    template <typename In, typename Out>
     3510    static CombinedNodeMap<In, Out>
     3511    combinedNodeMap(In& in_map, Out& out_map) {
     3512      return CombinedNodeMap<In, Out>(in_map, out_map);
     3513    }
     3514
     3515    template <typename In, typename Out>
     3516    static CombinedNodeMap<const In, Out>
     3517    combinedNodeMap(const In& in_map, Out& out_map) {
     3518      return CombinedNodeMap<const In, Out>(in_map, out_map);
     3519    }
     3520
     3521    template <typename In, typename Out>
     3522    static CombinedNodeMap<In, const Out>
     3523    combinedNodeMap(In& in_map, const Out& out_map) {
     3524      return CombinedNodeMap<In, const Out>(in_map, out_map);
     3525    }
     3526
     3527    template <typename In, typename Out>
     3528    static CombinedNodeMap<const In, const Out>
     3529    combinedNodeMap(const In& in_map, const Out& out_map) {
     3530      return CombinedNodeMap<const In, const Out>(in_map, out_map);
    35313531    }
    35323532
  • lemon/adaptors.h

    r1401 r1402  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2010
     5 * Copyright (C) 2003-2013
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
Note: See TracChangeset for help on using the changeset viewer.