COIN-OR::LEMON - Graph Library

Ignore:
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r419 r410  
    2121        lemon/bfs.h \
    2222        lemon/bin_heap.h \
    23         lemon/circulation.h \
    2423        lemon/color.h \
    2524        lemon/concept_check.h \
  • lemon/dijkstra.h

    r412 r313  
    4848    static Value plus(const Value& left, const Value& right) {
    4949      return left + right;
     50    }
     51    /// \brief Gives back true only if the first value is less than the second.
     52    static bool less(const Value& left, const Value& right) {
     53      return left < right;
     54    }
     55  };
     56
     57  /// \brief Widest path operation traits for the Dijkstra algorithm class.
     58  ///
     59  /// This operation traits class defines all computational operations and
     60  /// constants which are used in the Dijkstra algorithm for widest path
     61  /// computation.
     62  ///
     63  /// \see DijkstraDefaultOperationTraits
     64  template <typename Value>
     65  struct DijkstraWidestPathOperationTraits {
     66    /// \brief Gives back the maximum value of the type.
     67    static Value zero() {
     68      return std::numeric_limits<Value>::max();
     69    }
     70    /// \brief Gives back the minimum of the given two elements.
     71    static Value plus(const Value& left, const Value& right) {
     72      return std::min(left, right);
    5073    }
    5174    /// \brief Gives back true only if the first value is less than the second.
  • scripts/unify-sources.sh

    r411 r353  
    131131    echo $WARNED_FILES out of $TOTAL_FILES files triggered warnings.
    132132
    133     if [ $WARNED_FILES -gt 0 -o $FAILED_FILES -gt 0 ]
     133    if [ $FAILED_FILES -gt 0 ]
     134    then
     135        return 1
     136    elif [ $WARNED_FILES -gt 0 ]
    134137    then
    135138        if [ "$WARNING" == 'INTERACTIVE' ]
    136139        then
    137             echo -n "Are the files with errors/warnings acceptable? (yes/no) "
     140            echo -n "Are the files with warnings acceptable? (yes/no) "
    138141            while read answer
    139142            do
     
    145148                    return 1
    146149                fi
    147                 echo -n "Are the files with errors/warnings acceptable? (yes/no) "
     150                echo -n "Are the files with warnings acceptable? (yes/no) "
    148151            done
    149152        elif [ "$WARNING" == 'WERROR' ]
  • test/Makefile.am

    r419 r404  
    1010check_PROGRAMS += \
    1111        test/bfs_test \
    12         test/circulation_test \
    1312        test/counter_test \
    1413        test/dfs_test \
     
    3736
    3837test_bfs_test_SOURCES = test/bfs_test.cc
    39 test_circulation_test_SOURCES = test/circulation_test.cc
    4038test_counter_test_SOURCES = test/counter_test.cc
    4139test_dfs_test_SOURCES = test/dfs_test.cc
  • test/dijkstra_test.cc

    r412 r293  
    9090      ::SetProcessedMap<concepts::WriteMap<Node,bool> >
    9191      ::SetStandardProcessedMap
    92       ::SetOperationTraits<DijkstraDefaultOperationTraits<VType> >
     92      ::SetOperationTraits<DijkstraWidestPathOperationTraits<VType> >
    9393      ::SetHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
    9494      ::SetStandardHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
Note: See TracChangeset for help on using the changeset viewer.