Changeset a951f3

Timestamp:

Jun 21, 2018, 9:12:49 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Children:

7f17c7

Parents:

d83d64

git-author:

Frederik Heber <frederik.heber@…> (09/27/17 21:55:19)

git-committer:

Frederik Heber <frederik.heber@…> (06/21/18 09:12:49)

Message:

Added visible generateAllInducedSubgraphs to Extractors.

Location:

src/FunctionApproximation

Files:

• Extractors.cpp (modified) (4 diffs)
• Extractors.hpp (modified) (3 diffs)

src/FunctionApproximation/Extractors.cpp

@@ -34 +34 @@
 #include <config.h>
 #endif
-
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#include <boost/graph/subgraph.hpp>
 
 //#include "CodePatterns/MemDebug.hpp"
@@ -48 +44 @@
 #include <vector>
 #include <boost/assign.hpp>
-#include <boost/bimap.hpp>
-#include <boost/bimap/set_of.hpp>
-#include <boost/bimap/multiset_of.hpp>
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
@@ -311 +304 @@
  * \param index_map with indices per \a graph' vertex
  */
-void generateAllInducedConnectedSubgraphs(
+void Extractors::generateAllInducedConnectedSubgraphs(
     const size_t N,
     const level_t level,
@@ -415 +408 @@
 }
 
-HomologyGraph createHomologyGraphFromNodes(
+HomologyGraph Extractors::createHomologyGraphFromNodes(
     const nodes_t &nodes,
     const type_index_lookup_t &type_index_lookup,

src/FunctionApproximation/Extractors.hpp

@@ -14 +14 @@
 #endif
 
+#include <boost/bimap.hpp>
+#include <boost/bimap/set_of.hpp>
+#include <boost/bimap/multiset_of.hpp>
+#include <boost/graph/adjacency_list.hpp>
+#include <boost/graph/breadth_first_search.hpp>
+#include <boost/graph/subgraph.hpp>
 #include <boost/function.hpp>
+
+#include <map>
+#include <set>
 
 #include "Fragmentation/EdgesPerFragment.hpp"
@@ -56 +65 @@
   typedef std::set<node_t> nodes_t;
   typedef std::set<nodes_t> set_of_nodes_t;
-  typedef boost::property_map < boost::adjacency_list <>, boost::vertex_index_t >::type index_map_t;
 
   typedef boost::bimap<
@@ -67 +75 @@
 
   typedef boost::adjacency_list < boost::vecS, boost::vecS, boost::undirectedS,
-      boost::no_property, boost::no_property > UndirectedGraph;
+      boost::property<boost::vertex_name_t, atomId_t>,
+      boost::property<boost::vertex_color_t, boost::default_color_type> /* needed for limited-depth DFS,
+      otherwise the property_map gets full size of graph */
+      > UndirectedGraph;
   typedef boost::subgraph< UndirectedGraph > UndirectedSubgraph;
+
+  typedef boost::property_map < UndirectedGraph, boost::vertex_index_t >::type index_map_t;
 
   typedef std::map< node_t, std::pair<Extractors::ParticleType_t, size_t> > node_FragmentNode_map_t;