# HG changeset patch
# User alpar
# Date 1077236869 0
# Node ID 063de9e1be9840f694e8ce0b352c810a0a45eb28
# Parent  294cb99af985542df6734947b81028c37abfa7a6
.

diff -r 294cb99af985 -r 063de9e1be98 src/work/alpar/f_ed_ka_demo.cc
--- a/src/work/alpar/f_ed_ka_demo.cc	Thu Feb 19 22:28:33 2004 +0000
+++ b/src/work/alpar/f_ed_ka_demo.cc	Fri Feb 20 00:27:49 2004 +0000
@@ -1,6 +1,8 @@
 #include <iostream>
 #include <fstream>
 
+#include "smart_graph.h"
+
 #include "../list_graph.hh"
 #include "../marci/dimacs.hh"
 #include "f_ed_ka.h"
@@ -12,17 +14,20 @@
 // read_dimacs_demo < dimacs_max_flow_file
 
 int main(int, char **) {
-  typedef ListGraph::NodeIt NodeIt;
-  typedef ListGraph::EachNodeIt EachNodeIt;
-  typedef ListGraph::EachEdgeIt EachEdgeIt;
+  //  typedef SmartGraph Graph;
+  typedef ListGraph Graph;
 
-  ListGraph G;
+  typedef Graph::NodeIt NodeIt;
+  typedef Graph::EachNodeIt EachNodeIt;
+  typedef Graph::EachEdgeIt EachEdgeIt;
+
+  Graph G;
   NodeIt s, t;
-  ListGraph::EdgeMap<int> cap(G);
+  Graph::EdgeMap<int> cap(G);
   readDimacsMaxFlow(std::cin, G, s, t, cap);
 
   std::cout << "edmonds karp demo..." << std::endl;
-  ListGraph::EdgeMap<int> flow(G); //0 flow
+  Graph::EdgeMap<int> flow(G); //0 flow
   
   int ret;
   double pre_time=currTime();
diff -r 294cb99af985 -r 063de9e1be98 src/work/alpar/gwrapper.h
--- a/src/work/alpar/gwrapper.h	Thu Feb 19 22:28:33 2004 +0000
+++ b/src/work/alpar/gwrapper.h	Fri Feb 20 00:27:49 2004 +0000
@@ -1,4 +1,8 @@
 // -*-mode: c++; -*-
+#ifndef GRAPH_WRAPPER_H
+#define GRAPH_WRAPPER_H
+
+namespace marci {
 
 template<typename G>
 class TrivGraphWrapper