Changes in / [99:dbaa96cc1013:98:c4582fc14f58] in lemon-main
- Files:
-
- 2 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
configure.ac
r64 r60 14 14 AC_CONFIG_AUX_DIR([build-aux]) 15 15 AC_CONFIG_MACRO_DIR([m4]) 16 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc])16 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) 17 17 AC_CONFIG_SRCDIR([lemon/list_graph.h]) 18 18 AC_CONFIG_HEADERS([config.h lemon/config.h]) -
lemon/Makefile.am
r99 r98 16 16 17 17 lemon_HEADERS += \ 18 lemon/concept_check.h \19 18 lemon/dim2.h \ 20 lemon/error.h \21 lemon/list_graph.h \22 19 lemon/maps.h \ 23 20 lemon/path.h \ 24 21 lemon/random.h \ 22 lemon/list_graph.h \ 25 23 lemon/tolerance.h 26 24 -
lemon/concepts/digraph.h
r61 r57 349 349 Node source(Arc) const { return INVALID; } 350 350 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 373 351 void first(Node&) const {} 374 352 void next(Node&) const {} … … 383 361 void firstOut(Arc&, const Node&) const {} 384 362 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; }395 363 396 364 /// \brief The base node of the iterator. … … 472 440 void constraints() { 473 441 checkConcept<IterableDigraphComponent<>, Digraph>(); 474 checkConcept<IDableDigraphComponent<>, Digraph>();475 442 checkConcept<MappableDigraphComponent<>, Digraph>(); 476 443 } -
lemon/concepts/graph.h
r61 r57 625 625 Node target(Arc) const { return INVALID; } 626 626 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 660 627 void first(Node&) const {} 661 628 void next(Node&) const {} … … 673 640 void nextIn(Arc&) const {} 674 641 642 675 643 void firstInc(Edge &, bool &, const Node &) const {} 676 644 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; }691 645 692 646 /// \brief Base node of the iterator … … 736 690 void constraints() { 737 691 checkConcept<IterableGraphComponent<>, Graph>(); 738 checkConcept<IDableGraphComponent<>, Graph>();739 692 checkConcept<MappableGraphComponent<>, Graph>(); 740 693 } -
lemon/random.h
r62 r49 255 255 --curr; 256 256 } 257 state[0] = (((state[0] & hiMask) | (curr[length - 1] & loMask)) >> 1) ^257 curr[0] = (((curr[0] & hiMask) | (curr[length - 1] & loMask)) >> 1) ^ 258 258 curr[length - shift] ^ mask[curr[length - 1] & 1ul]; 259 259 -
test/Makefile.am
r99 r96 11 11 test/dim_test \ 12 12 test/graph_test \ 13 test/maps_test \14 13 test/random_test \ 15 14 test/path_test \ … … 22 21 test_digraph_test_SOURCES = test/digraph_test.cc 23 22 test_dim_test_SOURCES = test/dim_test.cc 24 #test_error_test_SOURCES = test/error_test.cc25 23 test_graph_test_SOURCES = test/graph_test.cc 26 test_maps_test_SOURCES = test/maps_test.cc27 24 test_path_test_SOURCES = test/path_test.cc 28 25 test_random_test_SOURCES = test/random_test.cc
Note: See TracChangeset
for help on using the changeset viewer.