Changes in / [20:9244aa9ec12e:30:72364ba3466d] in lemon

Files:

• .hgignore (modified) (2 diffs)
• lemon/Makefile.am (modified) (3 diffs)
• lemon/bits/invalid.h (modified) (2 diffs)
• lemon/concept_check.h (added)
• lemon/concepts/maps.h (added)
• lemon/dim2.h (deleted)
• lemon/maps.h (added)
• lemon/random.cc (deleted)
• lemon/random.h (deleted)
• lemon/tolerance.h (modified) (10 diffs)
• test/Makefile.am (modified) (1 diff)
• test/dim_test.cc (deleted)
• test/maps_test.cc (added)
• test/random_test.cc (deleted)

.hgignore

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

lemon/Makefile.am

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

lemon/bits/invalid.h

@@ -25 +25 @@
 namespace lemon {
 
-  /// \brief Dummy type to make it easier to create invalid iterators.
+  /// \brief Dummy type to make it easier to make invalid iterators.
   ///
   /// See \ref INVALID for the usage.
@@ -35 +35 @@
   };
   
-  /// \brief Invalid iterators.
-  ///
+  /// 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>
@@ -135 +131 @@
     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); };
 
     ///@}
@@ -186 +182 @@
     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); };
 
     ///@}
@@ -237 +233 @@
     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); };
 
     ///@}
@@ -270 +266 @@
     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; };
 
     ///@}
@@ -303 +299 @@
     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; };
 
     ///@}
@@ -337 +333 @@
     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;};
 
     ///@}
@@ -370 +366 @@
     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;};
 
     ///@}
@@ -407 +403 @@
     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;};
 
     ///@}
@@ -442 +438 @@
     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/dim_test \
-        test/random_test \
+        test/maps_test \
         test/test_tools_fail \
         test/test_tools_pass
-
+ 
 TESTS += $(check_PROGRAMS)
 XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
 
-test_dim_test_SOURCES = test/dim_test.cc
-test_random_test_SOURCES = test/random_test.cc
+test_maps_test_SOURCES = test/maps_test.cc
 test_test_tools_fail_SOURCES = test/test_tools_fail.cc
 test_test_tools_pass_SOURCES = test/test_tools_pass.cc