[Lemon-commits] [lemon_svn] jacint: r226 - hugo/trunk/src/work/jacint
Lemon SVN
svn at lemon.cs.elte.hu
Mon Nov 6 20:38:13 CET 2006
Author: jacint
Date: Tue Mar 9 16:53:19 2004
New Revision: 226
Modified:
hugo/trunk/src/work/jacint/dijkstra.cc
hugo/trunk/src/work/jacint/dijkstra.h
Log:
*** empty log message ***
Modified: hugo/trunk/src/work/jacint/dijkstra.cc
==============================================================================
--- hugo/trunk/src/work/jacint/dijkstra.cc (original)
+++ hugo/trunk/src/work/jacint/dijkstra.cc Tue Mar 9 16:53:19 2004
@@ -1,242 +1,37 @@
#include <iostream>
-#include <vector>
-#include <string>
+#include <fstream>
#include <list_graph.hh>
+#include <dimacs.hh>
#include <dijkstra.h>
+#include <time_measure.h>
using namespace hugo;
-int main (int, char*[])
-{
+int main(int, char **) {
typedef ListGraph::NodeIt NodeIt;
- typedef ListGraph::EdgeIt EdgeIt;
- typedef ListGraph::EachNodeIt EachNodeIt;
typedef ListGraph::EachEdgeIt EachEdgeIt;
- typedef ListGraph::OutEdgeIt OutEdgeIt;
- typedef ListGraph::InEdgeIt InEdgeIt;
-
- ListGraph flow_test;
-
- /* //Ahuja könyv példája, maxflowvalue=13
- NodeIt s=flow_test.addNode();
- NodeIt v1=flow_test.addNode();
- NodeIt v2=flow_test.addNode();
- NodeIt v3=flow_test.addNode();
- NodeIt v4=flow_test.addNode();
- NodeIt v5=flow_test.addNode();
- NodeIt t=flow_test.addNode();
-
- ListGraph::NodeMap<std::string> Node_name(flow_test);
- Node_name.set(s, "s");
- Node_name.set(v1, "v1");
- Node_name.set(v2, "v2");
- Node_name.set(v3, "v3");
- Node_name.set(v4, "v4");
- Node_name.set(v5, "v5");
- Node_name.set(t, "t");
-
- EdgeIt s_v1=flow_test.addEdge(s, v1);
- EdgeIt s_v2=flow_test.addEdge(s, v2);
- EdgeIt s_v3=flow_test.addEdge(s, v3);
- EdgeIt v2_v4=flow_test.addEdge(v2, v4);
- EdgeIt v2_v5=flow_test.addEdge(v2, v5);
- EdgeIt v3_v5=flow_test.addEdge(v3, v5);
- EdgeIt v4_t=flow_test.addEdge(v4, t);
- EdgeIt v5_t=flow_test.addEdge(v5, t);
- EdgeIt v2_s=flow_test.addEdge(v2, s);
-
- ListGraph::EdgeMap<int> cap(flow_test);
- cap.set(s_v1, 0);
- cap.set(s_v2, 10);
- cap.set(s_v3, 10);
- cap.set(v2_v4, 5);
- cap.set(v2_v5, 8);
- cap.set(v3_v5, 5);
- cap.set(v4_t, 8);
- cap.set(v5_t, 8);
- cap.set(v2_s, 0);
- */
-
-
- //Marci példája, maxflowvalue=23
- NodeIt s=flow_test.addNode();
- NodeIt v1=flow_test.addNode();
- NodeIt v2=flow_test.addNode();
- NodeIt v3=flow_test.addNode();
- NodeIt v4=flow_test.addNode();
- NodeIt t=flow_test.addNode();
- NodeIt z=flow_test.addNode();
-
-
- ListGraph::NodeMap<std::string> Node_name(flow_test);
- Node_name.set(s, "s");
- Node_name.set(v1, "v1");
- Node_name.set(v2, "v2");
- Node_name.set(v3, "v3");
- Node_name.set(v4, "v4");
- Node_name.set(t, "t");
- Node_name.set(z, "z");
-
- EdgeIt s_v1=flow_test.addEdge(s, v1);
- EdgeIt s_v2=flow_test.addEdge(s, v2);
- EdgeIt v1_v2=flow_test.addEdge(v1, v2);
- EdgeIt v2_v1=flow_test.addEdge(v2, v1);
- EdgeIt v1_v3=flow_test.addEdge(v1, v3);
- EdgeIt v3_v2=flow_test.addEdge(v3, v2);
- EdgeIt v2_v4=flow_test.addEdge(v2, v4);
- EdgeIt v4_v3=flow_test.addEdge(v4, v3);
- EdgeIt v3_t=flow_test.addEdge(v3, t);
- EdgeIt v4_t=flow_test.addEdge(v4, t);
- EdgeIt v3_v3=flow_test.addEdge(v3, v3);
- EdgeIt s_z=flow_test.addEdge(s, z);
- // EdgeIt v2_s=flow_test.addEdge(v2, s);
-
-
-
- ListGraph::EdgeMap<int> cap(flow_test);
- cap.set(s_v1, 16);
- cap.set(s_v2, 13);
- cap.set(v1_v2, 10);
- cap.set(v2_v1, 4);
- cap.set(v1_v3, 12);
- cap.set(v3_v2, 9);
- cap.set(v2_v4, 14);
- cap.set(v4_v3, 7);
- cap.set(v3_t, 20);
- cap.set(v4_t, 4);
- cap.set(v3_v3, 4);
- cap.set(s_z, 4);
- // cap.set(v2_s, 0);
-
-
-
- //pelda 3, maxflowvalue=4
- /* NodeIt s=flow_test.addNode();
- NodeIt v1=flow_test.addNode();
- NodeIt v2=flow_test.addNode();
- NodeIt t=flow_test.addNode();
- NodeIt w=flow_test.addNode();
-
- NodeMap<ListGraph, std::string> Node_name(flow_test);
- Node_name.set(s, "s");
- Node_name.set(v1, "v1");
- Node_name.set(v2, "v2");
- Node_name.set(t, "t");
- Node_name.set(w, "w");
-
- EdgeIt s_v1=flow_test.addEdge(s, v1);
- EdgeIt v1_v2=flow_test.addEdge(v1, v2);
- EdgeIt v2_t=flow_test.addEdge(v2, t);
- EdgeIt v1_v1=flow_test.addEdge(v1, v1);
- EdgeIt s_w=flow_test.addEdge(s, w);
-
- EdgeMap<ListGraph, int> cap(flow_test);
+ ListGraph G;
+ NodeIt s, t;
+ ListGraph::EdgeMap<int> cap(G);
+ readDimacsMaxFlow(std::cin, G, s, t, cap);
+
+ std::cout << "dijkstra demo ..." << std::endl;
+
+ double pre_time=currTime();
+ Dijkstra<ListGraph, int> dijkstra_test(G, s, cap);
+ double post_time=currTime();
- cap.set(s_v1, 16);
- cap.set(v1_v2, 10);
- cap.set(v2_t, 4);
- cap.set(v1_v1, 3);
- cap.set(s_w, 5);
- */
-
-
-
- /*
- std::cout << "Testing reverse_bfs..." << std::endl;
-
- reverse_bfs<ListGraph> bfs_test(flow_test, t);
-
- bfs_test.run();
-
- for (EachNodeIt w=flow_test.first_Node(); w.valid(); ++w) {
- std::cout <<"The distance of " << w << " is " << bfs_test.dist(w) <<std::endl;
- }
-
- */
-
-
- /*
- std::cout << "Testing preflow_push_hl..." << std::endl;
-
- preflow_push_hl<ListGraph, int> preflow_push_test(flow_test, s, t, cap);
-
- preflow_push_test.run();
-
- std::cout << "Maximum flow value is: " << preflow_push_test.maxflow() << "."<<std::endl;
-
- std::cout<< "The flow on Edge s-v1 is "<< preflow_push_test.flowonEdge(s_v1) << "."<<std::endl;
-
- ListGraph::EdgeMap<int> flow=preflow_push_test.allflow();
- for (EachEdgeIt e=flow_test.template first<EachEdgeIt>(); e.valid(); ++e) {
- std::cout <<"Flow on Edge " << flow_test.tail(e) <<"-" << flow_test.head(e)<< " is " <<flow.get(e) <<std::endl;
- }
-
- std::cout << "A minimum cut: " <<std::endl;
- ListGraph::NodeMap<bool> mincut=preflow_push_test.mincut();
-
- for (EachNodeIt v=flow_test.template first<EachNodeIt>(); v.valid(); ++v) {
- if (mincut.get(v)) std::cout <<Node_name.get(v)<< " ";
- }
-
- std::cout<<"\n\n"<<std::endl;
-
-
-
-
- std::cout << "Testing preflow_push_max_flow..." << std::endl;
+ std::cout << "running time: " << post_time-pre_time << " sec"<< std::endl;
- preflow_push_max_flow<ListGraph, int> max_flow_test(flow_test, s, t, cap);
-
- max_flow_test.run();
+ EachEdgeIt e;
- std::cout << "Maximum flow value is: " << max_flow_test.maxflow() << "."<< std::endl;
-
- std::cout << "A minimum cut: " <<std::endl;
- ListGraph::NodeMap<bool> mincut2=max_flow_test.mincut();
-
- for (EachNodeIt v=flow_test.template first<EachNodeIt>(); v.valid(); ++v) {
- if (mincut2.get(v)) std::cout <<Node_name.get(v)<< " ";
+ for ( G.getFirst(e) ; G.valid(e); G.next(e) ) {
+ NodeIt u=G.tail(e);
+ NodeIt v=G.head(e);
+ assert ( dijkstra_test.dist(v) - dijkstra_test.dist(u) <= cap.get(e) );
}
-
- std::cout << std::endl <<std::endl;
- */
-
-
- std::cout << "Testing dijkstra..." << std::endl;
-
- NodeIt root=s;
-
- Dijkstra<ListGraph, int> dijkstra_test(flow_test, root, cap);
-
- dijkstra_test.run();
-
- EachNodeIt w;
-
- for ( flow_test.getFirst(w); flow_test.valid(w) ; flow_test.next(w) ) {
- if (dijkstra_test.reach(w)) {
- std::cout <<"The distance of " << w << " is " << dijkstra_test.dist(w);
- if (dijkstra_test.pred(w).valid()) {
- std::cout <<", a shortest path from the root ends with edge " << dijkstra_test.pred(w) <<std::endl;
- } else {
- std::cout <<", this is the root."<<std::endl; }
-
- } else {
- std::cout << w << " is not reachable from " << root <<std::endl;
- }
- }
-
-
return 0;
}
-
-
-
-
-
-
-
-
-
Modified: hugo/trunk/src/work/jacint/dijkstra.h
==============================================================================
--- hugo/trunk/src/work/jacint/dijkstra.h (original)
+++ hugo/trunk/src/work/jacint/dijkstra.h Tue Mar 9 16:53:19 2004
@@ -81,7 +81,7 @@
OutEdgeIt e;
for( G.getFirst(e,v); G.valid(e); G.next(e)) {
- NodeIt w=G.head(e);
+ NodeIt w=G.bNode(e);
if ( !scanned.get(w) ) {
if ( !reached.get(w) ) {
More information about the Lemon-commits
mailing list