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

Files:

• .hgignore (modified) (2 diffs)
• INSTALL (added)
• LICENSE (added)
• Makefile.am (modified) (1 diff)
• NEWS (added)
• README (added)
• configure.ac (modified) (1 diff)
• lemon/Makefile.am (modified) (3 diffs)
• lemon/bits/invalid.h (modified) (2 diffs)
• lemon/dim2.h (added)
• lemon/random.cc (added)
• lemon/random.h (added)
• lemon/tolerance.h (modified) (10 diffs)
• test/Makefile.am (modified) (1 diff)
• test/dim_test.cc (added)
• test/random_test.cc (added)

.hgignore

@@ -6 +6 @@
 *.o
 .#.*
+*.log
+*.lo
+*.tar.*
 Makefile.in
 aclocal.m4
@@ -20 +23 @@
 lemon/stamp-h2
 doc/Doxyfile
-lemon/.dirstamp
-lemon/.libs/*
+.dirstamp
+.libs/*
+.deps/*
 
 syntax: regexp
-html/.*
-autom4te.cache/.*
-build-aux/.*
-objs.*/.*
+^doc/html/.*
+^autom4te.cache/.*
+^build-aux/.*
+^objs.*/.*
+^test/[a-z_]*$

Makefile.am

@@ -5 +5 @@
 
 EXTRA_DIST = \
+        LICENSE \
         m4/lx_check_cplex.m4 \
         m4/lx_check_glpk.m4 \

configure.ac

@@ -7 +7 @@
 m4_define([lemon_version_nano], [])
 m4_define([lemon_version_tag], [hg])
-m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg tip |grep ^changeset |cut -d ':' -f 3]))])
-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()])])
+m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i]))])
+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()])])
 
 AC_PREREQ([2.59])

lemon/Makefile.am

@@ -8 +8 @@
 
 lemon_libemon_la_SOURCES = \
-        lemon/base.cc
+        lemon/base.cc \
+        lemon/random.cc
+
 
 lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
@@ -14 +16 @@
 
 lemon_HEADERS += \
-        lemon/concept_check.h \
+        lemon/dim2.h \
+        lemon/random.h \
         lemon/list_graph.h \
-        lemon/maps.h \
         lemon/tolerance.h
 
@@ -23 +25 @@
         lemon/bits/utility.h
 
-concept_HEADERS += \
-        lemon/concepts/maps.h
+concept_HEADERS +=

lemon/bits/invalid.h

@@ -25 +25 @@
 namespace lemon {
 
-  /// \brief Dummy type to make it easier to make invalid iterators.
+  /// \brief Dummy type to make it easier to create invalid iterators.
   ///
   /// See \ref INVALID for the usage.
@@ -35 +35 @@
   };
   
-  /// Invalid iterators.
-  
+  /// \brief Invalid iterators.
+  ///
   /// \ref Invalid is a global type that converts to each iterator
   /// in such a way that the value of the target iterator will be invalid.

lemon/tolerance.h

@@ -49 +49 @@
   ///\sa Tolerance<long double>
   ///\sa Tolerance<int>
+#if defined __GNUC__ && !defined __STRICT_ANSI__  
   ///\sa Tolerance<long long int>
+#endif
   ///\sa Tolerance<unsigned int>
+#if defined __GNUC__ && !defined __STRICT_ANSI__  
   ///\sa Tolerance<unsigned long long int>
+#endif
 
   template<class T>
@@ -131 +135 @@
     bool negative(Value a) const { return -_epsilon>a; }
     ///Returns \c true if \c a is \e surely non-zero
-    bool nonZero(Value a) const { return positive(a)||negative(a); };
+    bool nonZero(Value a) const { return positive(a)||negative(a); }
 
     ///@}
@@ -182 +186 @@
     bool negative(Value a) const { return -_epsilon>a; }
     ///Returns \c true if \c a is \e surely non-zero
-    bool nonZero(Value a) const { return positive(a)||negative(a); };
+    bool nonZero(Value a) const { return positive(a)||negative(a); }
 
     ///@}
@@ -233 +237 @@
     bool negative(Value a) const { return -_epsilon>a; }
     ///Returns \c true if \c a is \e surely non-zero
-    bool nonZero(Value a) const { return positive(a)||negative(a); };
+    bool nonZero(Value a) const { return positive(a)||negative(a); }
 
     ///@}
@@ -266 +270 @@
     static bool negative(Value a) { return 0>a; }
     ///Returns \c true if \c a is \e surely non-zero
-    static bool nonZero(Value a) { return a!=0; };
+    static bool nonZero(Value a) { return a!=0; }
 
     ///@}
@@ -299 +303 @@
     static bool negative(Value) { return false; }
     ///Returns \c true if \c a is \e surely non-zero
-    static bool nonZero(Value a) { return a!=0; };
+    static bool nonZero(Value a) { return a!=0; }
 
     ///@}
@@ -333 +337 @@
     static bool negative(Value a) { return 0>a; }
     ///Returns \c true if \c a is \e surely non-zero
-    static bool nonZero(Value a) { return a!=0;};
+    static bool nonZero(Value a) { return a!=0;}
 
     ///@}
@@ -366 +370 @@
     static bool negative(Value) { return false; }
     ///Returns \c true if \c a is \e surely non-zero
-    static bool nonZero(Value a) { return a!=0;};
+    static bool nonZero(Value a) { return a!=0;}
 
     ///@}
@@ -403 +407 @@
     static bool negative(Value a) { return 0>a; }
     ///Returns \c true if \c a is \e surely non-zero
-    static bool nonZero(Value a) { return a!=0;};
+    static bool nonZero(Value a) { return a!=0;}
 
     ///@}
@@ -438 +442 @@
     static bool negative(Value) { return false; }
     ///Returns \c true if \c a is \e surely non-zero
-    static bool nonZero(Value a) { return a!=0;};
+    static bool nonZero(Value a) { return a!=0;}
 
     ///@}

test/Makefile.am

@@ -4 +4 @@
 noinst_HEADERS += \
         test/test_tools.h
- 
+
 check_PROGRAMS += \
-        test/maps_test \
+        test/dim_test \
+        test/random_test \
         test/test_tools_fail \
         test/test_tools_pass
- 
+
 TESTS += $(check_PROGRAMS)
 XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
 
-test_maps_test_SOURCES = test/maps_test.cc
+test_dim_test_SOURCES = test/dim_test.cc
+test_random_test_SOURCES = test/random_test.cc
 test_test_tools_fail_SOURCES = test/test_tools_fail.cc
 test_test_tools_pass_SOURCES = test/test_tools_pass.cc