Context Navigation

Changes in / [403:940587667b47:404:59d3aa4f921f] in lemon-main

Files:

-                      r351
+                      r388
 /**
+@defgroup dimacs_group DIMACS format
+@ingroup io_group
+\brief Read and write files in DIMACS format
+Tools to read a digraph from or write it to a file in DIMACS format data.
+*/
+/**
 @defgroup nauty_group NAUTY Format
 @ingroup io_group
 \brief Read \e Nauty format
 Tool to read graphs from \e Nauty format data.
 */

-                      r399
+                      r404
         lemon/dijkstra.h \
         lemon/dim2.h \
+        lemon/dimacs.h \
         lemon/elevator.h \
         lemon/error.h \
 …
         lemon/nauty_reader.h \
         lemon/path.h \
+        lemon/preflow.h \
         lemon/random.h \
         lemon/smart_graph.h \

-                      r313
+                      r397
     static Value plus(const Value& left, const Value& right) {
       return left + right;
+    }
-    /// \brief Gives back true only if the first value is less than the second.
-    static bool less(const Value& left, const Value& right) {
-      return left < right;
+    }
-  };
-  /// \brief Widest path operation traits for the Dijkstra algorithm class.
-  ///
-  /// This operation traits class defines all computational operations and
-  /// constants which are used in the Dijkstra algorithm for widest path
-  /// computation.
-  ///
-  /// \see DijkstraDefaultOperationTraits
-  template <typename Value>
-  struct DijkstraWidestPathOperationTraits {
-    /// \brief Gives back the maximum value of the type.
-    static Value zero() {
-      return std::numeric_limits<Value>::max();
+    }
-    /// \brief Gives back the minimum of the given two elements.
-    static Value plus(const Value& left, const Value& right) {
-      return std::min(left, right);
+    }
     /// \brief Gives back true only if the first value is less than the second.

-                      r341
+                      r396
     echo $WARNED_FILES out of $TOTAL_FILES files triggered warnings.
+    if [ $FAILED_FILES -gt 0 ]
+    then
+        return 1
+    elif [ $WARNED_FILES -gt 0 ]
+    if [ $WARNED_FILES -gt 0 -o $FAILED_FILES -gt 0 ]
     then
         if [ "$WARNING" == 'INTERACTIVE' ]
         then
             echo -n "Are the files with warnings acceptable? (yes/no) "
+            echo -n "Are the files with errors/warnings acceptable? (yes/no) "
             while read answer
             do
 …
                     return 1
                 fi
                 echo -n "Are the files with warnings acceptable? (yes/no) "
+                echo -n "Are the files with errors/warnings acceptable? (yes/no) "
             done
         elif [ "$WARNING" == 'WERROR' ]

-                      r400
+                      r404
 EXTRA_DIST += \
         test/CMakeLists.txt \
+        test/min_cost_flow_test.lgf
+        test/min_cost_flow_test.lgf \
+        test/preflow_graph.lgf
 noinst_HEADERS += \
 …
         test/random_test \
         test/path_test \
+        test/preflow_test \
         test/suurballe_test \
         test/test_tools_fail \
 …
 test_max_matching_test_SOURCES = test/max_matching_test.cc
 test_path_test_SOURCES = test/path_test.cc
+test_preflow_test_SOURCES = test/preflow_test.cc
 test_suurballe_test_SOURCES = test/suurballe_test.cc
 test_random_test_SOURCES = test/random_test.cc

r293	r397
90	90	::SetProcessedMap<concepts::WriteMap<Node,bool> >
91	91	::SetStandardProcessedMap
92		::SetOperationTraits<Dijkstra~~WidestPath~~OperationTraits<VType> >
	92	::SetOperationTraits<DijkstraDefaultOperationTraits<VType> >
93	93	::SetHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
94	94	::SetStandardHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >

-                      r310
+                      r385
 if WANT_TOOLS
+bin_PROGRAMS +=
+bin_PROGRAMS += \
+        tools/dimacs-to-lgf
 dist_bin_SCRIPTS += tools/lemon-0.x-to-1.x.sh
 endif WANT_TOOLS
+tools_dimacs_to_lgf_SOURCES = tools/dimacs-to-lgf.cc

Note: See TracChangeset for help on using the changeset viewer.