Changeset 127:dcace15b1874 in lemon-0.x for src/work

Timestamp:

02/24/04 19:22:53 (22 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@173

Message:

private typedef problemak

Location:

src/work

Files:

• .cvsignore (added)
• edmonds_karp.hh (modified) (7 diffs)
• makefile (modified) (1 diff)

src/work/edmonds_karp.hh

@@ -13 +13 @@
   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;
@@ -119 +121 @@
   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;
@@ -244 +248 @@
   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;
@@ -378 +382 @@
   template <typename Graph, typename Number, typename FlowMap, typename CapacityMap>
   class MaxFlow {
+  public:
     typedef typename Graph::NodeIt NodeIt;
     typedef typename Graph::EdgeIt EdgeIt;
@@ -383 +388 @@
     typedef typename Graph::OutEdgeIt OutEdgeIt;
     typedef typename Graph::InEdgeIt InEdgeIt;
+
+  private:
     const Graph& G;
     NodeIt s;
@@ -549 +556 @@
   template <typename Graph, typename Number, typename FlowMap, typename CapacityMap>
   class MaxFlow2 {
+  public:
     typedef typename Graph::NodeIt NodeIt;
     typedef typename Graph::EdgeIt EdgeIt;
@@ -554 +562 @@
     typedef typename Graph::OutEdgeIt OutEdgeIt;
     typedef typename Graph::InEdgeIt InEdgeIt;
+  private:
     const Graph& G;
     std::list<NodeIt>& S;

src/work/makefile

@@ -1 @@
-INCLUDEDIRS=-I../include -I. -I./jacint
+INCLUDEDIRS=-I../include -I. -I./jacint -I./marci
 CXXFLAGS=-g -O -Wall $(INCLUDEDIRS) -ansi -pedantic