From 761f57be6cc34d925cbdd777d444ffaef81e62f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana=20G=C3=B3mez?=
 <rmontanana@gmail.com>
Date: Thu, 9 Jan 2025 11:25:19 +0100
Subject: [PATCH] Update tests

---
 cmake/modules/CodeCoverage.cmake | 8 ++++++--
 lib/json                         | 2 +-
 tests/CMakeLists.txt             | 5 +++--
 tests/TestPythonClassifiers.cc   | 4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/cmake/modules/CodeCoverage.cmake b/cmake/modules/CodeCoverage.cmake
index d4a039f..670dea8 100644
--- a/cmake/modules/CodeCoverage.cmake
+++ b/cmake/modules/CodeCoverage.cmake
@@ -137,7 +137,7 @@
 
 include(CMakeParseArguments)
 
-option(CODE_COVERAGE_VERBOSE "Verbose information" FALSE)
+option(CODE_COVERAGE_VERBOSE "Verbose information" TRUE)
 
 # Check prereqs
 find_program( GCOV_PATH gcov )
@@ -160,7 +160,11 @@ foreach(LANG ${LANGUAGES})
     endif()
   elseif(NOT "${CMAKE_${LANG}_COMPILER_ID}" MATCHES "GNU"
          AND NOT "${CMAKE_${LANG}_COMPILER_ID}" MATCHES "(LLVM)?[Ff]lang")
-    message(FATAL_ERROR "Compiler is not GNU or Flang! Aborting...")
+         if ("${LANG}" MATCHES "CUDA")
+             message(STATUS "Ignoring CUDA")
+        else()
+            message(FATAL_ERROR "Compiler is not GNU or Flang! Aborting...")
+        endif()
   endif()
 endforeach()
 
diff --git a/lib/json b/lib/json
index 378e091..48e7b4c 160000
--- a/lib/json
+++ b/lib/json
@@ -1 +1 @@
-Subproject commit 378e091795a70fced276cd882bd8a6a428668fe5
+Subproject commit 48e7b4c23b089c088c11e51c824d78d0f0949b40
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d490b1c..44fd486 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,14 +3,15 @@ if(ENABLE_TESTING)
     include_directories(
         ${PyClassifiers_SOURCE_DIR}
         ${PyClassifiers_SOURCE_DIR}/lib/Files
-        ${PyClassifiers_SOURCE_DIR}/lib/mdlp
+        ${PyClassifiers_SOURCE_DIR}/lib/mdlp/src
         ${PyClassifiers_SOURCE_DIR}/lib/json/include
         ${Python3_INCLUDE_DIRS}
         ${TORCH_INCLUDE_DIRS}
+        ${CMAKE_BINARY_DIR}/configured_files/include
         /usr/local/include
     )
     file(GLOB_RECURSE PyClassifiers_SOURCES "${PyClassifiers_SOURCE_DIR}/pyclfs/*.cc")
     set(TEST_SOURCES_PYCLASSIFIERS TestPythonClassifiers.cc TestUtils.cc ${PyClassifiers_SOURCES})
     add_executable(${TEST_PYCLASSIFIERS} ${TEST_SOURCES_PYCLASSIFIERS})
-    target_link_libraries(${TEST_PYCLASSIFIERS} PUBLIC "${TORCH_LIBRARIES}" ${Python3_LIBRARIES} ${LIBTORCH_PYTHON} Boost::boost Boost::python Boost::numpy ArffFiles mdlp Catch2::Catch2WithMain)
+    target_link_libraries(${TEST_PYCLASSIFIERS} PUBLIC "${TORCH_LIBRARIES}" ${Python3_LIBRARIES} ${LIBTORCH_PYTHON} Boost::boost Boost::python Boost::numpy ArffFiles fimdlp Catch2::Catch2WithMain)
 endif(ENABLE_TESTING)
\ No newline at end of file
diff --git a/tests/TestPythonClassifiers.cc b/tests/TestPythonClassifiers.cc
index 8c2b22c..b36aede 100644
--- a/tests/TestPythonClassifiers.cc
+++ b/tests/TestPythonClassifiers.cc
@@ -33,8 +33,8 @@ TEST_CASE("Test Python Classifiers score", "[PyClassifiers]")
         {"RandomForest", new pywrap::RandomForest()}
     };
     map<std::string, std::string> versions = {
-        {"ODTE", "1.0.0"},
-        {"STree", "1.3.2"},
+        {"ODTE", "1.0.0-1"},
+        {"STree", "1.4.0"},
         {"SVC", "1.5.1"},
         {"RandomForest", "1.5.1"}
     };