Changes in / [140:356930927a71:145:95d905b6e33d] in lemon-main

Files:

• .hgignore (modified) (1 diff)
• CMakeLists.txt (added)
• benchmark/Makefile (deleted)
• demo/CMakeLists.txt (added)
• demo/Makefile (deleted)
• demo/lgf_demo.cc (modified) (1 diff)
• doc/Makefile (deleted)
• lemon/CMakeLists.txt (added)
• lemon/Makefile (deleted)
• lemon/assert.h (modified) (1 diff)
• lemon/graph_to_eps.h (modified) (1 diff)
• lemon/path.h (modified) (5 diffs)
• lemon/time_measure.h (modified) (2 diffs)
• test/CMakeLists.txt (added)
• test/Makefile (deleted)
• tools/Makefile (deleted)

.hgignore

@@ -35 +35 @@
 ^test/[a-z_]*$
 ^demo/.*_demo$
+^build/.*
+CMakeFiles
+DartTestfile.txt
+cmake_install.cmake
+CMakeCache.txt

demo/lgf_demo.cc

@@ -38 +38 @@
 int main(int argc, const char *argv[]) {
   const int n = argc > 1 ? std::atoi(argv[1]) : 20;
-  const int e = argc > 2 ? std::atoi(argv[2]) : static_cast<int>(n * log(n));
+  const int e = argc > 2 ? std::atoi(argv[2]) : static_cast<int>(n * std::log(double(n)));
   const int m = argc > 3 ? std::atoi(argv[3]) : 100;
 

lemon/assert.h

@@ -104 +104 @@
 
 #ifndef LEMON_FUNCTION_NAME
-#  define LEMON_FUNCTION_NAME (__PRETTY_FUNCTION__)
+#  if defined __GNUC__
+#    define LEMON_FUNCTION_NAME (__PRETTY_FUNCTION__)
+#  elif defined _MSC_VER
+#    define LEMON_FUNCTION_NAME (__FUNCSIG__)
+#  else
+#    define LEMON_FUNCTION_NAME (__func__)
+#  endif
 #endif
 

lemon/graph_to_eps.h

@@ -30 +30 @@
 #include<ctime>
 #else
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include<windows.h>
 #endif

lemon/path.h

@@ -904 +904 @@
 
     template <typename Path, typename Enable = void>
-    struct RevTagIndicator {
+    struct RevPathTagIndicator {
       static const bool value = false;
     };
 
-    template <typename Digraph>
-    struct RevTagIndicator<
-      Digraph, 
-      typename enable_if<typename Digraph::RevTag, void>::type
+    template <typename Path>
+    struct RevPathTagIndicator<
+      Path, 
+      typename enable_if<typename Path::RevPathTag, void>::type
+      > {
+      static const bool value = true;
+    };
+
+    template <typename Path, typename Enable = void>
+    struct BuildTagIndicator {
+      static const bool value = false;
+    };
+
+    template <typename Path>
+    struct BuildTagIndicator<
+      Path, 
+      typename enable_if<typename Path::BuildTag, void>::type
     > {
       static const bool value = true;
@@ -917 +930 @@
 
     template <typename Target, typename Source,
-              typename BuildEnable = void, typename RevEnable = void>
+              bool buildEnable = BuildTagIndicator<Target>::value, 
+              bool revEnable = RevPathTagIndicator<Source>::value>
     struct PathCopySelector {
       static void copy(Target& target, const Source& source) {
@@ -927 +941 @@
     };
 
-    template <typename Target, typename Source, typename BuildEnable>
-    struct PathCopySelector<
-      Target, Source, BuildEnable, 
-      typename enable_if<typename Source::RevPathTag, void>::type> {
+    template <typename Target, typename Source>
+    struct PathCopySelector<Target, Source, false, true> {
       static void copy(Target& target, const Source& source) {
         target.clear();
@@ -939 +951 @@
     };
 
-    template <typename Target, typename Source, typename RevEnable>
-    struct PathCopySelector<
-      Target, Source, 
-      typename enable_if<typename Target::BuildTag, void>::type, RevEnable> {
+    template <typename Target, typename Source>
+    struct PathCopySelector<Target, Source, true, false> {
       static void copy(Target& target, const Source& source) {
         target.clear();
@@ -950 +960 @@
 
     template <typename Target, typename Source>
-    struct PathCopySelector<
-      Target, Source, 
-      typename enable_if<typename Target::BuildTag, void>::type,
-      typename enable_if<typename Source::RevPathTag, void>::type> {
+    struct PathCopySelector<Target, Source, true, true> {
       static void copy(Target& target, const Source& source) {
         target.clear();

lemon/time_measure.h

@@ -25 +25 @@
 
 #ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <windows.h>
 #include <cmath>
@@ -32 +34 @@
 #endif
 
+#include <string>
 #include <fstream>
 #include <iostream>