allow to retrieve subtree of parent

Author: saschatommasone

plugins/clock_tree_extractor/include/clock_tree_extractor/clock_tree.h

@@ -74,7 +74,7 @@ namespace hal
 
             Result<std::monostate> export_dot( const std::string &pathname ) const;
 
-            Result<std::unique_ptr<ClockTree>> get_subtree( const void *ptr ) const;
+            Result<std::unique_ptr<ClockTree>> get_subtree( const void *ptr, const bool parent ) const;
 
             Result<igraph_integer_t> get_vertex_from_ptr( const void *ptr ) const;
 

plugins/clock_tree_extractor/python/python_bindings.cpp

@@ -127,8 +127,10 @@ namespace hal
                 R"()" )
             .def(
                 "get_subtree",
-                []( const cte::ClockTree &self, const void *ptr ) -> std::unique_ptr<cte::ClockTree> {
-                    auto result = self.get_subtree( ptr );
+                []( const cte::ClockTree &self,
+                    const void *ptr,
+                    const bool parent ) -> std::unique_ptr<cte::ClockTree> {
+                    auto result = self.get_subtree( ptr, parent );
                     if( result.is_ok() )
                     {
                         return result.get();
@@ -138,6 +140,7 @@ namespace hal
                     return nullptr;
                 },
                 py::arg( "ptr" ),
+                py::arg( "parent" ) = false,
                 py::return_value_policy::move,
                 R"()" )
             .def(

plugins/clock_tree_extractor/src/clock_tree.cpp

@@ -469,17 +469,39 @@ namespace hal
             return OK( {} );
         }
 
-        Result<std::unique_ptr<ClockTree>> ClockTree::get_subtree( const void *ptr ) const
+        Result<std::unique_ptr<ClockTree>> ClockTree::get_subtree( const void *ptr, const bool parent ) const
         {
             auto it = m_ptrs_to_vertices.find( ptr );
             if( it == m_ptrs_to_vertices.end() )
             {
                 return ERR( "object is not part of clock tree" );
             }
 
-            const igraph_integer_t root = it->second;
-
             igraph_error_t ierror;
+            igraph_integer_t root = it->second;
+            if( parent )
+            {
+                igraph_vector_int_t parents;
+                if( ( ierror = igraph_vector_int_init( &parents, 0 ) ) != IGRAPH_SUCCESS )
+                {
+                    return ERR( igraph_strerror( ierror ) );
+                }
+
+                if( ( ierror = igraph_neighbors( m_igraph_ptr, &parents, root, IGRAPH_IN ) ) != IGRAPH_SUCCESS )
+                {
+                    igraph_vector_int_destroy( &parents );
+                    return ERR( igraph_strerror( ierror ) );
+                }
+
+                // Only accept, if there is only one parent vertex for now.
+                if( igraph_vector_int_size( &parents ) == 1 )
+                {
+                    root = VECTOR( parents )[0];
+                }
+
+                igraph_vector_int_destroy( &parents );
+            }
+
             igraph_vector_int_t vertices;
             if( ( ierror = igraph_vector_int_init( &vertices, 0 ) ) != IGRAPH_SUCCESS )
             {
@@ -638,9 +660,3 @@ namespace hal
         }
     }  // namespace cte
 }  // namespace hal
-
-// BUG: looks like ~20 vertices plus their edges are missing in benchmark
-// TODO: investigate possible BUG
-
-// BUG: subtree is wrong
-// TODO: investigate why? Probably mapping is broken