Changeset 773:ce9438c5a82d in lemon-0.x for src

Timestamp:

08/25/04 20:55:57 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

bug fix, test...

Location:

src

Files:

• hugo/max_flow.h (modified) (2 diffs)
• work/makefile (modified) (1 diff)
• work/marci/bfsit_vs_byhand.cc (modified) (5 diffs)
• work/marci/graph_wrapper_time.cc (added)
• work/marci/makefile (modified) (1 diff)

src/hugo/max_flow.h

@@ -839 +839 @@
             //putting the active nodes into the stack
             int lev=level[w];
-            if ( exc > 0 && lev < n && w != t ) 
+            if ( exc > 0 && lev < n && Node(w) != t ) 
+///\bug     if ( exc > 0 && lev < n && w != t ) tempararily for working with wrappers. in hugo 0.2 it will work. Amugy mukodik sage_graph-fal, de smart_graph-fal nem, azt hozzatennem.
               {
                 next.set(w,first[lev]);
@@ -856 +857 @@
     {
 
-      Num lev=level[w];
+      int lev=level[w];
 
       Node right_n=right[w];

src/work/makefile

@@ -1 +1 @@
 INCLUDEDIRS ?= -I.. -I. -I./{marci,jacint,alpar,klao,akos}
-CXXFLAGS = -g -O2 -W -Wall $(INCLUDEDIRS) -ansi -pedantic
+CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic
 
 BINARIES ?= bin_heap_demo

src/work/marci/bfsit_vs_byhand.cc

@@ -4 +4 @@
 
 #include <sage_graph.h>
-//#include <smart_graph.h>
+#include <hugo/smart_graph.h>
 #include <hugo/dimacs.h>
 #include <hugo/time_measure.h>
@@ -11 +11 @@
 
 using namespace hugo;
+
+using std::cout;
+using std::endl;
 
 int main() {
@@ -21 +24 @@
 
   Graph g;
-  Node s, t;
+  //Node s;
   //Graph::EdgeMap<int> cap(g);
   //readDimacsMaxFlow(std::cin, g, s, t, cap);
   readDimacs(std::cin, g);
+  NodeIt s;
+  g.first(s);
+
+  cout << g.nodeNum() << endl;
+  cout << g.edgeNum() << endl;
 
   Graph::NodeMap<OutEdgeIt> pred(g);
+  cout << "iteration time of bfs written by hand..." << endl;
   Timer ts;
   {
@@ -34 +43 @@
     pred.set(s, INVALID);
     std::queue<Node> bfs_queue;
-    bfs_queue.push(t);
+    bfs_queue.push(s);
     while (!bfs_queue.empty()) {
       Node v=bfs_queue.front(); 
@@ -52 +61 @@
   }
 
+  cout << "iteration time with bfs iterator..." << endl;
   {
     ts.reset();      

src/work/marci/makefile

@@ -5 +5 @@
 
 LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
-BINARIES = max_flow_demo iterator_bfs_demo macro_test lg_vs_sg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_demo top_sort_test max_flow_1
+BINARIES = graph_wrapper_time max_flow_demo iterator_bfs_demo macro_test lg_vs_sg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_demo top_sort_test max_flow_1 proba7
 #BINARIES = preflow_bug
 #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda