COIN-OR::LEMON - Graph Library

Changeset 773:ce9438c5a82d in lemon-0.x


Ignore:
Timestamp:
08/25/04 20:55:57 (15 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:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • src/hugo/max_flow.h

    r761 r773  
    839839            //putting the active nodes into the stack
    840840            int lev=level[w];
    841             if ( exc > 0 && lev < n && w != t )
     841            if ( exc > 0 && lev < n && Node(w) != t )
     842///\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.
    842843              {
    843844                next.set(w,first[lev]);
     
    856857    {
    857858
    858       Num lev=level[w];
     859      int lev=level[w];
    859860
    860861      Node right_n=right[w];
  • src/work/makefile

    r762 r773  
    11INCLUDEDIRS ?= -I.. -I. -I./{marci,jacint,alpar,klao,akos}
    2 CXXFLAGS = -g -O2 -W -Wall $(INCLUDEDIRS) -ansi -pedantic
     2CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic
    33
    44BINARIES ?= bin_heap_demo
  • src/work/marci/bfsit_vs_byhand.cc

    r762 r773  
    44
    55#include <sage_graph.h>
    6 //#include <smart_graph.h>
     6#include <hugo/smart_graph.h>
    77#include <hugo/dimacs.h>
    88#include <hugo/time_measure.h>
     
    1111
    1212using namespace hugo;
     13
     14using std::cout;
     15using std::endl;
    1316
    1417int main() {
     
    2124
    2225  Graph g;
    23   Node s, t;
     26  //Node s;
    2427  //Graph::EdgeMap<int> cap(g);
    2528  //readDimacsMaxFlow(std::cin, g, s, t, cap);
    2629  readDimacs(std::cin, g);
     30  NodeIt s;
     31  g.first(s);
     32
     33  cout << g.nodeNum() << endl;
     34  cout << g.edgeNum() << endl;
    2735
    2836  Graph::NodeMap<OutEdgeIt> pred(g);
     37  cout << "iteration time of bfs written by hand..." << endl;
    2938  Timer ts;
    3039  {
     
    3443    pred.set(s, INVALID);
    3544    std::queue<Node> bfs_queue;
    36     bfs_queue.push(t);
     45    bfs_queue.push(s);
    3746    while (!bfs_queue.empty()) {
    3847      Node v=bfs_queue.front();
     
    5261  }
    5362
     63  cout << "iteration time with bfs iterator..." << endl;
    5464  {
    5565    ts.reset();     
  • src/work/marci/makefile

    r771 r773  
    55
    66LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
    7 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
     7BINARIES = 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
    88#BINARIES = preflow_bug
    99#gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
Note: See TracChangeset for help on using the changeset viewer.