COIN-OR::LEMON - Graph Library

About

Downloads

Documentation

Development

Issue Tracker

Browse Tickets

Custom Query

Roadmap

Browse Source

Local Info

Mailing Lists

Search

Changeset 452:aea2dc0518ce in lemon-main


Ignore:
Timestamp:
01/09/09 14:03:25 (16 years ago)
Author:
Peter Kovacs <kpeter@…>
Branch:
default
Phase:
public
Message:

Rename convenience functions in subgraph adaptors (#67)

  • Rename hide(), unHide() to disable(), enable().
  • Add new set function status(Item, bool).
  • Remove hidden() and add status() instead (which returns the opposite value).
File:
1 edited

Legend:

Unmodified
Added
Removed

  • lemon/adaptors.h

    r451 r452  
    475475    }
    476476
    477     void hide(const Node& n) const { _node_filter->set(n, false); }
    478     void hide(const Arc& a) const { _arc_filter->set(a, false); }
    479 
    480     void unHide(const Node& n) const { _node_filter->set(n, true); }
    481     void unHide(const Arc& a) const { _arc_filter->set(a, true); }
    482 
    483     bool hidden(const Node& n) const { return !(*_node_filter)[n]; }
    484     bool hidden(const Arc& a) const { return !(*_arc_filter)[a]; }
     477    void status(const Node& n, bool v) const { _node_filter->set(n, v); }
     478    void status(const Arc& a, bool v) const { _arc_filter->set(a, v); }
     479
     480    bool status(const Node& n) const { return (*_node_filter)[n]; }
     481    bool status(const Arc& a) const { return (*_arc_filter)[a]; }
    485482
    486483    typedef False NodeNumTag;
    … …  
    618615    }
    619616
    620     void hide(const Node& n) const { _node_filter->set(n, false); }
    621     void hide(const Arc& e) const { _arc_filter->set(e, false); }
    622 
    623     void unHide(const Node& n) const { _node_filter->set(n, true); }
    624     void unHide(const Arc& e) const { _arc_filter->set(e, true); }
    625 
    626     bool hidden(const Node& n) const { return !(*_node_filter)[n]; }
    627     bool hidden(const Arc& e) const { return !(*_arc_filter)[e]; }
     617    void status(const Node& n, bool v) const { _node_filter->set(n, v); }
     618    void status(const Arc& a, bool v) const { _arc_filter->set(a, v); }
     619
     620    bool status(const Node& n) const { return (*_node_filter)[n]; }
     621    bool status(const Arc& a) const { return (*_arc_filter)[a]; }
    628622
    629623    typedef False NodeNumTag;
    … …  
    775769    }
    776770
    777     /// \brief Hides the given node
    778     ///
    779     /// This function hides the given node in the subdigraph,
    780     /// i.e. the iteration jumps over it.
     771    /// \brief Sets the status of the given node
     772    ///
     773    /// This function sets the status of the given node.
    781774    /// It is done by simply setting the assigned value of \c n
    782     /// to be \c false in the node filter map.
    783     void hide(const Node& n) const { Parent::hide(n); }
    784 
    785     /// \brief Hides the given arc
    786     ///
    787     /// This function hides the given arc in the subdigraph,
    788     /// i.e. the iteration jumps over it.
     775    /// to \c v in the node filter map.
     776    void status(const Node& n, bool v) const { Parent::status(n, v); }
     777
     778    /// \brief Sets the status of the given arc
     779    ///
     780    /// This function sets the status of the given arc.
    789781    /// It is done by simply setting the assigned value of \c a
    790     /// to be \c false in the arc filter map.
    791     void hide(const Arc& a) const { Parent::hide(a); }
    792 
    793     /// \brief Shows the given node
    794     ///
    795     /// This function shows the given node in the subdigraph.
    796     /// It is done by simply setting the assigned value of \c n
    797     /// to be \c true in the node filter map.
    798     void unHide(const Node& n) const { Parent::unHide(n); }
    799 
    800     /// \brief Shows the given arc
    801     ///
    802     /// This function shows the given arc in the subdigraph.
    803     /// It is done by simply setting the assigned value of \c a
    804     /// to be \c true in the arc filter map.
    805     void unHide(const Arc& a) const { Parent::unHide(a); }
    806 
    807     /// \brief Returns \c true if the given node is hidden.
    808     ///
    809     /// This function returns \c true if the given node is hidden.
    810     bool hidden(const Node& n) const { return Parent::hidden(n); }
    811 
    812     /// \brief Returns \c true if the given arc is hidden.
    813     ///
    814     /// This function returns \c true if the given arc is hidden.
    815     bool hidden(const Arc& a) const { return Parent::hidden(a); }
     782    /// to \c v in the arc filter map.
     783    void status(const Arc& a, bool v) const { Parent::status(a, v); }
     784
     785    /// \brief Returns the status of the given node
     786    ///
     787    /// This function returns the status of the given node.
     788    /// It is \c true if the given node is enabled (i.e. not hidden).
     789    bool status(const Node& n) const { return Parent::status(n); }
     790
     791    /// \brief Returns the status of the given arc
     792    ///
     793    /// This function returns the status of the given arc.
     794    /// It is \c true if the given arc is enabled (i.e. not hidden).
     795    bool status(const Arc& a) const { return Parent::status(a); }
     796
     797    /// \brief Disables the given node
     798    ///
     799    /// This function disables the given node in the subdigraph,
     800    /// so the iteration jumps over it.
     801    /// It is the same as \ref status() "status(n, false)".
     802    void disable(const Node& n) const { Parent::status(n, false); }
     803
     804    /// \brief Disables the given arc
     805    ///
     806    /// This function disables the given arc in the subdigraph,
     807    /// so the iteration jumps over it.
     808    /// It is the same as \ref status() "status(a, false)".
     809    void disable(const Arc& a) const { Parent::status(a, false); }
     810
     811    /// \brief Enables the given node
     812    ///
     813    /// This function enables the given node in the subdigraph.
     814    /// It is the same as \ref status() "status(n, true)".
     815    void enable(const Node& n) const { Parent::status(n, true); }
     816
     817    /// \brief Enables the given arc
     818    ///
     819    /// This function enables the given arc in the subdigraph.
     820    /// It is the same as \ref status() "status(a, true)".
     821    void enable(const Arc& a) const { Parent::status(a, true); }
    816822
    817823  };
    … …  
    971977    }
    972978
    973     void hide(const Node& n) const { _node_filter_map->set(n, false); }
    974     void hide(const Edge& e) const { _edge_filter_map->set(e, false); }
    975 
    976     void unHide(const Node& n) const { _node_filter_map->set(n, true); }
    977     void unHide(const Edge& e) const { _edge_filter_map->set(e, true); }
    978 
    979     bool hidden(const Node& n) const { return !(*_node_filter_map)[n]; }
    980     bool hidden(const Edge& e) const { return !(*_edge_filter_map)[e]; }
     979    void status(const Node& n, bool v) const { _node_filter_map->set(n, v); }
     980    void status(const Edge& e, bool v) const { _edge_filter_map->set(e, v); }
     981
     982    bool status(const Node& n) const { return (*_node_filter_map)[n]; }
     983    bool status(const Edge& e) const { return (*_edge_filter_map)[e]; }
    981984
    982985    typedef False NodeNumTag;
    … …  
    11731176    }
    11741177
    1175     void hide(const Node& n) const { _node_filter_map->set(n, false); }
    1176     void hide(const Edge& e) const { _edge_filter_map->set(e, false); }
    1177 
    1178     void unHide(const Node& n) const { _node_filter_map->set(n, true); }
    1179     void unHide(const Edge& e) const { _edge_filter_map->set(e, true); }
    1180 
    1181     bool hidden(const Node& n) const { return !(*_node_filter_map)[n]; }
    1182     bool hidden(const Edge& e) const { return !(*_edge_filter_map)[e]; }
     1178    void status(const Node& n, bool v) const { _node_filter_map->set(n, v); }
     1179    void status(const Edge& e, bool v) const { _edge_filter_map->set(e, v); }
     1180
     1181    bool status(const Node& n) const { return (*_node_filter_map)[n]; }
     1182    bool status(const Edge& e) const { return (*_edge_filter_map)[e]; }
    11831183
    11841184    typedef False NodeNumTag;
    … …  
    13641364    }
    13651365
    1366     /// \brief Hides the given node
    1367     ///
    1368     /// This function hides the given node in the subgraph,
    1369     /// i.e. the iteration jumps over it.
     1366    /// \brief Sets the status of the given node
     1367    ///
     1368    /// This function sets the status of the given node.
    13701369    /// It is done by simply setting the assigned value of \c n
    1371     /// to be \c false in the node filter map.
    1372     void hide(const Node& n) const { Parent::hide(n); }
    1373 
    1374     /// \brief Hides the given edge
    1375     ///
    1376     /// This function hides the given edge in the subgraph,
    1377     /// i.e. the iteration jumps over it.
     1370    /// to \c v in the node filter map.
     1371    void status(const Node& n, bool v) const { Parent::status(n, v); }
     1372
     1373    /// \brief Sets the status of the given edge
     1374    ///
     1375    /// This function sets the status of the given edge.
    13781376    /// It is done by simply setting the assigned value of \c e
    1379     /// to be \c false in the edge filter map.
    1380     void hide(const Edge& e) const { Parent::hide(e); }
    1381 
    1382     /// \brief Shows the given node
    1383     ///
    1384     /// This function shows the given node in the subgraph.
    1385     /// It is done by simply setting the assigned value of \c n
    1386     /// to be \c true in the node filter map.
    1387     void unHide(const Node& n) const { Parent::unHide(n); }
    1388 
    1389     /// \brief Shows the given edge
    1390     ///
    1391     /// This function shows the given edge in the subgraph.
    1392     /// It is done by simply setting the assigned value of \c e
    1393     /// to be \c true in the edge filter map.
    1394     void unHide(const Edge& e) const { Parent::unHide(e); }
    1395 
    1396     /// \brief Returns \c true if the given node is hidden.
    1397     ///
    1398     /// This function returns \c true if the given node is hidden.
    1399     bool hidden(const Node& n) const { return Parent::hidden(n); }
    1400 
    1401     /// \brief Returns \c true if the given edge is hidden.
    1402     ///
    1403     /// This function returns \c true if the given edge is hidden.
    1404     bool hidden(const Edge& e) const { return Parent::hidden(e); }
     1377    /// to \c v in the edge filter map.
     1378    void status(const Edge& e, bool v) const { Parent::status(e, v); }
     1379
     1380    /// \brief Returns the status of the given node
     1381    ///
     1382    /// This function returns the status of the given node.
     1383    /// It is \c true if the given node is enabled (i.e. not hidden).
     1384    bool status(const Node& n) const { return Parent::status(n); }
     1385
     1386    /// \brief Returns the status of the given edge
     1387    ///
     1388    /// This function returns the status of the given edge.
     1389    /// It is \c true if the given edge is enabled (i.e. not hidden).
     1390    bool status(const Edge& e) const { return Parent::status(e); }
     1391
     1392    /// \brief Disables the given node
     1393    ///
     1394    /// This function disables the given node in the subdigraph,
     1395    /// so the iteration jumps over it.
     1396    /// It is the same as \ref status() "status(n, false)".
     1397    void disable(const Node& n) const { Parent::status(n, false); }
     1398
     1399    /// \brief Disables the given edge
     1400    ///
     1401    /// This function disables the given edge in the subgraph,
     1402    /// so the iteration jumps over it.
     1403    /// It is the same as \ref status() "status(e, false)".
     1404    void disable(const Edge& e) const { Parent::status(e, false); }
     1405
     1406    /// \brief Enables the given node
     1407    ///
     1408    /// This function enables the given node in the subdigraph.
     1409    /// It is the same as \ref status() "status(n, true)".
     1410    void enable(const Node& n) const { Parent::status(n, true); }
     1411
     1412    /// \brief Enables the given edge
     1413    ///
     1414    /// This function enables the given edge in the subgraph.
     1415    /// It is the same as \ref status() "status(e, true)".
     1416    void enable(const Edge& e) const { Parent::status(e, true); }
     1417
    14051418  };
    14061419
    … …  
    15201533    }
    15211534
    1522     /// \brief Hides the given node
    1523     ///
    1524     /// This function hides the given node in the subgraph,
    1525     /// i.e. the iteration jumps over it.
     1535    /// \brief Sets the status of the given node
     1536    ///
     1537    /// This function sets the status of the given node.
    15261538    /// It is done by simply setting the assigned value of \c n
    1527     /// to be \c false in the node filter map.
    1528     void hide(const Node& n) const { Parent::hide(n); }
    1529 
    1530     /// \brief Shows the given node
    1531     ///
    1532     /// This function shows the given node in the subgraph.
    1533     /// It is done by simply setting the assigned value of \c n
    1534     /// to be \c true in the node filter map.
    1535     void unHide(const Node& n) const { Parent::unHide(n); }
    1536 
    1537     /// \brief Returns \c true if the given node is hidden.
    1538     ///
    1539     /// This function returns \c true if the given node is hidden.
    1540     bool hidden(const Node& n) const { return Parent::hidden(n); }
     1539    /// to \c v in the node filter map.
     1540    void status(const Node& n, bool v) const { Parent::status(n, v); }
     1541
     1542    /// \brief Returns the status of the given node
     1543    ///
     1544    /// This function returns the status of the given node.
     1545    /// It is \c true if the given node is enabled (i.e. not hidden).
     1546    bool status(const Node& n) const { return Parent::status(n); }
     1547
     1548    /// \brief Disables the given node
     1549    ///
     1550    /// This function disables the given node, so the iteration
     1551    /// jumps over it.
     1552    /// It is the same as \ref status() "status(n, false)".
     1553    void disable(const Node& n) const { Parent::status(n, false); }
     1554
     1555    /// \brief Enables the given node
     1556    ///
     1557    /// This function enables the given node.
     1558    /// It is the same as \ref status() "status(n, true)".
     1559    void enable(const Node& n) const { Parent::status(n, true); }
    15411560
    15421561  };
    … …  
    15701589    }
    15711590
    1572     void hide(const Node& n) const { Parent::hide(n); }
    1573     void unHide(const Node& n) const { Parent::unHide(n); }
    1574     bool hidden(const Node& n) const { return Parent::hidden(n); }
     1591    void status(const Node& n, bool v) const { Parent::status(n, v); }
     1592    bool status(const Node& n) const { return Parent::status(n); }
     1593    void disable(const Node& n) const { Parent::status(n, false); }
     1594    void enable(const Node& n) const { Parent::status(n, true); }
    15751595
    15761596  };
    … …  
    16571677    }
    16581678
    1659     /// \brief Hides the given arc
    1660     ///
    1661     /// This function hides the given arc in the subdigraph,
    1662     /// i.e. the iteration jumps over it.
     1679    /// \brief Sets the status of the given arc
     1680    ///
     1681    /// This function sets the status of the given arc.
    16631682    /// It is done by simply setting the assigned value of \c a
    1664     /// to be \c false in the arc filter map.
    1665     void hide(const Arc& a) const { Parent::hide(a); }
    1666 
    1667     /// \brief Shows the given arc
    1668     ///
    1669     /// This function shows the given arc in the subdigraph.
    1670     /// It is done by simply setting the assigned value of \c a
    1671     /// to be \c true in the arc filter map.
    1672     void unHide(const Arc& a) const { Parent::unHide(a); }
    1673 
    1674     /// \brief Returns \c true if the given arc is hidden.
    1675     ///
    1676     /// This function returns \c true if the given arc is hidden.
    1677     bool hidden(const Arc& a) const { return Parent::hidden(a); }
     1683    /// to \c v in the arc filter map.
     1684    void status(const Arc& a, bool v) const { Parent::status(a, v); }
     1685
     1686    /// \brief Returns the status of the given arc
     1687    ///
     1688    /// This function returns the status of the given arc.
     1689    /// It is \c true if the given arc is enabled (i.e. not hidden).
     1690    bool status(const Arc& a) const { return Parent::status(a); }
     1691
     1692    /// \brief Disables the given arc
     1693    ///
     1694    /// This function disables the given arc in the subdigraph,
     1695    /// so the iteration jumps over it.
     1696    /// It is the same as \ref status() "status(a, false)".
     1697    void disable(const Arc& a) const { Parent::status(a, false); }
     1698
     1699    /// \brief Enables the given arc
     1700    ///
     1701    /// This function enables the given arc in the subdigraph.
     1702    /// It is the same as \ref status() "status(a, true)".
     1703    void enable(const Arc& a) const { Parent::status(a, true); }
    16781704
    16791705  };
    … …  
    17551781    }
    17561782
    1757     /// \brief Hides the given edge
    1758     ///
    1759     /// This function hides the given edge in the subgraph,
    1760     /// i.e. the iteration jumps over it.
     1783    /// \brief Sets the status of the given edge
     1784    ///
     1785    /// This function sets the status of the given edge.
    17611786    /// It is done by simply setting the assigned value of \c e
    1762     /// to be \c false in the edge filter map.
    1763     void hide(const Edge& e) const { Parent::hide(e); }
    1764 
    1765     /// \brief Shows the given edge
    1766     ///
    1767     /// This function shows the given edge in the subgraph.
    1768     /// It is done by simply setting the assigned value of \c e
    1769     /// to be \c true in the edge filter map.
    1770     void unHide(const Edge& e) const { Parent::unHide(e); }
    1771 
    1772     /// \brief Returns \c true if the given edge is hidden.
    1773     ///
    1774     /// This function returns \c true if the given edge is hidden.
    1775     bool hidden(const Edge& e) const { return Parent::hidden(e); }
     1787    /// to \c v in the edge filter map.
     1788    void status(const Edge& e, bool v) const { Parent::status(e, v); }
     1789
     1790    /// \brief Returns the status of the given edge
     1791    ///
     1792    /// This function returns the status of the given edge.
     1793    /// It is \c true if the given edge is enabled (i.e. not hidden).
     1794    bool status(const Edge& e) const { return Parent::status(e); }
     1795
     1796    /// \brief Disables the given edge
     1797    ///
     1798    /// This function disables the given edge in the subgraph,
     1799    /// so the iteration jumps over it.
     1800    /// It is the same as \ref status() "status(e, false)".
     1801    void disable(const Edge& e) const { Parent::status(e, false); }
     1802
     1803    /// \brief Enables the given edge
     1804    ///
     1805    /// This function enables the given edge in the subgraph.
     1806    /// It is the same as \ref status() "status(e, true)".
     1807    void enable(const Edge& e) const { Parent::status(e, true); }
    17761808
    17771809  };
    … …  
    27682800    }
    27692801
    2770     /// \brief Augment on the given arc in the residual digraph.
    2771     ///
    2772     /// Augment on the given arc in the residual digraph. It increases
     2802    /// \brief Augments on the given arc in the residual digraph.
     2803    ///
     2804    /// Augments on the given arc in the residual digraph. It increases
    27732805    /// or decreases the flow value on the original arc according to the
    27742806    /// direction of the residual arc.
Note: See TracChangeset for help on using the changeset viewer.