correction of some bugs pointed by alpar
authormarci
Sat, 24 Jul 2004 14:01:31 +0000
changeset 73856e60e9eb2da
parent 737 2d867176d10e
child 739 3bb5553ec41b
correction of some bugs pointed by alpar
src/hugo/graph_wrapper.h
     1.1 --- a/src/hugo/graph_wrapper.h	Fri Jul 23 17:13:23 2004 +0000
     1.2 +++ b/src/hugo/graph_wrapper.h	Sat Jul 24 14:01:31 2004 +0000
     1.3 @@ -210,7 +210,7 @@
     1.4      bool forward(const Edge& e) const { return graph->forward(e); }
     1.5      bool backward(const Edge& e) const { return graph->backward(e); }
     1.6      
     1.7 -    Edge opposite(const Edge& e) const { Edge(graph->opposite(e)); }
     1.8 +    Edge opposite(const Edge& e) const { return Edge(graph->opposite(e)); }
     1.9  
    1.10      template<typename T> class NodeMap : public Graph::template NodeMap<T> { 
    1.11        typedef typename Graph::template NodeMap<T> Parent;
    1.12 @@ -1010,6 +1010,10 @@
    1.13        Parent::setForwardFilterMap(cm);
    1.14        Parent::setBackwardFilterMap(cm);
    1.15      }
    1.16 +
    1.17 +    int edgeNum() const { 
    1.18 +      return 2*this->graph->edgeNum();
    1.19 +    }
    1.20    };
    1.21  
    1.22  
    1.23 @@ -1388,7 +1392,7 @@
    1.24      void setCapacity(const CapacityMap& _capacity) { capacity=&_capacity; }
    1.25      void setFlow(const FlowMap& _flow) { flow=&_flow; }
    1.26      bool operator[](const typename Graph::Edge& e) const {
    1.27 -      return ((*flow)[e] < (*capacity)[e]);
    1.28 +      return (Number((*flow)[e]) < Number((*capacity)[e]));
    1.29      }
    1.30    };
    1.31  
    1.32 @@ -1407,7 +1411,7 @@
    1.33      void setCapacity(const CapacityMap& _capacity) { capacity=&_capacity; }
    1.34      void setFlow(const FlowMap& _flow) { flow=&_flow; }
    1.35      bool operator[](const typename Graph::Edge& e) const {
    1.36 -      return (0 < (*flow)[e]);
    1.37 +      return (Number(0) < Number((*flow)[e]));
    1.38      }
    1.39    };
    1.40