COIN-OR::LEMON - Graph Library

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


Ignore:
Files:
5 added
8 edited

Legend:

Unmodified
Added
Removed
  • .hgignore

    r298 r385  
    3737^objs.*/.*
    3838^test/[a-z_]*$
     39^tools/[a-z-_]*$
    3940^demo/.*_demo$
    4041^build/.*
  • doc/groups.dox

    r351 r388  
    483483
    484484/**
     485@defgroup dimacs_group DIMACS format
     486@ingroup io_group
     487\brief Read and write files in DIMACS format
     488
     489Tools to read a digraph from or write it to a file in DIMACS format data.
     490*/
     491
     492/**
    485493@defgroup nauty_group NAUTY Format
    486494@ingroup io_group
    487495\brief Read \e Nauty format
     496
    488497Tool to read graphs from \e Nauty format data.
    489498*/
  • lemon/Makefile.am

    r399 r404  
    2929        lemon/dijkstra.h \
    3030        lemon/dim2.h \
     31        lemon/dimacs.h \
    3132        lemon/elevator.h \
    3233        lemon/error.h \
     
    4445        lemon/nauty_reader.h \
    4546        lemon/path.h \
     47        lemon/preflow.h \
    4648        lemon/random.h \
    4749        lemon/smart_graph.h \
  • lemon/dijkstra.h

    r313 r397  
    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);
    7350    }
    7451    /// \brief Gives back true only if the first value is less than the second.
  • scripts/unify-sources.sh

    r341 r396  
    131131    echo $WARNED_FILES out of $TOTAL_FILES files triggered warnings.
    132132
    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 ]
    137134    then
    138135        if [ "$WARNING" == 'INTERACTIVE' ]
    139136        then
    140             echo -n "Are the files with warnings acceptable? (yes/no) "
     137            echo -n "Are the files with errors/warnings acceptable? (yes/no) "
    141138            while read answer
    142139            do
     
    148145                    return 1
    149146                fi
    150                 echo -n "Are the files with warnings acceptable? (yes/no) "
     147                echo -n "Are the files with errors/warnings acceptable? (yes/no) "
    151148            done
    152149        elif [ "$WARNING" == 'WERROR' ]
  • test/Makefile.am

    r400 r404  
    11EXTRA_DIST += \
    22        test/CMakeLists.txt \
    3         test/min_cost_flow_test.lgf
     3        test/min_cost_flow_test.lgf \
     4        test/preflow_graph.lgf
    45
    56noinst_HEADERS += \
     
    2526        test/random_test \
    2627        test/path_test \
     28        test/preflow_test \
    2729        test/suurballe_test \
    2830        test/test_tools_fail \
     
    5052test_max_matching_test_SOURCES = test/max_matching_test.cc
    5153test_path_test_SOURCES = test/path_test.cc
     54test_preflow_test_SOURCES = test/preflow_test.cc
    5255test_suurballe_test_SOURCES = test/suurballe_test.cc
    5356test_random_test_SOURCES = test/random_test.cc
  • test/dijkstra_test.cc

    r293 r397  
    9090      ::SetProcessedMap<concepts::WriteMap<Node,bool> >
    9191      ::SetStandardProcessedMap
    92       ::SetOperationTraits<DijkstraWidestPathOperationTraits<VType> >
     92      ::SetOperationTraits<DijkstraDefaultOperationTraits<VType> >
    9393      ::SetHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
    9494      ::SetStandardHeap<BinHeap<VType, concepts::ReadWriteMap<Node,int> > >
  • tools/Makefile.am

    r310 r385  
    11if WANT_TOOLS
    22
    3 bin_PROGRAMS +=
     3bin_PROGRAMS += \
     4        tools/dimacs-to-lgf
     5
    46dist_bin_SCRIPTS += tools/lemon-0.x-to-1.x.sh
    57
    68endif WANT_TOOLS
     9
     10tools_dimacs_to_lgf_SOURCES = tools/dimacs-to-lgf.cc
Note: See TracChangeset for help on using the changeset viewer.