LEMON/LEMON-main Changeset - r560:49a39bae067c

Repositories » LEMON » LEMON-main

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

Changeset - r560:49a39bae067c

« 558:f53d64
« 559:c5fd2d

561:6e0525 »

r560:49a39bae067c

Sun, 29 Mar 2009 23:19:14

[Not Reviewed]

0 comments (0 inline)

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

Merge

0 18 0

merge default

0 files changed with 123 insertions and 75 deletions:

CMakeLists.txt

LICENSE

NEWS

demo/CMakeLists.txt

doc/CMakeLists.txt

lemon/CMakeLists.txt

lemon/Makefile.am

lemon/cplex.cc

lemon/cplex.h

lemon/glpk.cc

scripts/unify-sources.sh

test/CMakeLists.txt

test/counter_test.cc

test/lp_test.cc

test/mip_test.cc

test/time_measure_test.cc

tools/CMakeLists.txt

tools/lemon-0.x-to-1.x.sh

↑ Collapse diff ↑

0 comments (0 inline)

@@ -11,3 +11,3 @@
-		SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+		SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
@@ -40,2 +40,3 @@
 		ADD_SUBDIRECTORY(lemon)
 		IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		ADD_SUBDIRECTORY(demo)
@@ -44,3 +45,5 @@
 		ADD_SUBDIRECTORY(test)
 		ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		IF(WIN32)
@@ -50,3 +53,3 @@
 		    "LEMON - Library of Efficient Models and Optimization in Networks")
-		  SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+		    SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
@@ -93,5 +96,5 @@
 		  SET(CPACK_GENERATOR "NSIS")
 		  SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico")
 		  SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/nsis/uninstall.ico")
-		  #SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
+		    SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis/lemon.ico")
 		    SET(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/cmake/nsis/uninstall.ico")
 		    #SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
 		  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
@@ -111,1 +114,2 @@
 		ENDIF(WIN32)
 		ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})

 		LEMON code without an explicit copyright is covered by the following
+		LEMON code without an explicit copyright notice is covered by the following
 		copyright/license.
@@ -7,2 +7,6 @@
 		===========================================================================
 		Boost Software License, Version 1.0
 		===========================================================================
 		Permission is hereby granted, free of charge, to any person or organization
@@ -28,6 +32,1 @@
 		DEALINGS IN THE SOFTWARE.
 		===========================================================================
 		This license is a verbatim copy of the Boost Software License, Version 1.0.

 -03-27 LEMON joins to the COIN-OR initiative
 		        COIN-OR (Computational Infrastructure for Operations Research,
 		        http://www.coin-or.org) project is an initiative to spur the
 		        development of open-source software for the operations research
 		        community.
 -10-13 Version 1.0 released

 		INCLUDE_DIRECTORIES(
 		  ${CMAKE_SOURCE_DIR}
 		  ${CMAKE_BINARY_DIR}
 		  ${PROJECT_SOURCE_DIR}
 		  ${PROJECT_BINARY_DIR}
+		)
-		LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
+		LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)

@@ -2,8 +2,8 @@
 		SET(PACKAGE_VERSION ${PROJECT_VERSION})
 		SET(abs_top_srcdir ${CMAKE_SOURCE_DIR})
 		SET(abs_top_builddir ${CMAKE_BINARY_DIR})
 		SET(abs_top_srcdir ${PROJECT_SOURCE_DIR})
 		SET(abs_top_builddir ${PROJECT_BINARY_DIR})
 		CONFIGURE_FILE(
 		  ${CMAKE_SOURCE_DIR}/doc/Doxyfile.in
 		  ${CMAKE_BINARY_DIR}/doc/Doxyfile
 		  ${PROJECT_SOURCE_DIR}/doc/Doxyfile.in
 		  ${PROJECT_BINARY_DIR}/doc/Doxyfile
 		  @ONLY)

RhodeCode

Login to your account

@@ -19,2 +19,3 @@
 		lemon_libemon_la_CXXFLAGS = \
 			$(AM_CXXFLAGS) \
 			$(GLPK_CFLAGS) \

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -443,9 +443,9 @@
 		  CplexLp::CplexLp()
-		    : LpBase(), CplexBase(), LpSolver() {}
+		    : LpBase(), LpSolver(), CplexBase() {}
 		  CplexLp::CplexLp(const CplexEnv& env)
-		    : LpBase(), CplexBase(env), LpSolver() {}
+		    : LpBase(), LpSolver(), CplexBase(env) {}
 		  CplexLp::CplexLp(const CplexLp& other)
-		    : LpBase(), CplexBase(other), LpSolver() {}
+		    : LpBase(), LpSolver(), CplexBase(other) {}
@@ -800,3 +800,3 @@
 		  CplexMip::CplexMip()
