COIN-OR::LEMON - Graph Library

About

Downloads

Documentation

Development

Issue Tracker

Browse Tickets

Custom Query

Roadmap

Browse Source

Local Info

Mailing Lists

Search

Changes in / [36:d6bc33fa6590:34:b88dd07e6349] in lemon-1.2


Ignore:
Files:
9 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • .hgignore

    r9 r3  
    66*.o
    77.#.*
    8 *.log
    9 *.lo
    10 *.tar.*
    118Makefile.in
    129aclocal.m4
    … …  
    2320lemon/stamp-h2
    2421doc/Doxyfile
    25 .dirstamp
    26 .libs/*
    27 .deps/*
     22lemon/.dirstamp
     23lemon/.libs/*
    2824
    2925syntax: regexp
    30 ^doc/html/.*
    31 ^autom4te.cache/.*
    32 ^build-aux/.*
    33 ^objs.*/.*
    34 ^test/[a-z_]*$
     26html/.*
     27autom4te.cache/.*
     28build-aux/.*
     29objs.*/.*

  • Makefile.am

    r5 r1  
    55
    66EXTRA_DIST = \
    7         LICENSE \
    87        m4/lx_check_cplex.m4 \
    98        m4/lx_check_glpk.m4 \

  • configure.ac

    r21 r1  
    77m4_define([lemon_version_nano], [])
    88m4_define([lemon_version_tag], [hg])
    9 m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i]))])
    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 tip |grep ^changeset |cut -d ':' -f 3]))])
     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

    r32 r25  
    88
    99lemon_libemon_la_SOURCES = \
    10         lemon/base.cc \
    11         lemon/random.cc
    12 
     10        lemon/base.cc
    1311
    1412lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
    … …  
    1614
    1715lemon_HEADERS += \
    18         lemon/dim2.h \
    19         lemon/random.h \
     16        lemon/concept_check.h \
    2017        lemon/list_graph.h \
     18        lemon/maps.h \
    2119        lemon/tolerance.h
    2220
    … …  
    2523        lemon/bits/utility.h
    2624
    27 concept_HEADERS +=
     25concept_HEADERS += \
     26        lemon/concepts/maps.h

  • lemon/bits/invalid.h

    r13 r7  
    2525namespace lemon {
    2626
    27   /// \brief Dummy type to make it easier to create invalid iterators.
     27  /// \brief Dummy type to make it easier to make invalid iterators.
    2828  ///
    2929  /// See \ref INVALID for the usage.
    … …  
    3535  };
    3636 
    37   /// \brief Invalid iterators.
    38   ///
     37  /// 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/concept_check.h

    r27 r26  
    3434// See http://www.boost.org/libs/concept_check for documentation.
    3535
    36 #ifndef LEMON_CONCEPT_CHECKS_H
    37 #define LEMON_CONCEPT_CHECKS_H
     36#ifndef LEMON_BOOST_CONCEPT_CHECKS_HPP
     37#define LEMON_BOOST_CONCEPT_CHECKS_HPP
    3838
    3939namespace lemon {
    … …  
    103103} // namespace lemon
    104104
    105 #endif // LEMON_CONCEPT_CHECKS_H
     105#endif // LEMON_BOOST_CONCEPT_CHECKS_HPP

  • lemon/concepts/maps.h

    r28 r25  
    3535
    3636    /// Readable map concept
    37 
    38     /// Readable map concept.
    39     ///
    4037    template<typename K, typename T>
    4138    class ReadMap
    … …  
    4946      /// Returns the value associated with a key.
    5047
    51       /// \bug Value shouldn't need to be default constructible.
     48      /// \bug Value should n't need to be default constructible.
    5249      ///
    5350      Value operator[](const Key &) const {return Value();}
    … …  
    7572
    7673    /// Writable map concept
    77    
    78     /// Writable map concept.
    79     ///
    8074    template<typename K, typename T>
    8175    class WriteMap
    … …  
    114108    };
    115109
    116     /// Read/Writable map concept
    117    
    118     /// Read/writable map concept.
    119     ///
     110    ///Read/Writable map concept
    120111    template<typename K, typename T>
    121112    class ReadWriteMap : public ReadMap<K,T>,
    … …  
    143134 
    144135 
    145     /// Dereferable map concept
    146    
    147     /// Dereferable map concept.
    148     ///
     136    ///Dereferable map concept
    149137    template<typename K, typename T, typename R, typename CR>
    150138    class ReferenceMap : public ReadWriteMap<K,T>
    … …  
    169157      Reference operator[](const Key &) { return tmp; }
    170158      ///Returns a const reference to the value associated to a key.
    171       ConstReference operator[](const Key &) const { return tmp; }
     159      ConstReference operator[](const Key &) const
     160      { return tmp; }
    172161      /// Sets the value associated with a key.
    173162      void set(const Key &k,const Value &t) { operator[](k)=t; }
    174163
    175       /// \todo Rethink this concept.
     164      // \todo rethink this concept
    176165      template<typename _ReferenceMap>
    177166      struct ReferenceMapConcept {
    … …  
    202191
    203192  } //namespace concepts
    204 
    205193} //namespace lemon
    206 
    207194#endif // LEMON_CONCEPT_MAPS_H

  • lemon/tolerance.h

    r16 r7  
    4949  ///\sa Tolerance<long double>
    5050  ///\sa Tolerance<int>
    51 #if defined __GNUC__ && !defined __STRICT_ANSI__ 
    5251  ///\sa Tolerance<long long int>
    53 #endif
    5452  ///\sa Tolerance<unsigned int>
    55 #if defined __GNUC__ && !defined __STRICT_ANSI__ 
    5653  ///\sa Tolerance<unsigned long long int>
    57 #endif
    5854
    5955  template<class T>
    … …  
    135131    bool negative(Value a) const { return -_epsilon>a; }
    136132    ///Returns \c true if \c a is \e surely non-zero
    137     bool nonZero(Value a) const { return positive(a)||negative(a); }
     133    bool nonZero(Value a) const { return positive(a)||negative(a); };
    138134
    139135    ///@}
    … …  
    186182    bool negative(Value a) const { return -_epsilon>a; }
    187183    ///Returns \c true if \c a is \e surely non-zero
    188     bool nonZero(Value a) const { return positive(a)||negative(a); }
     184    bool nonZero(Value a) const { return positive(a)||negative(a); };
    189185
    190186    ///@}
    … …  
    237233    bool negative(Value a) const { return -_epsilon>a; }
    238234    ///Returns \c true if \c a is \e surely non-zero
    239     bool nonZero(Value a) const { return positive(a)||negative(a); }
     235    bool nonZero(Value a) const { return positive(a)||negative(a); };
    240236
    241237    ///@}
    … …  
    270266    static bool negative(Value a) { return 0>a; }
    271267    ///Returns \c true if \c a is \e surely non-zero
    272     static bool nonZero(Value a) { return a!=0; }
     268    static bool nonZero(Value a) { return a!=0; };
    273269
    274270    ///@}
    … …  
    303299    static bool negative(Value) { return false; }
    304300    ///Returns \c true if \c a is \e surely non-zero
    305     static bool nonZero(Value a) { return a!=0; }
     301    static bool nonZero(Value a) { return a!=0; };
    306302
    307303    ///@}
    … …  
    337333    static bool negative(Value a) { return 0>a; }
    338334    ///Returns \c true if \c a is \e surely non-zero
    339     static bool nonZero(Value a) { return a!=0;}
     335    static bool nonZero(Value a) { return a!=0;};
    340336
    341337    ///@}
    … …  
    370366    static bool negative(Value) { return false; }
    371367    ///Returns \c true if \c a is \e surely non-zero
    372     static bool nonZero(Value a) { return a!=0;}
     368    static bool nonZero(Value a) { return a!=0;};
    373369
    374370    ///@}
    … …  
    407403    static bool negative(Value a) { return 0>a; }
    408404    ///Returns \c true if \c a is \e surely non-zero
    409     static bool nonZero(Value a) { return a!=0;}
     405    static bool nonZero(Value a) { return a!=0;};
    410406
    411407    ///@}
    … …  
    442438    static bool negative(Value) { return false; }
    443439    ///Returns \c true if \c a is \e surely non-zero
    444     static bool nonZero(Value a) { return a!=0;}
     440    static bool nonZero(Value a) { return a!=0;};
    445441
    446442    ///@}

  • test/Makefile.am

    r32 r25  
    44noinst_HEADERS += \
    55        test/test_tools.h
    6 
     6 
    77check_PROGRAMS += \
    8         test/dim_test \
    9         test/random_test \
     8        test/maps_test \
    109        test/test_tools_fail \
    1110        test/test_tools_pass
    12 
     11 
    1312TESTS += $(check_PROGRAMS)
    1413XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
    1514
    16 test_dim_test_SOURCES = test/dim_test.cc
    17 test_random_test_SOURCES = test/random_test.cc
     15test_maps_test_SOURCES = test/maps_test.cc
    1816test_test_tools_fail_SOURCES = test/test_tools_fail.cc
    1917test_test_tools_pass_SOURCES = test/test_tools_pass.cc
Note: See TracChangeset for help on using the changeset viewer.