gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge #419
0 3 0
merge default
2 files changed with 49 insertions and 3 deletions:
↑ Collapse diff ↑
Show white space 6 line context
... ...
@@ -5,42 +5,52 @@
5 5
)
6 6
FIND_LIBRARY(COIN_CBC_LIBRARY
7 7
  NAMES Cbc libCbc
8
  HINTS ${COIN_ROOT_DIR}/lib/coin
8 9
  HINTS ${COIN_ROOT_DIR}/lib
9 10
)
10 11
FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY
11 12
  NAMES CbcSolver libCbcSolver
13
  HINTS ${COIN_ROOT_DIR}/lib/coin
12 14
  HINTS ${COIN_ROOT_DIR}/lib
13 15
)
14 16
FIND_LIBRARY(COIN_CGL_LIBRARY
15 17
  NAMES Cgl libCgl
18
  HINTS ${COIN_ROOT_DIR}/lib/coin
16 19
  HINTS ${COIN_ROOT_DIR}/lib
17 20
)
18 21
FIND_LIBRARY(COIN_CLP_LIBRARY
19 22
  NAMES Clp libClp
23
  HINTS ${COIN_ROOT_DIR}/lib/coin
20 24
  HINTS ${COIN_ROOT_DIR}/lib
21 25
)
22 26
FIND_LIBRARY(COIN_COIN_UTILS_LIBRARY
23 27
  NAMES CoinUtils libCoinUtils
28
  HINTS ${COIN_ROOT_DIR}/lib/coin
24 29
  HINTS ${COIN_ROOT_DIR}/lib
25 30
)
26 31
FIND_LIBRARY(COIN_OSI_LIBRARY
27 32
  NAMES Osi libOsi
33
  HINTS ${COIN_ROOT_DIR}/lib/coin
28 34
  HINTS ${COIN_ROOT_DIR}/lib
29 35
)
30 36
FIND_LIBRARY(COIN_OSI_CBC_LIBRARY
31 37
  NAMES OsiCbc libOsiCbc
38
  HINTS ${COIN_ROOT_DIR}/lib/coin
32 39
  HINTS ${COIN_ROOT_DIR}/lib
33 40
)
34 41
FIND_LIBRARY(COIN_OSI_CLP_LIBRARY
35 42
  NAMES OsiClp libOsiClp
43
  HINTS ${COIN_ROOT_DIR}/lib/coin
36 44
  HINTS ${COIN_ROOT_DIR}/lib
37 45
)
38 46
FIND_LIBRARY(COIN_OSI_VOL_LIBRARY
39 47
  NAMES OsiVol libOsiVol
48
  HINTS ${COIN_ROOT_DIR}/lib/coin
40 49
  HINTS ${COIN_ROOT_DIR}/lib
41 50
)
42 51
FIND_LIBRARY(COIN_VOL_LIBRARY
43 52
  NAMES Vol libVol
53
  HINTS ${COIN_ROOT_DIR}/lib/coin
44 54
  HINTS ${COIN_ROOT_DIR}/lib
45 55
)
46 56

	
... ...
@@ -55,13 +65,13 @@
55 65
  COIN_OSI_LIBRARY
56 66
  COIN_OSI_CBC_LIBRARY
57 67
  COIN_OSI_CLP_LIBRARY
58
  COIN_OSI_VOL_LIBRARY
59
  COIN_VOL_LIBRARY
68
  # COIN_OSI_VOL_LIBRARY
69
  # COIN_VOL_LIBRARY
60 70
)
61 71

	
62 72
IF(COIN_FOUND)
63 73
  SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR})
64
  SET(COIN_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_OSI_VOL_LIBRARY};${COIN_VOL_LIBRARY}")
74
  SET(COIN_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY}")
65 75
  SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}")
66 76
  SET(COIN_CBC_LIBRARIES ${COIN_LIBRARIES})
67 77
ENDIF(COIN_FOUND)
Show white space 6 line context
... ...
@@ -72,6 +72,7 @@
72 72

	
73 73
  TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
74 74
  ADD_TEST(lp_test lp_test)
75
  ADD_DEPENDENCIES(check lp_test)
75 76

	
76 77
  IF(WIN32 AND LEMON_HAVE_GLPK)
77 78
    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
... ...
@@ -113,6 +114,7 @@
113 114

	
114 115
  TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
115 116
  ADD_TEST(mip_test mip_test)
117
  ADD_DEPENDENCIES(check mip_test)
116 118

	
117 119
  IF(WIN32 AND LEMON_HAVE_GLPK)
118 120
    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
Show white space 6 line context
... ...
@@ -272,5 +272,39 @@
272 272
    heapSortTest<SimpleIntHeap>();
273 273
  }
274 274

	
275
  {
276
    typedef FibHeap<Prio, ItemIntMap> IntHeap;
277
    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
278
    heapSortTest<IntHeap>();
279
    heapIncreaseTest<IntHeap>();
280

	
281
    typedef FibHeap<Prio, IntNodeMap > NodeHeap;
282
    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
283
    dijkstraHeapTest<NodeHeap>(digraph, length, source);
284
  }
285

	
286
  {
287
    typedef RadixHeap<ItemIntMap> IntHeap;
288
    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
289
    heapSortTest<IntHeap>();
290
    heapIncreaseTest<IntHeap>();
291

	
292
    typedef RadixHeap<IntNodeMap > NodeHeap;
293
    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
294
    dijkstraHeapTest<NodeHeap>(digraph, length, source);
295
  }
296

	
297
  {
298
    typedef BucketHeap<ItemIntMap> IntHeap;
299
    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
300
    heapSortTest<IntHeap>();
301
    heapIncreaseTest<IntHeap>();
302

	
303
    typedef BucketHeap<IntNodeMap > NodeHeap;
304
    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
305
    dijkstraHeapTest<NodeHeap>(digraph, length, source);
306
  }
307

	
308

	
275 309
  return 0;
276 310
}
0 comments (0 inline)