0
18
0
63
59
5
6
7
65
38
... | ... |
@@ -11,3 +11,3 @@ |
11 | 11 |
|
12 |
SET(CMAKE_MODULE_PATH ${ |
|
12 |
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) |
|
13 | 13 |
|
... | ... |
@@ -40,72 +40,76 @@ |
40 | 40 |
ADD_SUBDIRECTORY(lemon) |
41 |
ADD_SUBDIRECTORY(demo) |
|
42 |
ADD_SUBDIRECTORY(tools) |
|
43 |
ADD_SUBDIRECTORY(doc) |
|
44 |
ADD_SUBDIRECTORY(test) |
|
41 |
IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) |
|
42 |
ADD_SUBDIRECTORY(demo) |
|
43 |
ADD_SUBDIRECTORY(tools) |
|
44 |
ADD_SUBDIRECTORY(doc) |
|
45 |
ADD_SUBDIRECTORY(test) |
|
46 |
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) |
|
45 | 47 |
|
46 |
IF(WIN32) |
|
47 |
SET(CPACK_PACKAGE_NAME ${PROJECT_NAME}) |
|
48 |
SET(CPACK_PACKAGE_VENDOR "EGRES") |
|
49 |
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY |
|
50 |
"LEMON - Library of Efficient Models and Optimization in Networks") |
|
51 |
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") |
|
48 |
IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) |
|
49 |
IF(WIN32) |
|
50 |
SET(CPACK_PACKAGE_NAME ${PROJECT_NAME}) |
|
51 |
SET(CPACK_PACKAGE_VENDOR "EGRES") |
|
52 |
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY |
|
53 |
"LEMON - Library of Efficient Models and Optimization in Networks") |
|
54 |
SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") |
|
52 | 55 |
|
53 |
SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) |
|
56 |
SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) |
|
54 | 57 |
|
55 |
SET(CPACK_PACKAGE_INSTALL_DIRECTORY |
|
56 |
"${PROJECT_NAME} ${PROJECT_VERSION}") |
|
57 |
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY |
|
58 |
"${PROJECT_NAME} ${PROJECT_VERSION}") |
|
58 |
SET(CPACK_PACKAGE_INSTALL_DIRECTORY |
|
59 |
"${PROJECT_NAME} ${PROJECT_VERSION}") |
|
60 |
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY |
|
61 |
"${PROJECT_NAME} ${PROJECT_VERSION}") |
|
59 | 62 |
|
60 |
SET(CPACK_COMPONENTS_ALL headers library html_documentation bin) |
|
63 |
SET(CPACK_COMPONENTS_ALL headers library html_documentation bin) |
|
61 | 64 |
|
62 |
SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers") |
|
63 |
SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library") |
|
64 |
SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Command line utilities") |
|
65 |
SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation") |
|
65 |
SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers") |
|
66 |
SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library") |
|
67 |
SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Command line utilities") |
|
68 |
SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation") |
|
66 | 69 |
|
67 |
SET(CPACK_COMPONENT_HEADERS_DESCRIPTION |
|
68 |
"C++ header files") |
|
69 |
SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION |
|
70 |
"DLL and import library") |
|
71 |
SET(CPACK_COMPONENT_BIN_DESCRIPTION |
|
72 |
"Command line utilities") |
|
73 |
SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION |
|
74 |
"Doxygen generated documentation") |
|
70 |
SET(CPACK_COMPONENT_HEADERS_DESCRIPTION |
|
71 |
"C++ header files") |
|
72 |
SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION |
|
73 |
"DLL and import library") |
|
74 |
SET(CPACK_COMPONENT_BIN_DESCRIPTION |
|
75 |
"Command line utilities") |
|
76 |
SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION |
|
77 |
"Doxygen generated documentation") |
|
75 | 78 |
|
76 |
SET(CPACK_COMPONENT_HEADERS_DEPENDS library) |
|
79 |
SET(CPACK_COMPONENT_HEADERS_DEPENDS library) |
|
77 | 80 |
|
78 |
SET(CPACK_COMPONENT_HEADERS_GROUP "Development") |
|
79 |
SET(CPACK_COMPONENT_LIBRARY_GROUP "Development") |
|
80 |
SET( |
|
81 |
SET(CPACK_COMPONENT_HEADERS_GROUP "Development") |
|
82 |
SET(CPACK_COMPONENT_LIBRARY_GROUP "Development") |
|
83 |
SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation") |
|
81 | 84 |
|
82 |
SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION |
|
83 |
"Components needed to develop software using LEMON") |
|
84 |
SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION |
|
85 |
"Documentation of LEMON") |
|
85 |
SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION |
|
86 |
"Components needed to develop software using LEMON") |
|
87 |
SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION |
|
88 |
"Documentation of LEMON") |
|
86 | 89 |
|
87 |
SET(CPACK_ALL_INSTALL_TYPES Full Developer) |
|
90 |
SET(CPACK_ALL_INSTALL_TYPES Full Developer) |
|
88 | 91 |
|
89 |
SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full) |
|
90 |
SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full) |
|
91 |
SET( |
|
92 |
SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full) |
|
93 |
SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full) |
|
94 |
SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full) |
|
92 | 95 |
|
93 |
SET(CPACK_GENERATOR "NSIS") |
|
94 |
SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico") |
|
95 |
SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/nsis/uninstall.ico") |
|
96 |
#SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\installer.bmp") |
|
97 |
SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico") |
|
98 |
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}") |
|
99 |
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu") |
|
100 |
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu") |
|
101 |
SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu") |
|
102 |
SET(CPACK_NSIS_CREATE_ICONS_EXTRA " |
|
103 |
CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\" |
|
104 |
") |
|
105 |
SET(CPACK_NSIS_DELETE_ICONS_EXTRA " |
|
106 |
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP |
|
107 |
Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\" |
|
108 |
") |
|
96 |
SET(CPACK_GENERATOR "NSIS") |
|
97 |
SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis/lemon.ico") |
|
98 |
SET(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/cmake/nsis/uninstall.ico") |
|
99 |
#SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis\\\\installer.bmp") |
|
100 |
SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico") |
|
101 |
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}") |
|
102 |
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu") |
|
103 |
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu") |
|
104 |
SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu") |
|
105 |
SET(CPACK_NSIS_CREATE_ICONS_EXTRA " |
|
106 |
CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\" |
|
107 |
") |
|
108 |
SET(CPACK_NSIS_DELETE_ICONS_EXTRA " |
|
109 |
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP |
|
110 |
Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\" |
|
111 |
") |
|
109 | 112 |
|
110 |
INCLUDE(CPack) |
|
111 |
ENDIF(WIN32) |
|
113 |
INCLUDE(CPack) |
|
114 |
ENDIF(WIN32) |
|
115 |
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) |
1 |
LEMON code without an explicit copyright is covered by the following |
|
1 |
LEMON code without an explicit copyright notice is covered by the following |
|
2 | 2 |
copyright/license. |
... | ... |
@@ -7,2 +7,6 @@ |
7 | 7 |
|
8 |
=========================================================================== |
|
9 |
Boost Software License, Version 1.0 |
|
10 |
=========================================================================== |
|
11 |
|
|
8 | 12 |
Permission is hereby granted, free of charge, to any person or organization |
... | ... |
@@ -28,6 +32,1 @@ |
28 | 32 |
DEALINGS IN THE SOFTWARE. |
29 |
|
|
30 |
=========================================================================== |
|
31 |
This license is a verbatim copy of the Boost Software License, Version 1.0. |
|
32 |
|
|
33 |
... | ... |
@@ -2,8 +2,8 @@ |
2 | 2 |
SET(PACKAGE_VERSION ${PROJECT_VERSION}) |
3 |
SET(abs_top_srcdir ${CMAKE_SOURCE_DIR}) |
|
4 |
SET(abs_top_builddir ${CMAKE_BINARY_DIR}) |
|
3 |
SET(abs_top_srcdir ${PROJECT_SOURCE_DIR}) |
|
4 |
SET(abs_top_builddir ${PROJECT_BINARY_DIR}) |
|
5 | 5 |
|
6 | 6 |
CONFIGURE_FILE( |
7 |
${CMAKE_SOURCE_DIR}/doc/Doxyfile.in |
|
8 |
${CMAKE_BINARY_DIR}/doc/Doxyfile |
|
7 |
${PROJECT_SOURCE_DIR}/doc/Doxyfile.in |
|
8 |
${PROJECT_BINARY_DIR}/doc/Doxyfile |
|
9 | 9 |
@ONLY) |
... | ... |
@@ -4,3 +4,3 @@ |
4 | 4 |
* |
5 |
* Copyright (C) 2003- |
|
5 |
* Copyright (C) 2003-2009 |
|
6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
... | ... |
@@ -443,9 +443,9 @@ |
443 | 443 |
CplexLp::CplexLp() |
444 |
: LpBase(), |
|
444 |
: LpBase(), LpSolver(), CplexBase() {} |
|
445 | 445 |
|
446 | 446 |
CplexLp::CplexLp(const CplexEnv& env) |
447 |
: LpBase(), |
|
447 |
: LpBase(), LpSolver(), CplexBase(env) {} |
|
448 | 448 |
|
449 | 449 |
CplexLp::CplexLp(const CplexLp& other) |
450 |
: LpBase(), |
|
450 |
: LpBase(), LpSolver(), CplexBase(other) {} |
|
451 | 451 |
|
... | ... |
@@ -800,3 +800,3 @@ |
800 | 800 |
CplexMip::CplexMip() |
801 |
: LpBase(), |
|
801 |
: LpBase(), MipSolver(), CplexBase() { |
|
802 | 802 |
|
... | ... |
@@ -810,3 +810,3 @@ |
810 | 810 |
CplexMip::CplexMip(const CplexEnv& env) |
811 |
: LpBase(), |
|
811 |
: LpBase(), MipSolver(), CplexBase(env) { |
|
812 | 812 |
|
... | ... |
@@ -821,3 +821,3 @@ |
821 | 821 |
CplexMip::CplexMip(const CplexMip& other) |
822 |
: LpBase(), |
|
822 |
: LpBase(), MipSolver(), CplexBase(other) {} |
|
823 | 823 |
... | ... |
@@ -4,3 +4,3 @@ |
4 | 4 |
* |
5 |
* Copyright (C) 2003- |
|
5 |
* Copyright (C) 2003-2009 |
|
6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
... | ... |
@@ -80,3 +80,3 @@ |
80 | 80 |
/// This class implements the common interface of the CPLEX LP and |
81 |
/// MIP solvers. |
|
81 |
/// MIP solvers. |
|
82 | 82 |
/// \ingroup lp_group |
... | ... |
@@ -237,6 +237,9 @@ |
237 | 237 |
|
238 |
/// \e |
|
239 |
virtual CplexMip* cloneSolver() const; |
|
240 |
/// \e |
|
241 |
virtual CplexMip* newSolver() const; |
|
242 |
|
|
238 | 243 |
protected: |
239 | 244 |
|
240 |
virtual CplexMip* _cloneSolver() const; |
|
241 |
virtual CplexMip* _newSolver() const; |
|
242 | 245 |
... | ... |
@@ -4,3 +4,3 @@ |
4 | 4 |
* |
5 |
* Copyright (C) 2003- |
|
5 |
* Copyright (C) 2003-2009 |
|
6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
... | ... |
@@ -533,3 +533,3 @@ |
533 | 533 |
GlpkLp::GlpkLp() |
534 |
: LpBase(), |
|
534 |
: LpBase(), LpSolver(), GlpkBase() { |
|
535 | 535 |
messageLevel(MESSAGE_NO_OUTPUT); |
... | ... |
@@ -538,3 +538,3 @@ |
538 | 538 |
GlpkLp::GlpkLp(const GlpkLp& other) |
539 |
: LpBase(other), |
|
539 |
: LpBase(other), LpSolver(other), GlpkBase(other) { |
|
540 | 540 |
messageLevel(MESSAGE_NO_OUTPUT); |
... | ... |
@@ -832,3 +832,3 @@ |
832 | 832 |
GlpkMip::GlpkMip() |
833 |
: LpBase(), |
|
833 |
: LpBase(), MipSolver(), GlpkBase() { |
|
834 | 834 |
messageLevel(MESSAGE_NO_OUTPUT); |
... | ... |
@@ -837,3 +837,3 @@ |
837 | 837 |
GlpkMip::GlpkMip(const GlpkMip& other) |
838 |
: LpBase(), |
|
838 |
: LpBase(), MipSolver(), GlpkBase(other) { |
|
839 | 839 |
messageLevel(MESSAGE_NO_OUTPUT); |
... | ... |
@@ -20,2 +20,5 @@ |
20 | 20 |
#include <vector> |
21 |
#include <sstream> |
|
22 |
|
|
23 |
#include "test/test_tools.h" |
|
21 | 24 |
|
... | ... |
@@ -25,16 +28,22 @@ |
25 | 28 |
void bubbleSort(std::vector<T>& v) { |
26 |
Counter op("Bubble Sort - Operations: "); |
|
27 |
Counter::NoSubCounter as(op, "Assignments: "); |
|
28 |
Counter::NoSubCounter co(op, "Comparisons: "); |
|
29 |
for (int i = v.size()-1; i > 0; --i) { |
|
30 |
for (int j = 0; j < i; ++j) { |
|
31 |
if (v[j] > v[j+1]) { |
|
32 |
T tmp = v[j]; |
|
33 |
v[j] = v[j+1]; |
|
34 |
v[j+1] = tmp; |
|
35 |
as += 3; |
|
29 |
std::stringstream s1, s2, s3; |
|
30 |
{ |
|
31 |
Counter op("Bubble Sort - Operations: ", s1); |
|
32 |
Counter::SubCounter as(op, "Assignments: ", s2); |
|
33 |
Counter::SubCounter co(op, "Comparisons: ", s3); |
|
34 |
for (int i = v.size()-1; i > 0; --i) { |
|
35 |
for (int j = 0; j < i; ++j) { |
|
36 |
if (v[j] > v[j+1]) { |
|
37 |
T tmp = v[j]; |
|
38 |
v[j] = v[j+1]; |
|
39 |
v[j+1] = tmp; |
|
40 |
as += 3; |
|
41 |
} |
|
42 |
++co; |
|
36 | 43 |
} |
37 |
++co; |
|
38 | 44 |
} |
39 | 45 |
} |
46 |
check(s1.str() == "Bubble Sort - Operations: 102\n", "Wrong counter"); |
|
47 |
check(s2.str() == "Assignments: 57\n", "Wrong subcounter"); |
|
48 |
check(s3.str() == "Comparisons: 45\n", "Wrong subcounter"); |
|
40 | 49 |
} |
... | ... |
@@ -43,17 +52,23 @@ |
43 | 52 |
void insertionSort(std::vector<T>& v) { |
44 |
Counter op("Insertion Sort - Operations: "); |
|
45 |
Counter::NoSubCounter as(op, "Assignments: "); |
|
46 |
Counter::NoSubCounter co(op, "Comparisons: "); |
|
47 |
for (int i = 1; i < int(v.size()); ++i) { |
|
48 |
T value = v[i]; |
|
49 |
++as; |
|
50 |
int j = i; |
|
51 |
while (j > 0 && v[j-1] > value) { |
|
52 |
v[j] = v[j-1]; |
|
53 |
--j; |
|
54 |
|
|
53 |
std::stringstream s1, s2, s3; |
|
54 |
{ |
|
55 |
Counter op("Insertion Sort - Operations: ", s1); |
|
56 |
Counter::SubCounter as(op, "Assignments: ", s2); |
|
57 |
Counter::SubCounter co(op, "Comparisons: ", s3); |
|
58 |
for (int i = 1; i < int(v.size()); ++i) { |
|
59 |
T value = v[i]; |
|
60 |
++as; |
|
61 |
int j = i; |
|
62 |
while (j > 0 && v[j-1] > value) { |
|
63 |
v[j] = v[j-1]; |
|
64 |
--j; |
|
65 |
++co; ++as; |
|
66 |
} |
|
67 |
v[j] = value; |
|
68 |
++as; |
|
55 | 69 |
} |
56 |
v[j] = value; |
|
57 |
++as; |
|
58 | 70 |
} |
71 |
check(s1.str() == "Insertion Sort - Operations: 56\n", "Wrong counter"); |
|
72 |
check(s2.str() == "Assignments: 37\n", "Wrong subcounter"); |
|
73 |
check(s3.str() == "Comparisons: 19\n", "Wrong subcounter"); |
|
59 | 74 |
} |
... | ... |
@@ -61,14 +76,26 @@ |
61 | 76 |
template <typename MyCounter> |
62 |
void counterTest() { |
|
63 |
MyCounter c("Main Counter: "); |
|
64 |
c++; |
|
65 |
typename MyCounter::SubCounter d(c, "SubCounter: "); |
|
66 |
d++; |
|
67 |
typename MyCounter::SubCounter::NoSubCounter e(d, "SubSubCounter: "); |
|
68 |
e++; |
|
69 |
d+=3; |
|
70 |
c-=4; |
|
71 |
e-=2; |
|
72 |
c.reset(2); |
|
73 |
c.reset(); |
|
77 |
void counterTest(bool output) { |
|
78 |
std::stringstream s1, s2, s3; |
|
79 |
{ |
|
80 |
MyCounter c("Main Counter: ", s1); |
|
81 |
c++; |
|
82 |
typename MyCounter::SubCounter d(c, "SubCounter: ", s2); |
|
83 |
d++; |
|
84 |
typename MyCounter::SubCounter::NoSubCounter e(d, "SubSubCounter: ", s3); |
|
85 |
e++; |
|
86 |
d+=3; |
|
87 |
c-=4; |
|
88 |
e-=2; |
|
89 |
c.reset(2); |
|
90 |
c.reset(); |
|
91 |
} |
|
92 |
if (output) { |
|
93 |
check(s1.str() == "Main Counter: 3\n", "Wrong Counter"); |
|
94 |
check(s2.str() == "SubCounter: 3\n", "Wrong SubCounter"); |
|
95 |
check(s3.str() == "", "Wrong NoSubCounter"); |
|
96 |
} else { |
|
97 |
check(s1.str() == "", "Wrong NoCounter"); |
|
98 |
check(s2.str() == "", "Wrong SubCounter"); |
|
99 |
check(s3.str() == "", "Wrong NoSubCounter"); |
|
100 |
} |
|
74 | 101 |
} |
... | ... |
@@ -82,4 +109,4 @@ |
82 | 109 |
{ |
83 |
counterTest<Counter>(); |
|
84 |
counterTest<NoCounter>(); |
|
110 |
counterTest<Counter>(true); |
|
111 |
counterTest<NoCounter>(false); |
|
85 | 112 |
... | ... |
@@ -4,3 +4,3 @@ |
4 | 4 |
* |
5 |
* Copyright (C) 2003- |
|
5 |
* Copyright (C) 2003-2009 |
|
6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
... | ... |
@@ -367,3 +367,3 @@ |
367 | 367 |
//Test for clone/new |
368 |
|
|
368 |
|
|
369 | 369 |
LP* lp = new LP(); |
... | ... |
@@ -395,2 +395,3 @@ |
395 | 395 |
aTest(lp_cplex2); |
396 |
cloneTest<CplexLp>(); |
|
396 | 397 |
} catch (CplexEnv::LicenseError& error) { |
... | ... |
@@ -403,3 +404,2 @@ |
403 | 404 |
} |
404 |
cloneTest<CplexLp>(); |
|
405 | 405 |
#endif |
... | ... |
@@ -4,3 +4,3 @@ |
4 | 4 |
* |
5 |
* Copyright (C) 2003- |
|
5 |
* Copyright (C) 2003-2009 |
|
6 | 6 |
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport |
... | ... |
@@ -111,3 +111,3 @@ |
111 | 111 |
{ |
112 |
|
|
112 |
|
|
113 | 113 |
MIP* mip = new MIP(); |
... | ... |
@@ -135,2 +135,3 @@ |
135 | 135 |
aTest(mip2); |
136 |
cloneTest<CplexMip>(); |
|
136 | 137 |
} catch (CplexEnv::LicenseError& error) { |
... | ... |
@@ -143,3 +144,2 @@ |
143 | 144 |
} |
144 |
cloneTest<CplexMip>(); |
|
145 | 145 |
#endif |
... | ... |
@@ -41,10 +41,8 @@ |
41 | 41 |
unsigned int n; |
42 |
for(n=0;T.realTime()< |
|
42 |
for(n=0;T.realTime()<0.1;n++) ; |
|
43 | 43 |
std::cout << T << " (" << n << " time queries)\n"; |
44 |
T.restart(); |
|
45 |
while(T.realTime()<2.0) ; |
|
46 |
|
|
44 |
|
|
47 | 45 |
TimeStamp full; |
48 | 46 |
TimeStamp t; |
49 |
t=runningTimeTest(f,1,&n,&full); |
|
47 |
t=runningTimeTest(f,0.1,&n,&full); |
|
50 | 48 |
std::cout << t << " (" << n << " tests)\n"; |
... | ... |
@@ -52,3 +50,3 @@ |
52 | 50 |
|
53 |
t=runningTimeTest(g,1,&n,&full); |
|
51 |
t=runningTimeTest(g,0.1,&n,&full); |
|
54 | 52 |
std::cout << t << " (" << n << " tests)\n"; |
1 | 1 |
INCLUDE_DIRECTORIES( |
2 |
${CMAKE_SOURCE_DIR} |
|
3 |
${CMAKE_BINARY_DIR} |
|
2 |
${PROJECT_SOURCE_DIR} |
|
3 |
${PROJECT_BINARY_DIR} |
|
4 | 4 |
) |
5 | 5 |
|
6 |
LINK_DIRECTORIES(${ |
|
6 |
LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon) |
|
7 | 7 |
|
... | ... |
@@ -24,4 +24,4 @@ |
24 | 24 |
INSTALL( |
25 |
FILES ${CMAKE_CURRENT_SOURCE_DIR}/lemon-0.x-to-1.x.sh |
|
26 |
RUNTIME DESTINATION bin |
|
25 |
PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/lemon-0.x-to-1.x.sh |
|
26 |
DESTINATION bin |
|
27 | 27 |
COMPONENT bin) |
... | ... |
@@ -24,8 +24,7 @@ |
24 | 24 |
-e "s/u[Gg]raph/_gr_aph_label_/g"\ |
25 |
-e "s/ |
|
25 |
-e "s/Graph\>/_Digr_aph_label_/g"\ |
|
26 | 26 |
-e "s/\<graph\>/_digr_aph_label_/g"\ |
27 |
-e "s/ |
|
27 |
-e "s/Graphs\>/_Digr_aph_label_s/g"\ |
|
28 | 28 |
-e "s/\<graphs\>/_digr_aph_label_s/g"\ |
29 |
-e "s/_Graph/__Gr_aph_label_/g"\ |
|
30 |
-e "s/\([Gg]\)raph\([a-z_]\)/_\1r_aph_label_\2/g"\ |
|
29 |
-e "s/\([Gg]\)raph\([a-z]\)/_\1r_aph_label_\2/g"\ |
|
31 | 30 |
-e "s/\([a-z_]\)graph/\1_gr_aph_label_/g"\ |
... | ... |
@@ -36,10 +35,10 @@ |
36 | 35 |
-e "s/IncEdgeIt/_In_cEd_geIt_label_/g"\ |
37 |
-e "s/ |
|
36 |
-e "s/Edge\>/_Ar_c_label_/g"\ |
|
38 | 37 |
-e "s/\<edge\>/_ar_c_label_/g"\ |
39 |
-e "s/ |
|
38 |
-e "s/_edge\>/_ar_c_label_/g"\ |
|
39 |
-e "s/Edges\>/_Ar_c_label_s/g"\ |
|
40 | 40 |
-e "s/\<edges\>/_ar_c_label_s/g"\ |
41 |
-e "s/_Edge/__Ed_ge_label_/g"\ |
|
42 |
-e "s/Edge\([a-z_]\)/_Ed_ge_label_\1/g"\ |
|
43 |
-e "s/edge\([a-z_]\)/_ed_ge_label_\1/g"\ |
|
44 |
-e "s/\([a-z_]\)edge/\1_ed_ge_label_/g"\ |
|
41 |
-e "s/_edges\>/_ar_c_label_s/g"\ |
|
42 |
-e "s/\([Ee]\)dge\([a-z]\)/_\1d_ge_label_\2/g"\ |
|
43 |
-e "s/\([a-z]\)edge/\1_ed_ge_label_/g"\ |
|
45 | 44 |
-e "s/Edge/_Ar_c_label_/g"\ |
... | ... |
@@ -118,2 +117,7 @@ |
118 | 117 |
-e "s/\<dirGraphAdaptor\>/orienter/g"\ |
118 |
-e "s/\<LpCplex\>/CplexLp/g"\ |
|
119 |
-e "s/\<MipCplex\>/CplexMip/g"\ |
|
120 |
-e "s/\<LpGlpk\>/GlpkLp/g"\ |
|
121 |
-e "s/\<MipGlpk\>/GlpkMip/g"\ |
|
122 |
-e "s/\<LpSoplex\>/SoplexLp/g"\ |
|
119 | 123 |
<$i > $TMP |
0 comments (0 inline)