[Lemon-commits] [lemon_svn] marci: r1200 - in hugo/trunk/src: hugo test

[Lemon SVN]

Author: marci
Date: Tue Sep 21 13:54:20 2004
New Revision: 1200

Modified:
   hugo/trunk/src/hugo/graph_wrapper.h
   hugo/trunk/src/test/graph_wrapper_test.cc

Log:
graph_wrappers now pass the tests.


Modified: hugo/trunk/src/hugo/graph_wrapper.h
==============================================================================
--- hugo/trunk/src/hugo/graph_wrapper.h	(original)
+++ hugo/trunk/src/hugo/graph_wrapper.h	Tue Sep 21 13:54:20 2004
@@ -808,7 +808,7 @@
       EdgeIt(Invalid i) : Edge(i) { }
       EdgeIt(const SubBidirGraphWrapper<Graph, 
 	     ForwardFilterMap, BackwardFilterMap>& _gw) : 
-	Edge(typename Graph::OutEdgeIt(*(_gw.graph)), false), gw(&_gw) { 
+	Edge(typename Graph::EdgeIt(*(_gw.graph)), false), gw(&_gw) { 
 	while (*static_cast<GraphEdge*>(this)!=INVALID && 
 	       !(*(gw->forward_filter))[*this]) 
 	  *(static_cast<GraphEdge*>(this))=

Modified: hugo/trunk/src/test/graph_wrapper_test.cc
==============================================================================
--- hugo/trunk/src/test/graph_wrapper_test.cc	(original)
+++ hugo/trunk/src/test/graph_wrapper_test.cc	Tue Sep 21 13:54:20 2004
@@ -42,23 +42,23 @@
 //typedef UndirGraph<Graph> UndirG;
 //template void checkCompileStaticGraph<UndirG>(UndirG &);
 
-//typedef SubBidirGraphWrapper<Graph, Graph::EdgeMap<bool>, 
-/// \bug SubBidirGraphWrapper cannot pass the StaticGraph test
-//			     Graph::EdgeMap<bool> > SubBDGW;
-//template void checkCompileStaticGraph<SubBDGW>(SubBDGW &);
+//Compile SubBidirGraphWrapper
+typedef SubBidirGraphWrapper<Graph, Graph::EdgeMap<bool>, 
+			     Graph::EdgeMap<bool> > SubBDGW;
+template void checkCompileStaticGraph<SubBDGW>(SubBDGW &);
 
 //Compile BidirGraphWrapper
-//typedef BidirGraphWrapper<Graph> BidirGW;
-//template void checkCompileStaticGraph<BidirGW>(BidirGW &);
+typedef BidirGraphWrapper<Graph> BidirGW;
+template void checkCompileStaticGraph<BidirGW>(BidirGW &);
 
 //Compile BidirGraph
-//typedef BidirGraph<Graph> BidirG;
-//template void checkCompileStaticGraph<BidirG>(BidirG &);
+typedef BidirGraph<Graph> BidirG;
+template void checkCompileStaticGraph<BidirG>(BidirG &);
 
 //Compile ResGraphWrapper
-//typedef ResGraphWrapper<Graph, int, Graph::EdgeMap<int>, 
-//			Graph::EdgeMap<int> > ResGW;
-//template void checkCompileStaticGraph<ResGW>(ResGW &);
+typedef ResGraphWrapper<Graph, int, Graph::EdgeMap<int>, 
+			Graph::EdgeMap<int> > ResGW;
+template void checkCompileStaticGraph<ResGW>(ResGW &);
 
 //Compile ErasingFirstGraphWrapper
 typedef ErasingFirstGraphWrapper<Graph, Graph::NodeMap<Graph::Edge> > ErasingFirstGW;