COIN-OR::LEMON - Graph Library

Changeset 196:8a9b9360463e in lemon-0.x


Ignore:
Timestamp:
03/17/04 17:10:33 (16 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@273
Message:

.

Location:
src/work
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/work/edmonds_karp.h

    r194 r196  
    564564      typename AugGraph::NodeMap<AugEdge> pred(res_graph);
    565565      for(NodeIt s=G->template first<NodeIt>(); G->valid(s); G->next(s)) {
    566         Number f=0;
    567         for(OutEdgeIt e=G->template first<OutEdgeIt>(s); G->valid(e); G->next(e))
    568           f+=flow->get(e);
    569         if (f<1) {
    570           res_bfs.pushAndSetReached(s);
    571           pred.set(s, AugEdge(INVALID));
     566        if (S->get(s)) {
     567          Number f=0;
     568          for(OutEdgeIt e=G->template first<OutEdgeIt>(s); G->valid(e); G->next(e))
     569            f+=flow->get(e);
     570          if (f<1) {
     571            res_bfs.pushAndSetReached(s);
     572            pred.set(s, AugEdge(INVALID));
     573          }
    572574        }
    573575      }
  • src/work/marci/makefile

    r194 r196  
    44CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
    55#CXXFLAGS = -W -Wall -ansi -pedantic -I. -I.. -I../alpar
    6 LEDAROOT ?= /ledasrc/LEDA-4.1
     6#LEDAROOT ?= /ledasrc/LEDA-4.1
    77BOOSTROOT ?= /home/marci/boost
    88INCLUDEDIRS ?= -I../../include -I.. -I. -I../{marci,jacint,alpar,klao,akos,athos} -I$(LEDAROOT)/incl -I$(BOOSTROOT)
    99CXXFLAGS = -g -O -W -Wall $(INCLUDEDIRS) -ansi -pedantic
    1010
    11 
    12 BINARIES = edmonds_karp_demo preflow_demo_leda lg_vs_sg leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
    13 #preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar
     11LEDABINARIES = lg_vs_sg leda_graph_demo leda_bfs_dfs
     12BINARIES = edmonds_karp_demo max_bipartite_matching_demo
     13#preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
    1414
    1515all: $(BINARIES)
  • src/work/marci/max_bipartite_matching_demo.cc

    r195 r196  
    55#include <cstdlib>
    66
    7 #include <LEDA/graph.h>
    8 #include <leda_graph_wrapper.h>
     7//#include <LEDA/graph.h>
     8//#include <leda_graph_wrapper.h>
     9#include <list_graph.h>
    910#include <dimacs.h>
    1011#include <time_measure.h>
     
    3940
    4041int main() {
    41   leda::graph g;
    42   typedef LedaGraphWrapper<leda::graph> Graph;
    43   Graph G(g);
     42//   leda::graph g;
     43//   typedef LedaGraphWrapper<leda::graph> Graph;
     44//   Graph G(g);
     45  typedef ListGraph Graph;
     46  Graph G;
    4447
    4548  typedef Graph::Node Node;
     
    6265    t_nodes.push_back(G.addNode());
    6366  }
    64 //   random_init();
    65 //   for(int i=0; i<6; ++i) {
    66 //     G.addEdge(s_nodes[random(4)], t_nodes[random(4)]);
    67 //   }
     67  random_init();
     68  for(int i=0; i<6; ++i) {
     69    G.addEdge(s_nodes[random(4)], t_nodes[random(4)]);
     70  }
    6871 
    69   G.addEdge(s_nodes[2], t_nodes[4-4]);
    70   G.addEdge(s_nodes[2], t_nodes[7-4]);
    71   G.addEdge(s_nodes[2], t_nodes[4-4]);
    72   G.addEdge(s_nodes[3], t_nodes[6-4]);
    73   G.addEdge(s_nodes[3], t_nodes[5-4]);
    74   G.addEdge(s_nodes[3], t_nodes[5-4]);
     72//   G.addEdge(s_nodes[2], t_nodes[4-4]);
     73//   G.addEdge(s_nodes[2], t_nodes[7-4]);
     74//   G.addEdge(s_nodes[2], t_nodes[4-4]);
     75//   G.addEdge(s_nodes[3], t_nodes[6-4]);
     76//   G.addEdge(s_nodes[3], t_nodes[5-4]);
     77//   G.addEdge(s_nodes[3], t_nodes[5-4]);
    7578
    7679
Note: See TracChangeset for help on using the changeset viewer.