COIN-OR::LEMON - Graph Library

Changes in / [98:c4582fc14f58:99:dbaa96cc1013] in lemon-main


Ignore:
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r60 r64  
    1414AC_CONFIG_AUX_DIR([build-aux])
    1515AC_CONFIG_MACRO_DIR([m4])
    16 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
     16AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc])
    1717AC_CONFIG_SRCDIR([lemon/list_graph.h])
    1818AC_CONFIG_HEADERS([config.h lemon/config.h])
  • lemon/Makefile.am

    r98 r99  
    1616
    1717lemon_HEADERS += \
     18        lemon/concept_check.h \
    1819        lemon/dim2.h \
     20        lemon/error.h \
     21        lemon/list_graph.h \
    1922        lemon/maps.h \
    2023        lemon/path.h \
    2124        lemon/random.h \
    22         lemon/list_graph.h \
    2325        lemon/tolerance.h
    2426
  • lemon/concepts/digraph.h

    r57 r61  
    349349      Node source(Arc) const { return INVALID; }
    350350
     351      /// \brief Returns the ID of the node.
     352      int id(Node) const { return -1; }
     353
     354      /// \brief Returns the ID of the arc.
     355      int id(Arc) const { return -1; }
     356
     357      /// \brief Returns the node with the given ID.
     358      ///
     359      /// \pre The argument should be a valid node ID in the graph.
     360      Node nodeFromId(int) const { return INVALID; }
     361
     362      /// \brief Returns the arc with the given ID.
     363      ///
     364      /// \pre The argument should be a valid arc ID in the graph.
     365      Arc arcFromId(int) const { return INVALID; }
     366
     367      /// \brief Returns an upper bound on the node IDs.
     368      int maxNodeId() const { return -1; }
     369
     370      /// \brief Returns an upper bound on the arc IDs.
     371      int maxArcId() const { return -1; }
     372
    351373      void first(Node&) const {}
    352374      void next(Node&) const {}
     
    361383      void firstOut(Arc&, const Node&) const {}
    362384      void nextOut(Arc&) const {}
     385
     386      // The second parameter is dummy.
     387      Node fromId(int, Node) const { return INVALID; }
     388      // The second parameter is dummy.
     389      Arc fromId(int, Arc) const { return INVALID; }
     390
     391      // Dummy parameter.
     392      int maxId(Node) const { return -1; }
     393      // Dummy parameter.
     394      int maxId(Arc) const { return -1; }
    363395
    364396      /// \brief The base node of the iterator.
     
    440472        void constraints() {
    441473          checkConcept<IterableDigraphComponent<>, Digraph>();
     474          checkConcept<IDableDigraphComponent<>, Digraph>();
    442475          checkConcept<MappableDigraphComponent<>, Digraph>();
    443476        }
  • lemon/concepts/graph.h

    r57 r61  
    625625      Node target(Arc) const { return INVALID; }
    626626
     627      /// \brief Returns the id of the node.
     628      int id(Node) const { return -1; }
     629
     630      /// \brief Returns the id of the edge.
     631      int id(Edge) const { return -1; }
     632
     633      /// \brief Returns the id of the arc.
     634      int id(Arc) const { return -1; }
     635
     636      /// \brief Returns the node with the given id.
     637      ///
     638      /// \pre The argument should be a valid node id in the graph.
     639      Node nodeFromId(int) const { return INVALID; }
     640
     641      /// \brief Returns the edge with the given id.
     642      ///
     643      /// \pre The argument should be a valid edge id in the graph.
     644      Edge edgeFromId(int) const { return INVALID; }
     645
     646      /// \brief Returns the arc with the given id.
     647      ///
     648      /// \pre The argument should be a valid arc id in the graph.
     649      Arc arcFromId(int) const { return INVALID; }
     650
     651      /// \brief Returns an upper bound on the node IDs.
     652      int maxNodeId() const { return -1; }
     653
     654      /// \brief Returns an upper bound on the edge IDs.
     655      int maxEdgeId() const { return -1; }
     656
     657      /// \brief Returns an upper bound on the arc IDs.
     658      int maxArcId() const { return -1; }
     659
    627660      void first(Node&) const {}
    628661      void next(Node&) const {}
     
    640673      void nextIn(Arc&) const {}
    641674
    642 
    643675      void firstInc(Edge &, bool &, const Node &) const {}
    644676      void nextInc(Edge &, bool &) const {}
     677
     678      // The second parameter is dummy.
     679      Node fromId(int, Node) const { return INVALID; }
     680      // The second parameter is dummy.
     681      Edge fromId(int, Edge) const { return INVALID; }
     682      // The second parameter is dummy.
     683      Arc fromId(int, Arc) const { return INVALID; }
     684
     685      // Dummy parameter.
     686      int maxId(Node) const { return -1; }
     687      // Dummy parameter.
     688      int maxId(Edge) const { return -1; }
     689      // Dummy parameter.
     690      int maxId(Arc) const { return -1; }
    645691
    646692      /// \brief Base node of the iterator
     
    690736        void constraints() {
    691737          checkConcept<IterableGraphComponent<>, Graph>();
     738          checkConcept<IDableGraphComponent<>, Graph>();
    692739          checkConcept<MappableGraphComponent<>, Graph>();
    693740        }
  • lemon/random.h

    r49 r62  
    255255          --curr;
    256256        }
    257         curr[0] = (((curr[0] & hiMask) | (curr[length - 1] & loMask)) >> 1) ^
     257        state[0] = (((state[0] & hiMask) | (curr[length - 1] & loMask)) >> 1) ^
    258258          curr[length - shift] ^ mask[curr[length - 1] & 1ul];
    259259
  • test/Makefile.am

    r96 r99  
    1111        test/dim_test \
    1212        test/graph_test \
     13        test/maps_test \
    1314        test/random_test \
    1415        test/path_test \
     
    2122test_digraph_test_SOURCES = test/digraph_test.cc
    2223test_dim_test_SOURCES = test/dim_test.cc
     24#test_error_test_SOURCES = test/error_test.cc
    2325test_graph_test_SOURCES = test/graph_test.cc
     26test_maps_test_SOURCES = test/maps_test.cc
    2427test_path_test_SOURCES = test/path_test.cc
    2528test_random_test_SOURCES = test/random_test.cc
Note: See TracChangeset for help on using the changeset viewer.