COIN-OR::LEMON - Graph Library

Changes in / [31:742abd64255e:32:ad7f593399b0] in lemon-main


Ignore:
Files:
9 added
7 edited

Legend:

Unmodified
Added
Removed
  • .hgignore

    r3 r9  
    66*.o
    77.#.*
     8*.log
     9*.lo
     10*.tar.*
    811Makefile.in
    912aclocal.m4
     
    2023lemon/stamp-h2
    2124doc/Doxyfile
    22 lemon/.dirstamp
    23 lemon/.libs/*
     25.dirstamp
     26.libs/*
     27.deps/*
    2428
    2529syntax: regexp
    26 html/.*
    27 autom4te.cache/.*
    28 build-aux/.*
    29 objs.*/.*
     30^doc/html/.*
     31^autom4te.cache/.*
     32^build-aux/.*
     33^objs.*/.*
     34^test/[a-z_]*$
  • Makefile.am

    r1 r5  
    55
    66EXTRA_DIST = \
     7        LICENSE \
    78        m4/lx_check_cplex.m4 \
    89        m4/lx_check_glpk.m4 \
  • configure.ac

    r1 r21  
    77m4_define([lemon_version_nano], [])
    88m4_define([lemon_version_tag], [hg])
    9 m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg tip |grep ^changeset |cut -d ':' -f 3]))])
    10 m4_define([lemon_version], [lemon_version_major().lemon_version_minor()ifelse(lemon_version_micro(), [], [], [.lemon_version_micro()])ifelse(lemon_version_nano(), [], [], [.lemon_version_nano()])ifelse(lemon_version_tag(), [], [], lemon_version_tag(), [hg], [[_]lemon_version_tag()[]lemon_hg_revision()], [[_]lemon_version_tag()])])
     9m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i]))])
     10m4_define([lemon_version], [lemon_version_major().lemon_version_minor()ifelse(lemon_version_micro(), [], [], [.lemon_version_micro()])ifelse(lemon_version_nano(), [], [], [.lemon_version_nano()])ifelse(lemon_version_tag(), [], [], lemon_version_tag(), [hg], [[_]lemon_version_tag()[_]lemon_hg_revision()], [[_]lemon_version_tag()])])
    1111
    1212AC_PREREQ([2.59])
  • lemon/Makefile.am

    r25 r32  
    88
    99lemon_libemon_la_SOURCES = \
    10         lemon/base.cc
     10        lemon/base.cc \
     11        lemon/random.cc
     12
    1113
    1214lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
     
    1416
    1517lemon_HEADERS += \
    16         lemon/concept_check.h \
     18        lemon/dim2.h \
     19        lemon/random.h \
    1720        lemon/list_graph.h \
    18         lemon/maps.h \
    1921        lemon/tolerance.h
    2022
     
    2325        lemon/bits/utility.h
    2426
    25 concept_HEADERS += \
    26         lemon/concepts/maps.h
     27concept_HEADERS +=
  • lemon/bits/invalid.h

    r7 r13  
    2525namespace lemon {
    2626
    27   /// \brief Dummy type to make it easier to make invalid iterators.
     27  /// \brief Dummy type to make it easier to create invalid iterators.
    2828  ///
    2929  /// See \ref INVALID for the usage.
     
    3535  };
    3636 
    37   /// Invalid iterators.
    38  
     37  /// \brief Invalid iterators.
     38  ///
    3939  /// \ref Invalid is a global type that converts to each iterator
    4040  /// in such a way that the value of the target iterator will be invalid.
  • lemon/tolerance.h

    r7 r16  
    4949  ///\sa Tolerance<long double>
    5050  ///\sa Tolerance<int>
     51#if defined __GNUC__ && !defined __STRICT_ANSI__ 
    5152  ///\sa Tolerance<long long int>
     53#endif
    5254  ///\sa Tolerance<unsigned int>
     55#if defined __GNUC__ && !defined __STRICT_ANSI__ 
    5356  ///\sa Tolerance<unsigned long long int>
     57#endif
    5458
    5559  template<class T>
     
    131135    bool negative(Value a) const { return -_epsilon>a; }
    132136    ///Returns \c true if \c a is \e surely non-zero
    133     bool nonZero(Value a) const { return positive(a)||negative(a); };
     137    bool nonZero(Value a) const { return positive(a)||negative(a); }
    134138
    135139    ///@}
     
    182186    bool negative(Value a) const { return -_epsilon>a; }
    183187    ///Returns \c true if \c a is \e surely non-zero
    184     bool nonZero(Value a) const { return positive(a)||negative(a); };
     188    bool nonZero(Value a) const { return positive(a)||negative(a); }
    185189
    186190    ///@}
     
    233237    bool negative(Value a) const { return -_epsilon>a; }
    234238    ///Returns \c true if \c a is \e surely non-zero
    235     bool nonZero(Value a) const { return positive(a)||negative(a); };
     239    bool nonZero(Value a) const { return positive(a)||negative(a); }
    236240
    237241    ///@}
     
    266270    static bool negative(Value a) { return 0>a; }
    267271    ///Returns \c true if \c a is \e surely non-zero
    268     static bool nonZero(Value a) { return a!=0; };
     272    static bool nonZero(Value a) { return a!=0; }
    269273
    270274    ///@}
     
    299303    static bool negative(Value) { return false; }
    300304    ///Returns \c true if \c a is \e surely non-zero
    301     static bool nonZero(Value a) { return a!=0; };
     305    static bool nonZero(Value a) { return a!=0; }
    302306
    303307    ///@}
     
    333337    static bool negative(Value a) { return 0>a; }
    334338    ///Returns \c true if \c a is \e surely non-zero
    335     static bool nonZero(Value a) { return a!=0;};
     339    static bool nonZero(Value a) { return a!=0;}
    336340
    337341    ///@}
     
    366370    static bool negative(Value) { return false; }
    367371    ///Returns \c true if \c a is \e surely non-zero
    368     static bool nonZero(Value a) { return a!=0;};
     372    static bool nonZero(Value a) { return a!=0;}
    369373
    370374    ///@}
     
    403407    static bool negative(Value a) { return 0>a; }
    404408    ///Returns \c true if \c a is \e surely non-zero
    405     static bool nonZero(Value a) { return a!=0;};
     409    static bool nonZero(Value a) { return a!=0;}
    406410
    407411    ///@}
     
    438442    static bool negative(Value) { return false; }
    439443    ///Returns \c true if \c a is \e surely non-zero
    440     static bool nonZero(Value a) { return a!=0;};
     444    static bool nonZero(Value a) { return a!=0;}
    441445
    442446    ///@}
  • test/Makefile.am

    r25 r32  
    44noinst_HEADERS += \
    55        test/test_tools.h
    6  
     6
    77check_PROGRAMS += \
    8         test/maps_test \
     8        test/dim_test \
     9        test/random_test \
    910        test/test_tools_fail \
    1011        test/test_tools_pass
    11  
     12
    1213TESTS += $(check_PROGRAMS)
    1314XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
    1415
    15 test_maps_test_SOURCES = test/maps_test.cc
     16test_dim_test_SOURCES = test/dim_test.cc
     17test_random_test_SOURCES = test/random_test.cc
    1618test_test_tools_fail_SOURCES = test/test_tools_fail.cc
    1719test_test_tools_pass_SOURCES = test/test_tools_pass.cc
Note: See TracChangeset for help on using the changeset viewer.