COIN-OR::LEMON - Graph Library

Changeset 415:679e64913c5e in lemon-0.x


Ignore:
Timestamp:
04/26/04 16:40:59 (16 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@555
Message:

for igcc-3.4.0

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/include/smart_graph.h

    r407 r415  
    5454      const SmartGraph* G;
    5555    public:
    56       virtual void add(const Key k) = NULL;
    57       virtual void erase(const Key k) = NULL;
     56      virtual void add(const Key k) = 0;
     57      virtual void erase(const Key k) = 0;
    5858      DynMapBase(const SmartGraph &_G) : G(&_G) {}
    5959      virtual ~DynMapBase() {}
  • src/work/marci/bfs_iterator.h

    r414 r415  
    128128    Bfs<Graph, ReachedMap, PredMap, DistMap> operator++() {
    129129      Parent::operator++();
    130       if (this->graph->valid(this->actual_edge) && this->b_node_newly_reached) {
    131         pred.set(s, actual_edge);
    132         dist.set(s, dist[this->aNode()]);
     130      if (this->graph->valid(this->actual_edge) && this->b_node_newly_reached)
     131      {
     132        pred.set(this->bNode(), this->actual_edge);
     133        dist.set(this->bNode(), dist[this->aNode()]);
    133134      }
    134135      return *this;
  • src/work/marci/edmonds_karp_demo.cc

    r390 r415  
    44
    55#include <list_graph.h>
    6 //#include <smart_graph.h>
     6#include <smart_graph.h>
    77#include <dimacs.h>
    88#include <edmonds_karp.h>
     
    3838  typedef ListGraph MutableGraph;
    3939
    40 //  typedef SmartGraph Graph;
    41   typedef ListGraph Graph;
     40  typedef SmartGraph Graph;
     41  //  typedef ListGraph Graph;
    4242  typedef Graph::Node Node;
    4343  typedef Graph::EdgeIt EdgeIt;
Note: See TracChangeset for help on using the changeset viewer.