Changeset - r1065:b522385b2a0d
« 1063:0dba9b
« 1058:d9a2bf
1070:c8c880 »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge #419 to branch 1.2
0 3 0
merge 1.2
2 files changed with 49 insertions and 3 deletions:
cmake/FindCOIN.cmake
13
3
test/CMakeLists.txt
2
test/heap_test.cc
34
↑ Collapse diff ↑
cmake/FindCOIN.cmake
Show white space 6 line context
... ... 
@@ -7,2 +7,3 @@
7 7 
  NAMES Cbc libCbc
8 
  HINTS ${COIN_ROOT_DIR}/lib/coin
8 9 
  HINTS ${COIN_ROOT_DIR}/lib
... ... 
@@ -11,2 +12,3 @@
11 12 
  NAMES CbcSolver libCbcSolver
13 
  HINTS ${COIN_ROOT_DIR}/lib/coin
12 14 
  HINTS ${COIN_ROOT_DIR}/lib
... ... 
@@ -15,2 +17,3 @@
15 17 
  NAMES Cgl libCgl
18 
  HINTS ${COIN_ROOT_DIR}/lib/coin
16 19 
  HINTS ${COIN_ROOT_DIR}/lib
... ... 
@@ -19,2 +22,3 @@
19 22 
  NAMES Clp libClp
23 
  HINTS ${COIN_ROOT_DIR}/lib/coin
20 24 
  HINTS ${COIN_ROOT_DIR}/lib
... ... 
@@ -23,2 +27,3 @@
23 27 
  NAMES CoinUtils libCoinUtils
28 
  HINTS ${COIN_ROOT_DIR}/lib/coin
24 29 
  HINTS ${COIN_ROOT_DIR}/lib
... ... 
@@ -27,2 +32,3 @@
27 32 
  NAMES Osi libOsi
33 
  HINTS ${COIN_ROOT_DIR}/lib/coin
28 34 
  HINTS ${COIN_ROOT_DIR}/lib
... ... 
@@ -31,2 +37,3 @@
31 37 
  NAMES OsiCbc libOsiCbc
38 
  HINTS ${COIN_ROOT_DIR}/lib/coin
32 39 
  HINTS ${COIN_ROOT_DIR}/lib
... ... 
@@ -35,2 +42,3 @@
35 42 
  NAMES OsiClp libOsiClp
43 
  HINTS ${COIN_ROOT_DIR}/lib/coin
36 44 
  HINTS ${COIN_ROOT_DIR}/lib
... ... 
@@ -39,2 +47,3 @@
39 47 
  NAMES OsiVol libOsiVol
48 
  HINTS ${COIN_ROOT_DIR}/lib/coin
40 49 
  HINTS ${COIN_ROOT_DIR}/lib
... ... 
@@ -43,2 +52,3 @@
43 52 
  NAMES Vol libVol
53 
  HINTS ${COIN_ROOT_DIR}/lib/coin
44 54 
  HINTS ${COIN_ROOT_DIR}/lib
... ... 
@@ -57,4 +67,4 @@
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 
)
... ... 
@@ -63,3 +73,3 @@
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}")
test/CMakeLists.txt
Ignore white space 6 line context
... ... 
@@ -71,2 +71,3 @@
71 71 
  ADD_TEST(lp_test lp_test)
72 
  ADD_DEPENDENCIES(check lp_test)
72 73 

			




	...
	...
	
		
@@ -112,2 +113,3 @@


			




	112
	113
	
		
  ADD_TEST(mip_test mip_test)


			




	
	114
	
		
  ADD_DEPENDENCIES(check mip_test)


			




	113
	115
	
		

			




        

    

    

    

        

            

                

                    test/heap_test.cc
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -274,2 +274,36 @@


			




	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;


			




        

    






    
    



    


    

     
    
0 comments (0 inline)