Merge branch 'Jordan08-dev-clean-v2-12' into codac2_dev

Author: SimonRohou

doc/CMakeLists.txt

@@ -34,10 +34,19 @@
 
       message(STATUS "Building API Documentation (mandatory for Python binding or for building the manual)")
 
-      set(SPHINX_EXTRA_API ${CMAKE_CURRENT_BINARY_DIR}/manual/extra_html/api)
-      file(MAKE_DIRECTORY ${SPHINX_EXTRA_API})
-
-      execute_process(COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT} OUTPUT_QUIET)
+      execute_process(
+        COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT}
+        OUTPUT_QUIET
+        ERROR_VARIABLE DOXYGEN_ERROR
+        RESULT_VARIABLE DOXYGEN_RESULT
+      )
+      if(NOT DOXYGEN_RESULT EQUAL 0)
+        if(EXISTS "${CMAKE_BINARY_DIR}/doc/api/xml/index.xml")
+          message(WARNING "Doxygen exited with '${DOXYGEN_RESULT}' but generated XML output. Continuing so Python docstrings can still be generated.")
+        else()
+          message(FATAL_ERROR "Doxygen failed to generate the API documentation (exit code ${DOXYGEN_RESULT}), which is required for the Python docstrings. Doxygen errors: ${DOXYGEN_ERROR}")
+        endif()
+      endif()
       add_custom_target(api COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT} OUTPUT_QUIET)
 
     endif()

python/CMakeLists.txt

@@ -64,7 +64,11 @@
     execute_process(COMMAND ${PYTHON_EXECUTABLE}
       ${PROJECT_SOURCE_DIR}/scripts/doxygen/doxygen2docstring.py
       ${CMAKE_CURRENT_BINARY_DIR}/../doc/api/xml/
-      ${CMAKE_CURRENT_BINARY_DIR}/docstring)
+      ${CMAKE_CURRENT_BINARY_DIR}/docstring
+      RESULT_VARIABLE DOCSTRING_RESULT)
+    if(NOT DOCSTRING_RESULT EQUAL 0)
+      message(FATAL_ERROR "doxygen2docstring.py failed (exit code ${DOCSTRING_RESULT}) while generating the Python docstring headers.")
+    endif()
 
   endif()
 

src/core/contractors/codac2_CtcInverse_.h

@@ -18,14 +18,17 @@ namespace codac2
   // PavingOut class
 
     PavingOut::PavingOut(Index n)
-      : Paving<PavingOut,IntervalVector>(n)
+      : Paving<PavingOut,IntervalVector>()
     {
       assert_release(n > 0);
+      this->init_tree(IntervalVector(n));
     }
 
     PavingOut::PavingOut(const IntervalVector& x)
-      : Paving<PavingOut,IntervalVector>(x)
-    { }
+      : Paving<PavingOut,IntervalVector>()
+    {
+      this->init_tree(x);
+    }
 
     std::list<PavingOut::ConnectedSubset_> PavingOut::connected_subsets(const PavingOut::NodeValue_& node_value) const
     {
@@ -77,20 +80,23 @@ namespace codac2
     IntervalVector operator&(const IntervalVector& x, const PavingOut& p)
     {
       return p & x;
-    };
+    }
 
 
   // PavingInOut class
 
     PavingInOut::PavingInOut(Index n)
-      : Paving<PavingInOut,IntervalVector,IntervalVector>(n)
+      : Paving<PavingInOut,IntervalVector,IntervalVector>()
     {
       assert_release(n > 0);
+      this->init_tree(IntervalVector(n));
     }
 
     PavingInOut::PavingInOut(const IntervalVector& x)
-      : Paving<PavingInOut,IntervalVector,IntervalVector>(x)
-    { }
+      : Paving<PavingInOut,IntervalVector,IntervalVector>()
+    {
+      this->init_tree(x);
+    }
 
     std::list<PavingInOut::ConnectedSubset_> PavingInOut::connected_subsets(const PavingInOut::NodeValue_& node_value) const
     {
@@ -141,4 +147,4 @@ namespace codac2
         l.push_back(n->unknown());
       return l;
     };
-}
+}

src/core/domains/paving/codac2_Paving.cpp

@@ -32,15 +32,12 @@ namespace codac2
       using NodeValue_ = std::function<std::list<IntervalVector>(Node_)>;
       using ConnectedSubset_ = Subpaving<P>;
 
-      Paving(Index n)
-        : Paving(IntervalVector(n))
-      {
-        assert_release(n > 0);
-      }
+    protected:
 
-      Paving(const IntervalVector& x)
-        : _tree(std::make_shared<PavingNode<P>>(*static_cast<P*>(this), x))
+      Paving()
       { }
+      
+    public:
 
       inline Index size() const
       {
@@ -128,6 +125,11 @@ namespace codac2
 
       friend class PavingNode<P>;
 
+      inline void init_tree(const IntervalVector& x)
+      {
+        _tree = std::make_shared<PavingNode<P>>(*static_cast<P*>(this), x);
+      }
+
       inline static NodeTuple_ init_tuple(const IntervalVector& x)
       {
         return std::make_tuple(((X)x)...);
@@ -196,4 +198,4 @@ namespace codac2
 
       static const NodeValue_ outer, outer_complem, inner, bound, all;
   };
-}
+}

src/core/domains/paving/codac2_Paving.h

@@ -61,7 +61,7 @@ namespace codac2
 
       std::shared_ptr<const PavingNode<P>> top() const
       {
-        return _top;
+        return _top.lock();
       }
 
       std::shared_ptr<PavingNode<P>> top()
@@ -102,7 +102,7 @@ namespace codac2
 
       void visit(std::function<bool(std::shared_ptr<const PavingNode<P>>)> visitor) const
       {
-        if(!_top && !_right && _left && left()->boxes() == _x)
+        if(_top.expired() && !_right && _left && left()->boxes() == _x)
           left()->visit(visitor);
 
         else if(visitor(this->shared_from_this()))
@@ -114,7 +114,7 @@ namespace codac2
 
       void visit(std::function<bool(std::shared_ptr<PavingNode<P>>)> visitor)
       {
-        if(!_top && !_right && _left && left()->boxes() == _x)
+        if(_top.expired() && !_right && _left && left()->boxes() == _x)
           _left->visit(visitor);
 
         else if(visitor(this->shared_from_this()))
@@ -157,7 +157,7 @@ namespace codac2
 
       const P& _paving;
       typename P::NodeTuple_ _x;
-      std::shared_ptr<PavingNode<P>> _top = nullptr;
+      std::weak_ptr<PavingNode<P>> _top;
       std::shared_ptr<PavingNode<P>> _left = nullptr, _right = nullptr;
   };
-}
+}