[Lemon-commits] [lemon_svn] klao: r173 - hugo/trunk/src/work

[Lemon SVN]

Author: klao
Date: Tue Feb 24 19:22:53 2004
New Revision: 173

Added:
   hugo/trunk/src/work/.cvsignore
Modified:
   hugo/trunk/src/work/edmonds_karp.hh
   hugo/trunk/src/work/makefile

Log:
private typedef problemak


Added: hugo/trunk/src/work/.cvsignore
==============================================================================
--- (empty file)
+++ hugo/trunk/src/work/.cvsignore	Tue Feb 24 19:22:53 2004
@@ -0,0 +1,7 @@
+.depend
+bin_heap_demo
+marci_graph_demo
+iterator_bfs_dfs_demo
+graphdemo
+bfsdemo
+bfsdemo2

Modified: hugo/trunk/src/work/edmonds_karp.hh
==============================================================================
--- hugo/trunk/src/work/edmonds_karp.hh	(original)
+++ hugo/trunk/src/work/edmonds_karp.hh	Tue Feb 24 19:22:53 2004
@@ -12,8 +12,10 @@
 
   template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
   class ResGraph {
+  public:
     typedef typename Graph::NodeIt NodeIt;
     typedef typename Graph::EachNodeIt EachNodeIt;
+  private:
     typedef typename Graph::SymEdgeIt OldSymEdgeIt;
     const Graph& G;
     FlowMap& flow;
@@ -118,8 +120,10 @@
 
   template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
   class ResGraph2 {
+  public:
     typedef typename Graph::NodeIt NodeIt;
     typedef typename Graph::EachNodeIt EachNodeIt;
+  private:
     //typedef typename Graph::SymEdgeIt OldSymEdgeIt;
     typedef typename Graph::OutEdgeIt OldOutEdgeIt;
     typedef typename Graph::InEdgeIt OldInEdgeIt;
@@ -243,14 +247,14 @@
 
   template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
   class ResGraph3 {
-public:
+  public:
     typedef typename Graph::NodeIt NodeIt;
     typedef typename Graph::EachNodeIt EachNodeIt;
+
+  private:
     //typedef typename Graph::SymEdgeIt OldSymEdgeIt;
     typedef typename Graph::OutEdgeIt OldOutEdgeIt;
     typedef typename Graph::InEdgeIt OldInEdgeIt;
-    
-private:
     const Graph& G;
     FlowMap& flow;
     const CapacityMap& capacity;
@@ -377,11 +381,14 @@
 
   template <typename Graph, typename Number, typename FlowMap, typename CapacityMap>
   class MaxFlow {
+  public:
     typedef typename Graph::NodeIt NodeIt;
     typedef typename Graph::EdgeIt EdgeIt;
     typedef typename Graph::EachEdgeIt EachEdgeIt;
     typedef typename Graph::OutEdgeIt OutEdgeIt;
     typedef typename Graph::InEdgeIt InEdgeIt;
+
+  private:
     const Graph& G;
     NodeIt s;
     NodeIt t;
@@ -548,11 +555,13 @@
   
   template <typename Graph, typename Number, typename FlowMap, typename CapacityMap>
   class MaxFlow2 {
+  public:
     typedef typename Graph::NodeIt NodeIt;
     typedef typename Graph::EdgeIt EdgeIt;
     typedef typename Graph::EachEdgeIt EachEdgeIt;
     typedef typename Graph::OutEdgeIt OutEdgeIt;
     typedef typename Graph::InEdgeIt InEdgeIt;
+  private:
     const Graph& G;
     std::list<NodeIt>& S;
     std::list<NodeIt>& T;

Modified: hugo/trunk/src/work/makefile
==============================================================================
--- hugo/trunk/src/work/makefile	(original)
+++ hugo/trunk/src/work/makefile	Tue Feb 24 19:22:53 2004
@@ -1,4 +1,4 @@
-INCLUDEDIRS=-I../include -I. -I./jacint
+INCLUDEDIRS=-I../include -I. -I./jacint -I./marci
 CXXFLAGS=-g -O -Wall $(INCLUDEDIRS) -ansi -pedantic
 
 BINARIES = bin_heap_demo marci_graph_demo iterator_bfs_dfs_demo graphdemo bfsdemo bfsdemo2