X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FGraph.h;h=2f5de3de36fd6812eee65ed114a771e7ffcf9b33;hb=9b18a9b609c0af78b4bb08667fd8e02ebd897d5e;hp=fad35ac37d0604ee6f3d7a9d1cd57a461eeef8b7;hpb=50a81deff4a67de46b4c183623f72bef715eb7d1;p=lyx.git

diff --git a/src/Graph.h b/src/Graph.h
index fad35ac37d..2f5de3de36 100644
--- a/src/Graph.h
+++ b/src/Graph.h
@@ -13,8 +13,10 @@
 #ifndef GRAPH_H
 #define GRAPH_H
 
+
 #include <list>
 #include <queue>
+#include <set>
 #include <vector>
 
 
@@ -29,10 +31,10 @@ public:
 	///
 	typedef std::vector<int> EdgePath;
 	/// \return a vector of the vertices from which "to" can be reached
-	std::vector<int> const getReachableTo(int to, bool clear_visited);
-	/// \return a vector of the vertices that can be reached from "from"
-	std::vector<int> const
-		getReachable(int from, bool only_viewable, bool clear_visited);
+	EdgePath const getReachableTo(int to, bool clear_visited);
+	/// \return a vector of the reachable vertices, avoiding all "excludes"
+	EdgePath const getReachable(int from, bool only_viewable,
+		bool clear_visited, std::set<int> excludes = std::set<int>());
 	/// can "from" be reached from "to"?
 	bool isReachable(int from, int to);
 	/// find a path from "from" to "to". always returns one of the
@@ -45,24 +47,19 @@ public:
 
 private:
 	///
-	bool bfs_init(int, bool clear_visited = true);
-	/// clears the paths from a previous search. should be
-	/// called before each new one.
-	void clearPaths();
-	/// used to recover a marked path 
-	void getMarkedPath(int from, int to, EdgePath & path);
+	bool bfs_init(int, bool clear_visited, std::queue<int> & Q);
 	/// these represent the arrows connecting the nodes of the graph.
-	/// this is the basic representation of the graph: as a bunch of 
+	/// this is the basic representation of the graph: as a bunch of
 	/// arrows.
 	struct Arrow {
 		///
-		Arrow(int f, int t, int i): 
+		Arrow(int f, int t, int i):
 			from(f), to(t), id(i) {}
 		/// the vertex at the tail of the arrow
 		int from;
 		/// the vertex at the head
 		int to;
-		/// an id for this arrow, e.g., for use in describing paths 
+		/// an id for this arrow, e.g., for use in describing paths
 		/// through the graph
 		int id;
 	};
@@ -81,8 +78,6 @@ private:
 		std::vector<Arrow *> out_arrows;
 		/// used in the search routines
 		bool visited;
-		///
-		EdgePath path;
 	};
 	/// a container for the vertices
 	/// the index into the vector functions as the identifier by which
@@ -92,8 +87,7 @@ private:
 	/// of Format, this is easy, since the Format objects already have ints
 	/// as identifiers.)
 	std::vector<Vertex> vertices_;
-	///
-	std::queue<int> Q_;
+
 	/// a counter that we use to assign id's to the arrows
 	/// FIXME This technique assumes a correspondence between the
 	/// ids of the arrows and ids associated with Converters that