1.1 --- a/src/test/makefile Tue Apr 27 08:31:00 2004 +0000
1.2 +++ b/src/test/makefile Tue Apr 27 09:26:32 2004 +0000
1.3 @@ -1,3 +1,4 @@
1.4 +#CXX3 := $(shell type -p g++-3.4 || shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
1.5 CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
1.6 CXX2 = g++-2.95
1.7 CXX=$(CXX3)
2.1 --- a/src/work/marci/graph_wrapper.h Tue Apr 27 08:31:00 2004 +0000
2.2 +++ b/src/work/marci/graph_wrapper.h Tue Apr 27 09:26:32 2004 +0000
2.3 @@ -1068,6 +1068,22 @@
2.4 }
2.5 };
2.6
2.7 + template<typename Graph>
2.8 + class stGraphWrapper;
2.9 +
2.10 +// template<typename Graph>
2.11 +// std::ostream&
2.12 +// operator<<(std::ostream& os, const typename stGraphWrapper<Graph>::Node& i) {
2.13 +// os << "(node: " << typename Graph::Node(i) << " spec: " << i.spec <<")";
2.14 +// return os;
2.15 +// }
2.16 +// template<typename Graph>
2.17 +// std::ostream&
2.18 +// operator<<(std::ostream& os, const typename stGraphWrapper<Graph>::Edge& i) {
2.19 +// os << "(edge: " << typename Graph::Edge(i) << " spec: " << i.spec <<
2.20 +// " node: " << i.n << ")";
2.21 +// return os;
2.22 +// }
2.23
2.24 /// experimentral, do not try it.
2.25 /// It eats a bipartite graph, oriented from S to T.
2.26 @@ -1122,6 +1138,14 @@
2.27 S_NODE(INVALID, 1),
2.28 T_NODE(INVALID, 2) { }
2.29
2.30 +
2.31 +// std::ostream&
2.32 +// operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Node& i);
2.33 +// friend std::ostream&
2.34 +// operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Node& i);
2.35 +// friend std::ostream&
2.36 +// operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Edge& i);
2.37 +
2.38 class Node : public Graph::Node {
2.39 protected:
2.40 friend class GraphWrapper<Graph>;
2.41 @@ -1147,7 +1171,10 @@
2.42 static_cast<typename Graph::Node>(u)!=
2.43 static_cast<typename Graph::Node>(v));
2.44 }
2.45 - friend std::ostream& operator<<(std::ostream& os, const Node& i);
2.46 +// template<typename G>
2.47 +// friend std::ostream&
2.48 +// operator<<(std::ostream& os, const typename stGraphWrapper<G>::Node& i);
2.49 + friend std::ostream& operator<< (std::ostream& os, const Node& i);
2.50 int getSpec() const { return spec; }
2.51 };
2.52
2.53 @@ -1192,7 +1219,10 @@
2.54 static_cast<typename Graph::Edge>(v) ||
2.55 u.n!=v.n);
2.56 }
2.57 - friend std::ostream& operator<<(std::ostream& os, const Edge& i);
2.58 +// template<typename G>
2.59 +// friend std::ostream&
2.60 +// operator<<(std::ostream& os, const typename stGraphWrapper<G>::Edge& i);
2.61 + friend std::ostream& operator<< (std::ostream& os, const Edge& i);
2.62 int getSpec() const { return spec; }
2.63 };
2.64
2.65 @@ -1601,11 +1631,15 @@
2.66 // }
2.67 // };
2.68
2.69 - friend std::ostream& operator<<(std::ostream& os, const Node& i) {
2.70 +// template<typename G>
2.71 + friend std::ostream&
2.72 + operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Node& i) {
2.73 os << "(node: " << typename Graph::Node(i) << " spec: " << i.spec <<")";
2.74 return os;
2.75 }
2.76 - friend std::ostream& operator<<(std::ostream& os, const Edge& i) {
2.77 +// template<typename G>
2.78 + friend std::ostream&
2.79 + operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Edge& i) {
2.80 os << "(edge: " << typename Graph::Edge(i) << " spec: " << i.spec <<
2.81 " node: " << i.n << ")";
2.82 return os;