-		    : LpBase(), CplexBase(), MipSolver() {
+		    : LpBase(), MipSolver(), CplexBase() {
@@ -810,3 +810,3 @@
 		  CplexMip::CplexMip(const CplexEnv& env)
-		    : LpBase(), CplexBase(env), MipSolver() {
+		    : LpBase(), MipSolver(), CplexBase(env) {
@@ -821,3 +821,3 @@
 		  CplexMip::CplexMip(const CplexMip& other)
-		    : LpBase(), CplexBase(other), MipSolver() {}
+		    : LpBase(), MipSolver(), CplexBase(other) {}

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -237,6 +237,9 @@
 		    /// \e
 		    virtual CplexMip* cloneSolver() const;
 		    /// \e
 		    virtual CplexMip* newSolver() const;
 		  protected:
 		    virtual CplexMip* _cloneSolver() const;
 		    virtual CplexMip* _newSolver() const;

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -533,3 +533,3 @@
 		  GlpkLp::GlpkLp()
-		    : LpBase(), GlpkBase(), LpSolver() {
+		    : LpBase(), LpSolver(), GlpkBase() {
 		    messageLevel(MESSAGE_NO_OUTPUT);
@@ -538,3 +538,3 @@
 		  GlpkLp::GlpkLp(const GlpkLp& other)
-		    : LpBase(other), GlpkBase(other), LpSolver(other) {
+		    : LpBase(other), LpSolver(other), GlpkBase(other) {
 		    messageLevel(MESSAGE_NO_OUTPUT);
@@ -832,3 +832,3 @@
 		  GlpkMip::GlpkMip()
-		    : LpBase(), GlpkBase(), MipSolver() {
+		    : LpBase(), MipSolver(), GlpkBase() {
 		    messageLevel(MESSAGE_NO_OUTPUT);
@@ -837,3 +837,3 @@
 		  GlpkMip::GlpkMip(const GlpkMip& other)
-		    : LpBase(), GlpkBase(other), MipSolver() {
+		    : LpBase(), MipSolver(), GlpkBase(other) {
 		    messageLevel(MESSAGE_NO_OUTPUT);

@@ -90,3 +90,8 @@
 		    then
 		        if echo $2 | grep -q -v -E 'Makefile\.am$'
 		        then
 		        PATTERN=$(echo -e '\t')
 		        else
 		            PATTERN='        '
 		        fi
 		    elif [ "$3" == 'trailing spaces' ]

@@ -20,2 +20,5 @@
 		#include <vector>
 		#include <sstream>
 		#include "test/test_tools.h"
@@ -25,5 +28,7 @@
 		void bubbleSort(std::vector<T>& v) {
 		  Counter op("Bubble Sort - Operations: ");
 		  Counter::NoSubCounter as(op, "Assignments: ");
-		  Counter::NoSubCounter co(op, "Comparisons: ");
+		  std::stringstream s1, s2, s3;
+		  {
 		    Counter op("Bubble Sort - Operations: ", s1);
 		    Counter::SubCounter as(op, "Assignments: ", s2);
 		    Counter::SubCounter co(op, "Comparisons: ", s3);
 		  for (int i = v.size()-1; i > 0; --i) {
@@ -40,2 +45,6 @@
+		}
 		  check(s1.str() == "Bubble Sort - Operations: 102\n", "Wrong counter");
 		  check(s2.str() == "Assignments: 57\n", "Wrong subcounter");
 		  check(s3.str() == "Comparisons: 45\n", "Wrong subcounter");
+		}
@@ -43,5 +52,7 @@
 		void insertionSort(std::vector<T>& v) {
 		  Counter op("Insertion Sort - Operations: ");
 		  Counter::NoSubCounter as(op, "Assignments: ");
-		  Counter::NoSubCounter co(op, "Comparisons: ");
+		  std::stringstream s1, s2, s3;
+		  {
 		    Counter op("Insertion Sort - Operations: ", s1);
 		    Counter::SubCounter as(op, "Assignments: ", s2);
 		    Counter::SubCounter co(op, "Comparisons: ", s3);
 		  for (int i = 1; i < int(v.size()); ++i) {
@@ -59,10 +70,16 @@
+		}
 		  check(s1.str() == "Insertion Sort - Operations: 56\n", "Wrong counter");
 		  check(s2.str() == "Assignments: 37\n", "Wrong subcounter");
 		  check(s3.str() == "Comparisons: 19\n", "Wrong subcounter");
+		}
 		template <typename MyCounter>
 		void counterTest() {
 		  MyCounter c("Main Counter: ");
 		void counterTest(bool output) {
 		  std::stringstream s1, s2, s3;
+		  {
 		    MyCounter c("Main Counter: ", s1);
 		  c++;
 		  typename MyCounter::SubCounter d(c, "SubCounter: ");
+		    typename MyCounter::SubCounter d(c, "SubCounter: ", s2);
 		  d++;
 		  typename MyCounter::SubCounter::NoSubCounter e(d, "SubSubCounter: ");
+		    typename MyCounter::SubCounter::NoSubCounter e(d, "SubSubCounter: ", s3);
 		  e++;
@@ -74,2 +91,12 @@
+		}
 		  if (output) {
 		    check(s1.str() == "Main Counter: 3\n", "Wrong Counter");
 		    check(s2.str() == "SubCounter: 3\n", "Wrong SubCounter");
 		    check(s3.str() == "", "Wrong NoSubCounter");
 		  } else {
 		    check(s1.str() == "", "Wrong NoCounter");
 		    check(s2.str() == "", "Wrong SubCounter");
 		    check(s3.str() == "", "Wrong NoSubCounter");
+		  }
+		}
@@ -82,4 +109,4 @@
+		{
 		  counterTest<Counter>();
 		  counterTest<NoCounter>();
 		  counterTest<Counter>(true);
 		  counterTest<NoCounter>(false);

@@ -4,3 +4,3 @@
+		 *
-		 * Copyright (C) 2003-2008
+		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -395,2 +395,3 @@
 		    aTest(lp_cplex2);
 		    cloneTest<CplexLp>();
 		  } catch (CplexEnv::LicenseError& error) {
@@ -403,3 +404,2 @@
+		  }
 		    cloneTest<CplexLp>();
 		#endif

@@ -41,10 +41,8 @@
 		  unsigned int n;
-		  for(n=0;T.realTime()<1.0;n++) ;
+		  for(n=0;T.realTime()<0.1;n++) ;
 		  std::cout << T << " (" << n << " time queries)\n";
 		  T.restart();
 		  while(T.realTime()<2.0) ;
-		  std::cout << T << '\n';
 		  TimeStamp full;
 		  TimeStamp t;
 		  t=runningTimeTest(f,1,&n,&full);
+		  t=runningTimeTest(f,0.1,&n,&full);
 		  std::cout << t << " (" << n << " tests)\n";
@@ -52,3 +50,3 @@
 		  t=runningTimeTest(g,1,&n,&full);
+		  t=runningTimeTest(g,0.1,&n,&full);
 		  std::cout << t << " (" << n << " tests)\n";

@@ -24,8 +24,7 @@
 		        -e "s/u[Gg]raph/_gr_aph_label_/g"\
-		        -e "s/\<Graph\>/_Digr_aph_label_/g"\
 		        -e "s/Graph\>/_Digr_aph_label_/g"\
 		        -e "s/\<graph\>/_digr_aph_label_/g"\
-		        -e "s/\<Graphs\>/_Digr_aph_label_s/g"\
 		        -e "s/Graphs\>/_Digr_aph_label_s/g"\
 		        -e "s/\<graphs\>/_digr_aph_label_s/g"\
 		        -e "s/_Graph/__Gr_aph_label_/g"\
 		        -e "s/\([Gg]\)raph\([a-z_]\)/_\1r_aph_label_\2/g"\
 		        -e "s/\([Gg]\)raph\([a-z]\)/_\1r_aph_label_\2/g"\
 		        -e "s/\([a-z_]\)graph/\1_gr_aph_label_/g"\
@@ -36,10 +35,10 @@
 		        -e "s/IncEdgeIt/_In_cEd_geIt_label_/g"\
-		        -e "s/\<Edge\>/_Ar_c_label_/g"\
 		        -e "s/Edge\>/_Ar_c_label_/g"\
 		        -e "s/\<edge\>/_ar_c_label_/g"\
-		        -e "s/\<Edges\>/_Ar_c_label_s/g"\
+		        -e "s/_edge\>/_ar_c_label_/g"\
 		        -e "s/Edges\>/_Ar_c_label_s/g"\
 		        -e "s/\<edges\>/_ar_c_label_s/g"\
 		        -e "s/_Edge/__Ed_ge_label_/g"\
 		        -e "s/Edge\([a-z_]\)/_Ed_ge_label_\1/g"\
 		        -e "s/edge\([a-z_]\)/_ed_ge_label_\1/g"\
 		        -e "s/\([a-z_]\)edge/\1_ed_ge_label_/g"\
 		        -e "s/_edges\>/_ar_c_label_s/g"\
 		        -e "s/\([Ee]\)dge\([a-z]\)/_\1d_ge_label_\2/g"\
 		        -e "s/\([a-z]\)edge/\1_ed_ge_label_/g"\
 		        -e "s/Edge/_Ar_c_label_/g"\
@@ -118,2 +117,7 @@
 		        -e "s/\<dirGraphAdaptor\>/orienter/g"\
 		        -e "s/\<LpCplex\>/CplexLp/g"\
 		        -e "s/\<MipCplex\>/CplexMip/g"\
 		        -e "s/\<LpGlpk\>/GlpkLp/g"\
 		        -e "s/\<MipGlpk\>/GlpkMip/g"\
 		        -e "s/\<LpSoplex\>/SoplexLp/g"\
 		    <$i > $TMP