[ctc] added cpp files for CtcBox, CtcCartProd

codac-team · May 17, 2022 · 5de05eb · 5de05eb
1 parent 01a4d84
commit 5de05eb
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 27 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -100,7 +100,9 @@
                   ${CMAKE_CURRENT_SOURCE_DIR}/serialize/codac_serialize_intervals.cpp
                   ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_Ctc.h
                   ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_CtcBox.h
+                  ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_CtcBox.cpp
                   ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_CtcCartProd.h
+                  ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_CtcCartProd.cpp
                   ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_CtcCompo.h
                   ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_CtcDist.h
                   ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_CtcDist.cpp

diff --git a/src/core/contractors/static/codac_CtcBox.cpp b/src/core/contractors/static/codac_CtcBox.cpp
@@ -0,0 +1,25 @@
+/** 
+ *  CtcBox class
+ * ----------------------------------------------------------------------------
+ *  \date       2022
+ *  \author     Quentin Brateau
+ *  \copyright  Copyright 2022 Codac Team
+ *  \license    This program is distributed under the terms of
+ *              the GNU Lesser General Public License (LGPL).
+ */
+
+#include "codac_CtcBox.h"
+
+using namespace std;
+
+namespace codac
+{
+  void CtcBox::contract(IntervalVector& x)
+  {
+    // Checking the dimension of the input box
+    assert(_b.size() == x.size());
+
+    // Contracting the input box around the support box
+    x &= _b;
+  }
+}
diff --git a/src/core/contractors/static/codac_CtcBox.h b/src/core/contractors/static/codac_CtcBox.h
@@ -44,15 +44,6 @@ namespace codac
 
       const IntervalVector _b; //!< the support box
   };
-
-  void CtcBox::contract(IntervalVector& x)
-  {
-    // Checking the dimension of the input box
-    assert(_b.size() == x.size());
-
-    // Contracting the input box around the support box
-    x &= _b;
-  }
 }
 
 #endif
diff --git a/src/core/contractors/static/codac_CtcCartProd.cpp b/src/core/contractors/static/codac_CtcCartProd.cpp
@@ -0,0 +1,35 @@
+/** 
+ *  CtcCartProd class
+ * ----------------------------------------------------------------------------
+ *  \date       2022
+ *  \author     Quentin Brateau
+ *  \copyright  Copyright 2022 Codac Team
+ *  \license    This program is distributed under the terms of
+ *              the GNU Lesser General Public License (LGPL).
+ */
+
+#include "codac_CtcCartProd.h"
+
+using namespace std;
+
+namespace codac
+{
+  void CtcCartProd::contract(IntervalVector& x)
+  {
+    std::size_t index = 0;
+    for (int i=0; i < m_v.size(); i++) {
+      IntervalVector sx(m_v[i].nb_var);
+      for (int k=0; k < m_v[i].nb_var; k++) {
+        sx[k] = x[index + k];
+      }
+      m_v[i].contract(sx);
+      x.put(index, sx);
+      index += m_v[i].nb_var;
+    }
+  }
+
+  CtcCartProd cart_prod(const ibex::Array<Ctc>& array)
+  {
+    return CtcCartProd(array);
+  }
+}
diff --git a/src/core/contractors/static/codac_CtcCartProd.h b/src/core/contractors/static/codac_CtcCartProd.h
@@ -53,20 +53,6 @@ namespace codac
       ibex::Array<Ctc> m_v; //!< vector containing the contractors
   };
 
-  void CtcCartProd::contract(IntervalVector& x)
-  {
-    std::size_t index = 0;
-    for (int i=0; i < m_v.size(); i++) {
-      IntervalVector sx(m_v[i].nb_var);
-      for (int k=0; k < m_v[i].nb_var; k++) {
-        sx[k] = x[index + k];
-      }
-      m_v[i].contract(sx);
-      x.put(index, sx);
-      index += m_v[i].nb_var;
-    }
-  }
-
   /**
    * \fn template <typename ...Args> CtcCartProd<Args...> cart_prod(Args &...args)
    * \brief Cartesian product of contractors
@@ -86,10 +72,7 @@ namespace codac
    * \param array ibex::Array of contractors
    * \return the Cartesian product of the contractors \f$\mathcal{C}_1\times\dots\times\mathcal{C}_n\f$
    */
-  CtcCartProd cart_prod(const ibex::Array<Ctc>& array)
-  {
-    return CtcCartProd(array);
-  }
+  CtcCartProd cart_prod(const ibex::Array<Ctc>& array);
 }
 
 #endif