[capd] minor update

codac-team · Jan 7, 2025 · fc79237 · fc79237
1 parent 80fbd84
commit fc79237
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 122 deletions.
diff --git a/examples/05_capd_solver/main.cpp b/examples/05_capd_solver/main.cpp
@@ -51,9 +51,7 @@ int main()
   DefaultView::set_axes(axis(0,{-2,1.5}),axis(1,{-2,3}));
 
   for (float t=0.;t<20.;t+=0.05)
-  {
     DefaultView::draw_box(to_codac(solution(t)));
-  }
 
   DefaultView::draw_box(to_codac(c),Color::green());
   DefaultView::draw_box(to_codac(result),Color::red());

diff --git a/include/codac-capd.h b/include/codac-capd.h
diff --git a/include/codac2-capd.h b/include/codac2-capd.h
diff --git a/include/codac2_capd.h b/include/codac2_capd.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -75,7 +75,6 @@
     set(CODAC_CXX_FLAGS \"\")
   ")
 
-
   #if(WITH_PYTHON)
   #  
   #  file(APPEND ${CODAC_CMAKE_CONFIG_FILE} "
@@ -94,7 +93,6 @@
   #
   #endif()
 
-
   if(WITH_CAPD)
 
     file(APPEND ${CODAC_CMAKE_CONFIG_FILE} "
@@ -114,7 +112,6 @@
 
   endif()
 
-
   install(FILES ${CODAC_CMAKE_CONFIG_FILE} DESTINATION ${CMAKE_INSTALL_CMAKE})
 
 

diff --git a/src/capd/codac2_capd.cpp b/src/capd/codac2_capd.cpp
@@ -18,14 +18,12 @@ namespace codac2
 {
   capd::Interval to_capd(const Interval &x)
   {
-    capd::Interval y(x.lb(), x.ub());
-    return y;
+    return {x.lb(), x.ub()};
   }
 
   Interval to_codac(const capd::Interval &x)
   {
-    Interval y(x.leftBound(), x.rightBound());
-    return y;
+    return {x.leftBound(), x.rightBound()};
   }
 
   capd::IVector to_capd(const IntervalVector &x)
@@ -51,26 +49,18 @@ namespace codac2
   capd::IMatrix to_capd(const IntervalMatrix &x)
   {
     capd::IMatrix y(x.rows(), x.cols());
-    for (Index i = 0; i < (Index)x.rows(); i++)
-    {
-      for (Index j = 0; j < (Index)x.cols(); j++)
-      {
+    for (Index i = 0; i < x.rows(); i++)
+      for (Index j = 0; j < x.cols(); j++)
         y[i][j] = to_capd(x(i, j));
-      }
-    }
     return y;
   }
 
   IntervalMatrix to_codac(const capd::IMatrix &x)
   {
     IntervalMatrix y(x.numberOfRows(), x.numberOfColumns());
     for (Index i = 0; i < (Index)x.numberOfRows(); i++)
-    {
       for (Index j = 0; j < (Index)x.numberOfColumns(); j++)
-      {
         y(i, j) = to_codac(x[i][j]);
-      }
-    }
     return y;
   }
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -84,6 +84,16 @@ list(APPEND SRC_TESTS # listing files without extension
   graphics/styles/codac2_tests_Color
 )
 
+set(CODAC_LIBRARIES ${PROJECT_NAME}-core)
+
+# CAPD test
+if (WITH_CAPD)
+  list(APPEND SRC_TESTS
+    capd/codac2_tests_capd
+  )
+  set(CODAC_LIBRARIES ${CODAC_LIBRARIES} ${PROJECT_NAME}-capd capd::capd)
+endif()
+
 foreach(SRC_TEST ${SRC_TESTS})
   string(REPLACE "/" "_" TEST_NAME ${SRC_TEST})
   string(REPLACE "codac2_tests_" "" TEST_NAME ${TEST_NAME})
@@ -93,7 +103,7 @@ foreach(SRC_TEST ${SRC_TESTS})
   add_executable(${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_TEST}.cpp)
   set(CODAC_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../include)
   target_include_directories(${TEST_NAME} SYSTEM PUBLIC ${CODAC_HEADERS_DIR})
-  target_link_libraries(${TEST_NAME} PUBLIC Ibex::ibex ${PROJECT_NAME}-core PRIVATE Catch2::Catch2WithMain)
+  target_link_libraries(${TEST_NAME} PUBLIC Ibex::ibex ${CODAC_LIBRARIES} PRIVATE Catch2::Catch2WithMain)
   add_dependencies(check ${TEST_NAME})
   add_test(NAME ${TEST_NAME}_cpp COMMAND ${TEST_NAME})
 
@@ -102,14 +112,4 @@ foreach(SRC_TEST ${SRC_TESTS})
     add_test(NAME ${TEST_NAME}_py COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_TEST}.py)
   endif()
 
-endforeach()
-
-# CAPD test
-if (WITH_CAPD)
-  add_executable(capd_tests capd/codac2_tests_capd.cpp)
-  set(CODAC_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../include)
-  target_include_directories(capd_tests SYSTEM PUBLIC ${CODAC_HEADERS_DIR})
-  target_link_libraries(capd_tests PUBLIC Ibex::ibex capd::capd ${PROJECT_NAME}-core ${PROJECT_NAME}-capd PRIVATE Catch2::Catch2WithMain)
-  add_dependencies(check capd_tests)
-  add_test(NAME capd_tests_cpp COMMAND capd_tests)
-endif()
+endforeach()
diff --git a/tests/capd/codac2_tests_capd.py b/tests/capd/codac2_tests_capd.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+
+#  Codac tests
+# ----------------------------------------------------------------------------
+#  \date       2024
+#  \author     Maël Godard
+#  \copyright  Copyright 2024 Codac Team
+#  \license    GNU Lesser General Public License (LGPL)
+
+import unittest
+from codac import *
+
+class TestCAPD(unittest.TestCase):
+
+  def tests_capd(self):
+     self.assertTrue(True)
+
+if __name__ ==  '__main__':
+  unittest.main()