1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/src/work/.cvsignore	Tue Feb 24 18:22:53 2004 +0000
     1.3 @@ -0,0 +1,7 @@
     1.4 +.depend
     1.5 +bin_heap_demo
     1.6 +marci_graph_demo
     1.7 +iterator_bfs_dfs_demo
     1.8 +graphdemo
     1.9 +bfsdemo
    1.10 +bfsdemo2

     2.1 --- a/src/work/edmonds_karp.hh	Tue Feb 24 16:36:02 2004 +0000
     2.2 +++ b/src/work/edmonds_karp.hh	Tue Feb 24 18:22:53 2004 +0000
     2.3 @@ -12,8 +12,10 @@
     2.4  
     2.5    template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
     2.6    class ResGraph {
     2.7 +  public:
     2.8      typedef typename Graph::NodeIt NodeIt;
     2.9      typedef typename Graph::EachNodeIt EachNodeIt;
    2.10 +  private:
    2.11      typedef typename Graph::SymEdgeIt OldSymEdgeIt;
    2.12      const Graph& G;
    2.13      FlowMap& flow;
    2.14 @@ -118,8 +120,10 @@
    2.15  
    2.16    template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
    2.17    class ResGraph2 {
    2.18 +  public:
    2.19      typedef typename Graph::NodeIt NodeIt;
    2.20      typedef typename Graph::EachNodeIt EachNodeIt;
    2.21 +  private:
    2.22      //typedef typename Graph::SymEdgeIt OldSymEdgeIt;
    2.23      typedef typename Graph::OutEdgeIt OldOutEdgeIt;
    2.24      typedef typename Graph::InEdgeIt OldInEdgeIt;
    2.25 @@ -243,14 +247,14 @@
    2.26  
    2.27    template<typename Graph, typename Number, typename FlowMap, typename CapacityMap>
    2.28    class ResGraph3 {
    2.29 -public:
    2.30 +  public:
    2.31      typedef typename Graph::NodeIt NodeIt;
    2.32      typedef typename Graph::EachNodeIt EachNodeIt;
    2.33 +
    2.34 +  private:
    2.35      //typedef typename Graph::SymEdgeIt OldSymEdgeIt;
    2.36      typedef typename Graph::OutEdgeIt OldOutEdgeIt;
    2.37      typedef typename Graph::InEdgeIt OldInEdgeIt;
    2.38 -    
    2.39 -private:
    2.40      const Graph& G;
    2.41      FlowMap& flow;
    2.42      const CapacityMap& capacity;
    2.43 @@ -377,11 +381,14 @@
    2.44  
    2.45    template <typename Graph, typename Number, typename FlowMap, typename CapacityMap>
    2.46    class MaxFlow {
    2.47 +  public:
    2.48      typedef typename Graph::NodeIt NodeIt;
    2.49      typedef typename Graph::EdgeIt EdgeIt;
    2.50      typedef typename Graph::EachEdgeIt EachEdgeIt;
    2.51      typedef typename Graph::OutEdgeIt OutEdgeIt;
    2.52      typedef typename Graph::InEdgeIt InEdgeIt;
    2.53 +
    2.54 +  private:
    2.55      const Graph& G;
    2.56      NodeIt s;
    2.57      NodeIt t;
    2.58 @@ -548,11 +555,13 @@
    2.59    
    2.60    template <typename Graph, typename Number, typename FlowMap, typename CapacityMap>
    2.61    class MaxFlow2 {
    2.62 +  public:
    2.63      typedef typename Graph::NodeIt NodeIt;
    2.64      typedef typename Graph::EdgeIt EdgeIt;
    2.65      typedef typename Graph::EachEdgeIt EachEdgeIt;
    2.66      typedef typename Graph::OutEdgeIt OutEdgeIt;
    2.67      typedef typename Graph::InEdgeIt InEdgeIt;
    2.68 +  private:
    2.69      const Graph& G;
    2.70      std::list<NodeIt>& S;
    2.71      std::list<NodeIt>& T;

     3.1 --- a/src/work/makefile	Tue Feb 24 16:36:02 2004 +0000
     3.2 +++ b/src/work/makefile	Tue Feb 24 18:22:53 2004 +0000
     3.3 @@ -1,4 +1,4 @@
     3.4 -INCLUDEDIRS=-I../include -I. -I./jacint
     3.5 +INCLUDEDIRS=-I../include -I. -I./jacint -I./marci
     3.6  CXXFLAGS=-g -O -Wall $(INCLUDEDIRS) -ansi -pedantic
     3.7  
     3.8  BINARIES = bin_heap_demo marci_graph_demo iterator_bfs_dfs_demo graphdemo bfsdemo bfsdemo2