# HG changeset patch
# User klao
# Date 1077646973 0
# Node ID dcace15b1874ccddf38be4d94bbac78eb07f07fd
# Parent  89c6e4687fcc463b42eeacb2af4fe2c1dcad8cab
private typedef problemak

diff -r 89c6e4687fcc -r dcace15b1874 src/work/.cvsignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/work/.cvsignore	Tue Feb 24 18:22:53 2004 +0000
@@ -0,0 +1,7 @@
+.depend
+bin_heap_demo
+marci_graph_demo
+iterator_bfs_dfs_demo
+graphdemo
+bfsdemo
+bfsdemo2
diff -r 89c6e4687fcc -r dcace15b1874 src/work/edmonds_karp.hh
--- a/src/work/edmonds_karp.hh	Tue Feb 24 16:36:02 2004 +0000
+++ b/src/work/edmonds_karp.hh	Tue Feb 24 18:22:53 2004 +0000
@@ -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;
diff -r 89c6e4687fcc -r dcace15b1874 src/work/makefile
--- a/src/work/makefile	Tue Feb 24 16:36:02 2004 +0000
+++ b/src/work/makefile	Tue Feb 24 18:22:53 2004 +0000
@@ -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