Changes in / [34:b88dd07e6349:36:d6bc33fa6590] in lemon-main
- Files:
-
- 9 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
.hgignore
r3 r9 6 6 *.o 7 7 .#.* 8 *.log 9 *.lo 10 *.tar.* 8 11 Makefile.in 9 12 aclocal.m4 … … 20 23 lemon/stamp-h2 21 24 doc/Doxyfile 22 lemon/.dirstamp 23 lemon/.libs/* 25 .dirstamp 26 .libs/* 27 .deps/* 24 28 25 29 syntax: 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 5 5 6 6 EXTRA_DIST = \ 7 LICENSE \ 7 8 m4/lx_check_cplex.m4 \ 8 9 m4/lx_check_glpk.m4 \ -
configure.ac
r1 r21 7 7 m4_define([lemon_version_nano], []) 8 8 m4_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()])])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()])]) 11 11 12 12 AC_PREREQ([2.59]) -
lemon/Makefile.am
r25 r32 8 8 9 9 lemon_libemon_la_SOURCES = \ 10 lemon/base.cc 10 lemon/base.cc \ 11 lemon/random.cc 12 11 13 12 14 lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) … … 14 16 15 17 lemon_HEADERS += \ 16 lemon/concept_check.h \ 18 lemon/dim2.h \ 19 lemon/random.h \ 17 20 lemon/list_graph.h \ 18 lemon/maps.h \19 21 lemon/tolerance.h 20 22 … … 23 25 lemon/bits/utility.h 24 26 25 concept_HEADERS += \ 26 lemon/concepts/maps.h 27 concept_HEADERS += -
lemon/bits/invalid.h
r7 r13 25 25 namespace lemon { 26 26 27 /// \brief Dummy type to make it easier to make invalid iterators.27 /// \brief Dummy type to make it easier to create invalid iterators. 28 28 /// 29 29 /// See \ref INVALID for the usage. … … 35 35 }; 36 36 37 /// Invalid iterators.38 37 /// \brief Invalid iterators. 38 /// 39 39 /// \ref Invalid is a global type that converts to each iterator 40 40 /// in such a way that the value of the target iterator will be invalid. -
lemon/concept_check.h
r26 r27 34 34 // See http://www.boost.org/libs/concept_check for documentation. 35 35 36 #ifndef LEMON_ BOOST_CONCEPT_CHECKS_HPP37 #define LEMON_ BOOST_CONCEPT_CHECKS_HPP36 #ifndef LEMON_CONCEPT_CHECKS_H 37 #define LEMON_CONCEPT_CHECKS_H 38 38 39 39 namespace lemon { … … 103 103 } // namespace lemon 104 104 105 #endif // LEMON_ BOOST_CONCEPT_CHECKS_HPP105 #endif // LEMON_CONCEPT_CHECKS_H -
lemon/concepts/maps.h
r25 r28 35 35 36 36 /// Readable map concept 37 38 /// Readable map concept. 39 /// 37 40 template<typename K, typename T> 38 41 class ReadMap … … 46 49 /// Returns the value associated with a key. 47 50 48 /// \bug Value should 51 /// \bug Value shouldn't need to be default constructible. 49 52 /// 50 53 Value operator[](const Key &) const {return Value();} … … 72 75 73 76 /// Writable map concept 77 78 /// Writable map concept. 79 /// 74 80 template<typename K, typename T> 75 81 class WriteMap … … 108 114 }; 109 115 110 ///Read/Writable map concept 116 /// Read/Writable map concept 117 118 /// Read/writable map concept. 119 /// 111 120 template<typename K, typename T> 112 121 class ReadWriteMap : public ReadMap<K,T>, … … 134 143 135 144 136 ///Dereferable map concept 145 /// Dereferable map concept 146 147 /// Dereferable map concept. 148 /// 137 149 template<typename K, typename T, typename R, typename CR> 138 150 class ReferenceMap : public ReadWriteMap<K,T> … … 157 169 Reference operator[](const Key &) { return tmp; } 158 170 ///Returns a const reference to the value associated to a key. 159 ConstReference operator[](const Key &) const 160 { return tmp; } 171 ConstReference operator[](const Key &) const { return tmp; } 161 172 /// Sets the value associated with a key. 162 173 void set(const Key &k,const Value &t) { operator[](k)=t; } 163 174 164 // \todo rethink this concept175 /// \todo Rethink this concept. 165 176 template<typename _ReferenceMap> 166 177 struct ReferenceMapConcept { … … 191 202 192 203 } //namespace concepts 204 193 205 } //namespace lemon 206 194 207 #endif // LEMON_CONCEPT_MAPS_H -
lemon/tolerance.h
r7 r16 49 49 ///\sa Tolerance<long double> 50 50 ///\sa Tolerance<int> 51 #if defined __GNUC__ && !defined __STRICT_ANSI__ 51 52 ///\sa Tolerance<long long int> 53 #endif 52 54 ///\sa Tolerance<unsigned int> 55 #if defined __GNUC__ && !defined __STRICT_ANSI__ 53 56 ///\sa Tolerance<unsigned long long int> 57 #endif 54 58 55 59 template<class T> … … 131 135 bool negative(Value a) const { return -_epsilon>a; } 132 136 ///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); } 134 138 135 139 ///@} … … 182 186 bool negative(Value a) const { return -_epsilon>a; } 183 187 ///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); } 185 189 186 190 ///@} … … 233 237 bool negative(Value a) const { return -_epsilon>a; } 234 238 ///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); } 236 240 237 241 ///@} … … 266 270 static bool negative(Value a) { return 0>a; } 267 271 ///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; } 269 273 270 274 ///@} … … 299 303 static bool negative(Value) { return false; } 300 304 ///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; } 302 306 303 307 ///@} … … 333 337 static bool negative(Value a) { return 0>a; } 334 338 ///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;} 336 340 337 341 ///@} … … 366 370 static bool negative(Value) { return false; } 367 371 ///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;} 369 373 370 374 ///@} … … 403 407 static bool negative(Value a) { return 0>a; } 404 408 ///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;} 406 410 407 411 ///@} … … 438 442 static bool negative(Value) { return false; } 439 443 ///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;} 441 445 442 446 ///@} -
test/Makefile.am
r25 r32 4 4 noinst_HEADERS += \ 5 5 test/test_tools.h 6 6 7 7 check_PROGRAMS += \ 8 test/maps_test \ 8 test/dim_test \ 9 test/random_test \ 9 10 test/test_tools_fail \ 10 11 test/test_tools_pass 11 12 12 13 TESTS += $(check_PROGRAMS) 13 14 XFAIL_TESTS += test/test_tools_fail$(EXEEXT) 14 15 15 test_maps_test_SOURCES = test/maps_test.cc 16 test_dim_test_SOURCES = test/dim_test.cc 17 test_random_test_SOURCES = test/random_test.cc 16 18 test_test_tools_fail_SOURCES = test/test_tools_fail.cc 17 19 test_test_tools_pass_SOURCES = test/test_tools_pass.cc
Note: See TracChangeset
for help on using the changeset viewer.