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

[Lemon SVN]

Author: marci
Date: Tue Apr 27 11:26:32 2004
New Revision: 583

Modified:
   hugo/trunk/src/test/makefile
   hugo/trunk/src/work/marci/graph_wrapper.h

Log:
misc


Modified: hugo/trunk/src/test/makefile
==============================================================================
--- hugo/trunk/src/test/makefile	(original)
+++ hugo/trunk/src/test/makefile	Tue Apr 27 11:26:32 2004
@@ -1,3 +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++)
 CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
 CXX2 = g++-2.95
 CXX=$(CXX3)

Modified: hugo/trunk/src/work/marci/graph_wrapper.h
==============================================================================
--- hugo/trunk/src/work/marci/graph_wrapper.h	(original)
+++ hugo/trunk/src/work/marci/graph_wrapper.h	Tue Apr 27 11:26:32 2004
@@ -1068,6 +1068,22 @@
     }
   };
 
+  template<typename Graph>
+  class stGraphWrapper;
+
+//   template<typename Graph> 
+//   std::ostream& 
+//   operator<<(std::ostream& os, const typename stGraphWrapper<Graph>::Node& i) { 
+//     os << "(node: " << typename Graph::Node(i) << " spec: " << i.spec <<")"; 
+//     return os; 
+//   }
+//   template<typename Graph> 
+//   std::ostream& 
+//   operator<<(std::ostream& os, const typename stGraphWrapper<Graph>::Edge& i) { 
+//     os << "(edge: " << typename Graph::Edge(i) << " spec: " << i.spec << 
+//       " node: " << i.n << ")"; 
+//     return os; 
+//   }
 
   /// experimentral, do not try it.
   /// It eats a bipartite graph, oriented from S to T.
@@ -1122,6 +1138,14 @@
 				    S_NODE(INVALID, 1), 
 				    T_NODE(INVALID, 2) { }
 
+    
+//    std::ostream& 
+//    operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Node& i);
+//    friend std::ostream& 
+//    operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Node& i);
+//    friend std::ostream& 
+//    operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Edge& i);
+
     class Node : public Graph::Node {
     protected:
       friend class GraphWrapper<Graph>;
@@ -1147,7 +1171,10 @@
 		static_cast<typename Graph::Node>(u)!=
 		static_cast<typename Graph::Node>(v));
       }
-      friend std::ostream& operator<<(std::ostream& os, const Node& i);
+//      template<typename G> 
+//      friend std::ostream& 
+//      operator<<(std::ostream& os, const typename stGraphWrapper<G>::Node& i); 
+      friend std::ostream& operator<< (std::ostream& os, const Node& i);
       int getSpec() const { return spec; }
     };
 
@@ -1192,7 +1219,10 @@
 		static_cast<typename Graph::Edge>(v) || 
 		u.n!=v.n);
       } 
-      friend std::ostream& operator<<(std::ostream& os, const Edge& i);
+//      template<typename G> 
+//      friend std::ostream& 
+//      operator<<(std::ostream& os, const typename stGraphWrapper<G>::Edge& i); 
+      friend std::ostream& operator<< (std::ostream& os, const Edge& i);
       int getSpec() const { return spec; }
     };
 
@@ -1601,11 +1631,15 @@
 //       }
 //     };
 
-    friend std::ostream& operator<<(std::ostream& os, const Node& i) { 
+//  template<typename G> 
+    friend std::ostream& 
+    operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Node& i) { 
       os << "(node: " << typename Graph::Node(i) << " spec: " << i.spec <<")"; 
       return os; 
     }
-    friend std::ostream& operator<<(std::ostream& os, const Edge& i) { 
+//  template<typename G> 
+    friend std::ostream& 
+    operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Edge& i) { 
       os << "(edge: " << typename Graph::Edge(i) << " spec: " << i.spec << 
 	" node: " << i.n << ")"; 
       return os;