LEMON/LEMON-main Changeset - r145:95d905b6e33d

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r145:95d905b6e33d

« 144:4e626d
« 140:356930

146:4b42aa »

r145:95d905b6e33d

Tue, 22 Apr 2008 18:52:01

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge

6 6 4

merge default

6 files changed with 87 insertions and 32 deletions:

CMakeLists.txt

demo/CMakeLists.txt

lemon/CMakeLists.txt

test/CMakeLists.txt

.hgignore

demo/lgf_demo.cc

lemon/assert.h

lemon/graph_to_eps.h

lemon/path.h

lemon/time_measure.h

benchmark/Makefile

demo/Makefile

doc/Makefile

lemon/Makefile

test/Makefile

tools/Makefile

↑ Collapse diff ↑

0 comments (0 inline)

 		project (LEMON)
 		enable_testing ()
 		add_subdirectory (lemon)
 		add_subdirectory (demo)
 		add_subdirectory (test)

 		include_directories (${LEMON_SOURCE_DIR})
 		link_directories (${LEMON_BINARY_DIR}/lemon)
 		set (DEMOS
 		  arg_parser_demo
 		  graph_to_eps_demo
 		  lgf_demo)
 		foreach (DEMO_NAME ${DEMOS})
 		  add_executable (${DEMO_NAME} ${DEMO_NAME}.cc)
 		  target_link_libraries (${DEMO_NAME} lemon)
 		  endforeach (DEMO_NAME)

 		include_directories (${LEMON_SOURCE_DIR})
 		link_directories (${LEMON_BINARY_DIR}/lemon)
 		set (TESTS
 		  bfs_test
 		  counter_test
 		  dfs_test
 		  digraph_test
 		  dim_test
 		  error_test
 		  graph_test
 		  kruskal_test
 		  maps_test
 		  random_test
 		  path_test
 		  time_measure_test
 		  unionfind_test)
 		foreach (TEST_NAME ${TESTS})
 		  add_executable (${TEST_NAME} ${TEST_NAME}.cc)
 		  target_link_libraries (${TEST_NAME} lemon)
 		  add_test(${TEST_NAME} ${TEST_NAME})
 		endforeach (TEST_NAME)

@@ -33,4 +33,9 @@
 		^build-aux/.*
 		^objs.*/.*
 		^test/[a-z_]*$
 		^demo/.*_demo$
 		^build/.*
 		CMakeFiles
 		DartTestfile.txt
 		cmake_install.cmake
 		CMakeCache.txt

@@ -36,9 +36,9 @@
 		using namespace lemon;
 		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;
 		  SmartDigraph digraph;

RhodeCode

Login to your account

	1	include_directories (${LEMON_SOURCE_DIR})
	2	add_library (lemon arg_parser.cc base.cc color.cc random.cc)

@@ -102,9 +102,15 @@
 		#  define LEMON_ASSERT_HANDLER ::lemon::assert_fail_abort
 		#endif
 		#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
 		#ifdef DOXYGEN

@@ -28,8 +28,10 @@
 		#ifndef WIN32
 		#include<sys/time.h>
 		#include<ctime>
 		#else
 		#define WIN32_LEAN_AND_MEAN
 		#define NOMINMAX
 		#include<windows.h>
 		#endif
 		#include<lemon/math.h>

@@ -902,22 +902,36 @@
 		  namespace _path_bits {
 		    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;
 		    };
 		    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) {
 		        target.clear();
 		        for (typename Source::ArcIt it(source); it != INVALID; ++it) {
@@ -925,35 +939,28 @@
+		        }
+		      }
 		    };
 		    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();
 		        for (typename Source::RevArcIt it(source); it != INVALID; ++it) {
 		          target.addFront(it);
+		        }
+		      }
 		    };
 		    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();
 		        target.build(source);
+		      }
 		    };
 		    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();
 		        target.buildRev(source);
+		      }

@@ -23,15 +23,18 @@
 		///\file
 		///\brief Tools for measuring cpu usage
 		#ifdef WIN32
 		#define WIN32_LEAN_AND_MEAN
 		#define NOMINMAX
 		#include <windows.h>
 		#include <cmath>
 		#else
 		#include <sys/times.h>
 		#include <sys/time.h>
 		#endif
 		#include <string>
 		#include <fstream>
 		#include <iostream>
 		namespace lemon {

1		all:
2		$(MAKE) -C ..

1		all:
2		$(MAKE) -C ..

1		all:
2		$(MAKE) -C ..

1		all:
2		$(MAKE) -C ..