1.1 --- a/cmake/FindCOIN.cmake	Tue Apr 26 17:24:31 2011 +0200
     1.2 +++ b/cmake/FindCOIN.cmake	Wed Jul 13 14:52:22 2011 +0200
     1.3 @@ -5,42 +5,52 @@
     1.4  )
     1.5  FIND_LIBRARY(COIN_CBC_LIBRARY
     1.6    NAMES Cbc libCbc
     1.7 +  HINTS ${COIN_ROOT_DIR}/lib/coin
     1.8    HINTS ${COIN_ROOT_DIR}/lib
     1.9  )
    1.10  FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY
    1.11    NAMES CbcSolver libCbcSolver
    1.12 +  HINTS ${COIN_ROOT_DIR}/lib/coin
    1.13    HINTS ${COIN_ROOT_DIR}/lib
    1.14  )
    1.15  FIND_LIBRARY(COIN_CGL_LIBRARY
    1.16    NAMES Cgl libCgl
    1.17 +  HINTS ${COIN_ROOT_DIR}/lib/coin
    1.18    HINTS ${COIN_ROOT_DIR}/lib
    1.19  )
    1.20  FIND_LIBRARY(COIN_CLP_LIBRARY
    1.21    NAMES Clp libClp
    1.22 +  HINTS ${COIN_ROOT_DIR}/lib/coin
    1.23    HINTS ${COIN_ROOT_DIR}/lib
    1.24  )
    1.25  FIND_LIBRARY(COIN_COIN_UTILS_LIBRARY
    1.26    NAMES CoinUtils libCoinUtils
    1.27 +  HINTS ${COIN_ROOT_DIR}/lib/coin
    1.28    HINTS ${COIN_ROOT_DIR}/lib
    1.29  )
    1.30  FIND_LIBRARY(COIN_OSI_LIBRARY
    1.31    NAMES Osi libOsi
    1.32 +  HINTS ${COIN_ROOT_DIR}/lib/coin
    1.33    HINTS ${COIN_ROOT_DIR}/lib
    1.34  )
    1.35  FIND_LIBRARY(COIN_OSI_CBC_LIBRARY
    1.36    NAMES OsiCbc libOsiCbc
    1.37 +  HINTS ${COIN_ROOT_DIR}/lib/coin
    1.38    HINTS ${COIN_ROOT_DIR}/lib
    1.39  )
    1.40  FIND_LIBRARY(COIN_OSI_CLP_LIBRARY
    1.41    NAMES OsiClp libOsiClp
    1.42 +  HINTS ${COIN_ROOT_DIR}/lib/coin
    1.43    HINTS ${COIN_ROOT_DIR}/lib
    1.44  )
    1.45  FIND_LIBRARY(COIN_OSI_VOL_LIBRARY
    1.46    NAMES OsiVol libOsiVol
    1.47 +  HINTS ${COIN_ROOT_DIR}/lib/coin
    1.48    HINTS ${COIN_ROOT_DIR}/lib
    1.49  )
    1.50  FIND_LIBRARY(COIN_VOL_LIBRARY
    1.51    NAMES Vol libVol
    1.52 +  HINTS ${COIN_ROOT_DIR}/lib/coin
    1.53    HINTS ${COIN_ROOT_DIR}/lib
    1.54  )
    1.55  
    1.56 @@ -55,13 +65,13 @@
    1.57    COIN_OSI_LIBRARY
    1.58    COIN_OSI_CBC_LIBRARY
    1.59    COIN_OSI_CLP_LIBRARY
    1.60 -  COIN_OSI_VOL_LIBRARY
    1.61 -  COIN_VOL_LIBRARY
    1.62 +  # COIN_OSI_VOL_LIBRARY
    1.63 +  # COIN_VOL_LIBRARY
    1.64  )
    1.65  
    1.66  IF(COIN_FOUND)
    1.67    SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR})
    1.68 -  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}")
    1.69 +  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}")
    1.70    SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}")
    1.71    SET(COIN_CBC_LIBRARIES ${COIN_LIBRARIES})
    1.72  ENDIF(COIN_FOUND)

     2.1 --- a/test/CMakeLists.txt	Tue Apr 26 17:24:31 2011 +0200
     2.2 +++ b/test/CMakeLists.txt	Wed Jul 13 14:52:22 2011 +0200
     2.3 @@ -69,6 +69,7 @@
     2.4  
     2.5    TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
     2.6    ADD_TEST(lp_test lp_test)
     2.7 +  ADD_DEPENDENCIES(check lp_test)
     2.8  
     2.9    IF(WIN32 AND LEMON_HAVE_GLPK)
    2.10      GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
    2.11 @@ -110,6 +111,7 @@
    2.12  
    2.13    TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
    2.14    ADD_TEST(mip_test mip_test)
    2.15 +  ADD_DEPENDENCIES(check mip_test)
    2.16  
    2.17    IF(WIN32 AND LEMON_HAVE_GLPK)
    2.18      GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)

     3.1 --- a/test/heap_test.cc	Tue Apr 26 17:24:31 2011 +0200
     3.2 +++ b/test/heap_test.cc	Wed Jul 13 14:52:22 2011 +0200
     3.3 @@ -272,5 +272,39 @@
     3.4      heapSortTest<SimpleIntHeap>();
     3.5    }
     3.6  
     3.7 +  {
     3.8 +    typedef FibHeap<Prio, ItemIntMap> IntHeap;
     3.9 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    3.10 +    heapSortTest<IntHeap>();
    3.11 +    heapIncreaseTest<IntHeap>();
    3.12 +
    3.13 +    typedef FibHeap<Prio, IntNodeMap > NodeHeap;
    3.14 +    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
    3.15 +    dijkstraHeapTest<NodeHeap>(digraph, length, source);
    3.16 +  }
    3.17 +
    3.18 +  {
    3.19 +    typedef RadixHeap<ItemIntMap> IntHeap;
    3.20 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    3.21 +    heapSortTest<IntHeap>();
    3.22 +    heapIncreaseTest<IntHeap>();
    3.23 +
    3.24 +    typedef RadixHeap<IntNodeMap > NodeHeap;
    3.25 +    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
    3.26 +    dijkstraHeapTest<NodeHeap>(digraph, length, source);
    3.27 +  }
    3.28 +
    3.29 +  {
    3.30 +    typedef BucketHeap<ItemIntMap> IntHeap;
    3.31 +    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    3.32 +    heapSortTest<IntHeap>();
    3.33 +    heapIncreaseTest<IntHeap>();
    3.34 +
    3.35 +    typedef BucketHeap<IntNodeMap > NodeHeap;
    3.36 +    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
    3.37 +    dijkstraHeapTest<NodeHeap>(digraph, length, source);
    3.38 +  }
    3.39 +
    3.40 +
    3.41    return 0;
    3.42  }