Changes in / [406:a578265aa8a6:407:e22fc10ab6f1] in lemon-1.1
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/Makefile.am
r395 r404 21 21 lemon/bfs.h \ 22 22 lemon/bin_heap.h \ 23 lemon/circulation.h \ 23 24 lemon/color.h \ 24 25 lemon/concept_check.h \ -
lemon/dijkstra.h
r313 r397 48 48 static Value plus(const Value& left, const Value& right) { 49 49 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 and60 /// constants which are used in the Dijkstra algorithm for widest path61 /// computation.62 ///63 /// \see DijkstraDefaultOperationTraits64 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);73 50 } 74 51 /// \brief Gives back true only if the first value is less than the second. -
scripts/unify-sources.sh
r341 r396 131 131 echo $WARNED_FILES out of $TOTAL_FILES files triggered warnings. 132 132 133 if [ $FAILED_FILES -gt 0 ] 134 then 135 return 1 136 elif [ $WARNED_FILES -gt 0 ] 133 if [ $WARNED_FILES -gt 0 -o $FAILED_FILES -gt 0 ] 137 134 then 138 135 if [ "$WARNING" == 'INTERACTIVE' ] 139 136 then 140 echo -n "Are the files with warnings acceptable? (yes/no) "137 echo -n "Are the files with errors/warnings acceptable? (yes/no) " 141 138 while read answer 142 139 do … … 148 145 return 1 149 146 fi 150 echo -n "Are the files with warnings acceptable? (yes/no) "147 echo -n "Are the files with errors/warnings acceptable? (yes/no) " 151 148 done 152 149 elif [ "$WARNING" == 'WERROR' ] -
test/Makefile.am
r389 r404 10 10 check_PROGRAMS += \ 11 11 test/bfs_test \ 12 test/circulation_test \ 12 13 test/counter_test \ 13 14 test/dfs_test \ … … 36 37 37 38 test_bfs_test_SOURCES = test/bfs_test.cc 39 test_circulation_test_SOURCES = test/circulation_test.cc 38 40 test_counter_test_SOURCES = test/counter_test.cc 39 41 test_dfs_test_SOURCES = test/dfs_test.cc -
test/dijkstra_test.cc
r293 r397 90 90 ::SetProcessedMap<concepts::WriteMap<Node,bool> > 91 91 ::SetStandardProcessedMap 92 ::SetOperationTraits<Dijkstra WidestPathOperationTraits<VType> >92 ::SetOperationTraits<DijkstraDefaultOperationTraits<VType> > 93 93 ::SetHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > > 94 94 ::SetStandardHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
Note: See TracChangeset
for help on using the changeset viewer.