lemon-0.x: comparison lemon/network

equal deleted inserted replaced

-:8e09d6afc782
+:1e721137087f
 /// \tparam SupplyMap The type of the supply map.
 ///
 /// \warning
 /// - Edge capacities and costs should be \e non-negative \e integers.
 /// - Supply values should be \e signed \e integers.
-/// - \c LowerMap::Value must be convertible to \c CapacityMap::Value.
+/// - The value types of the maps should be convertible to each other.
-/// - \c CapacityMap::Value and \c SupplyMap::Value must be
+/// - \c CostMap::Value must be signed type.
-///   convertible to each other.
-/// - All value types must be convertible to \c CostMap::Value, which
-///   must be signed type.
 ///
 /// \note \ref NetworkSimplex provides six different pivot rule
 /// implementations that significantly affect the efficiency of the
 /// algorithm.
 /// By default a combined pivot rule is used, which is the fastest
 // The reduced cost map
 ReducedCostMap _red_cost;
 // Members for handling the original graph
-FlowMap _flow_result;
+FlowMap *_flow_result;
-PotentialMap _potential_result;
+PotentialMap *_potential_result;
+bool _local_flow;
+bool _local_potential;
 NodeRefMap _node_ref;
 EdgeRefMap _edge_ref;
 // The entering edge of the current pivot iteration.
 Edge _in_edge;
 // pivot iteration.
 Capacity delta;
 public :
-/// \brief General constructor of the class (with lower bounds).
+/// \brief General constructor (with lower bounds).
 ///
-/// General constructor of the class (with lower bounds).
+/// General constructor (with lower bounds).
 ///
 /// \param graph The directed graph the algorithm runs on.
 /// \param lower The lower bounds of the edges.
 /// \param capacity The capacities (upper bounds) of the edges.
 /// \param cost The cost (length) values of the edges.
 _graph(), _graph_ref(graph), _lower(&lower), _capacity(_graph),
 _cost(_graph), _supply(_graph), _flow(_graph),
 _potential(_graph), _depth(_graph), _parent(_graph),
 _pred_edge(_graph), _thread(_graph), _forward(_graph),
 _state(_graph), _red_cost(_graph, _cost, _potential),
-_flow_result(graph), _potential_result(graph),
+_flow_result(0), _potential_result(0),
+_local_flow(false), _local_potential(false),
 _node_ref(graph), _edge_ref(graph)
 {
 // Checking the sum of supply values
 Supply sum = 0;
 for (typename Graph::NodeIt n(_graph_ref); n != INVALID; ++n)
 s -= lower[e];
 _supply[_node_ref[n]] = s;
 }
 }
-/// \brief General constructor of the class (without lower bounds).
+/// \brief General constructor (without lower bounds).
 ///
-/// General constructor of the class (without lower bounds).
+/// General constructor (without lower bounds).
 ///
 /// \param graph The directed graph the algorithm runs on.
 /// \param capacity The capacities (upper bounds) of the edges.
 /// \param cost The cost (length) values of the edges.
 /// \param supply The supply values of the nodes (signed).
 _graph(), _graph_ref(graph), _lower(NULL), _capacity(_graph),
 _cost(_graph), _supply(_graph), _flow(_graph),
 _potential(_graph), _depth(_graph), _parent(_graph),
 _pred_edge(_graph), _thread(_graph), _forward(_graph),
 _state(_graph), _red_cost(_graph, _cost, _potential),
-_flow_result(graph), _potential_result(graph),
+_flow_result(0), _potential_result(0),
+_local_flow(false), _local_potential(false),
 _node_ref(graph), _edge_ref(graph)
 {
 // Checking the sum of supply values
 Supply sum = 0;
 for (typename Graph::NodeIt n(_graph_ref); n != INVALID; ++n)
 .nodeRef(_node_ref)
 .edgeRef(_edge_ref)
 .run();
 }
-/// \brief Simple constructor of the class (with lower bounds).
+/// \brief Simple constructor (with lower bounds).
 ///
-/// Simple constructor of the class (with lower bounds).
+/// Simple constructor (with lower bounds).
 ///
 /// \param graph The directed graph the algorithm runs on.
 /// \param lower The lower bounds of the edges.
 /// \param capacity The capacities (upper bounds) of the edges.
 /// \param cost The cost (length) values of the edges.
 _graph(), _graph_ref(graph), _lower(&lower), _capacity(_graph),
 _cost(_graph), _supply(_graph), _flow(_graph),
 _potential(_graph), _depth(_graph), _parent(_graph),
 _pred_edge(_graph), _thread(_graph), _forward(_graph),
 _state(_graph), _red_cost(_graph, _cost, _potential),
-_flow_result(graph), _potential_result(graph),
+_flow_result(0), _potential_result(0),
+_local_flow(false), _local_potential(false),
 _node_ref(graph), _edge_ref(graph)
 {
 // Copying _graph_ref to graph
 copyGraph(_graph, _graph_ref)
 .edgeMap(_cost, cost)
 _supply[_node_ref[n]] = sum;
 }
 _valid_supply = true;
 }
-/// \brief Simple constructor of the class (without lower bounds).
+/// \brief Simple constructor (without lower bounds).
 ///
-/// Simple constructor of the class (without lower bounds).
+/// Simple constructor (without lower bounds).
 ///
 /// \param graph The directed graph the algorithm runs on.
 /// \param capacity The capacities (upper bounds) of the edges.
 /// \param cost The cost (length) values of the edges.
 /// \param s The source node.
 _graph(), _graph_ref(graph), _lower(NULL), _capacity(_graph),
 _cost(_graph), _supply(_graph, 0), _flow(_graph),
 _potential(_graph), _depth(_graph), _parent(_graph),
 _pred_edge(_graph), _thread(_graph), _forward(_graph),
 _state(_graph), _red_cost(_graph, _cost, _potential),
-_flow_result(graph), _potential_result(graph),
+_flow_result(0), _potential_result(0),
+_local_flow(false), _local_potential(false),
 _node_ref(graph), _edge_ref(graph)
 {
 // Copying _graph_ref to graph
 copyGraph(_graph, _graph_ref)
 .edgeMap(_capacity, capacity)
 _supply[_node_ref[s]] =  flow_value;
 _supply[_node_ref[t]] = -flow_value;
 _valid_supply = true;
 }
+/// Destructor.
+~NetworkSimplex() {
+if (_local_flow) delete _flow_result;
+if (_local_potential) delete _potential_result;
+}
+/// \brief Sets the flow map.
+///
+/// Sets the flow map.
+///
+/// \return \c (*this)
+NetworkSimplex& flowMap(FlowMap &map) {
+if (_local_flow) {
+delete _flow_result;
+_local_flow = false;
+}
+_flow_result = &map;
+return *this;
+}
+/// \brief Sets the potential map.
+///
+/// Sets the potential map.
+///
+/// \return \c (*this)
+NetworkSimplex& potentialMap(PotentialMap &map) {
+if (_local_potential) {
+delete _potential_result;
+_local_potential = false;
+}
+_potential_result = &map;
+return *this;
+}
+/// \name Execution control
+/// The only way to execute the algorithm is to call the run()
+/// function.
+/// @{
 /// \brief Runs the algorithm.
 ///
 /// Runs the algorithm.
 ///
 /// \param pivot_rule The pivot rule that is used during the
 /// \return \c true if a feasible flow can be found.
 bool run(PivotRuleEnum pivot_rule = COMBINED_PIVOT) {
 return init() && start(pivot_rule);
 }
+/// @}
+/// \name Query Functions
+/// The result of the algorithm can be obtained using these
+/// functions.
+/// \n run() must be called before using them.
+/// @{
 /// \brief Returns a const reference to the edge map storing the
 /// found flow.
 ///
 /// Returns a const reference to the edge map storing the found flow.
 ///
 /// \pre \ref run() must be called before using this function.
 const FlowMap& flowMap() const {
-return _flow_result;
+return *_flow_result;
 }
 /// \brief Returns a const reference to the node map storing the
 /// found potentials (the dual solution).
 ///
 /// Returns a const reference to the node map storing the found
 /// potentials (the dual solution).
 ///
 /// \pre \ref run() must be called before using this function.
 const PotentialMap& potentialMap() const {
-return _potential_result;
+return *_potential_result;
+}
+/// \brief Returns the flow on the edge.
+///
+/// Returns the flow on the edge.
+///
+/// \pre \ref run() must be called before using this function.
+Capacity flow(const typename Graph::Edge& edge) const {
+return (*_flow_result)[edge];
+}
+/// \brief Returns the potential of the node.
+///
+/// Returns the potential of the node.
+///
+/// \pre \ref run() must be called before using this function.
+Cost potential(const typename Graph::Node& node) const {
+return (*_potential_result)[node];
 }
 /// \brief Returns the total cost of the found flow.
 ///
 /// Returns the total cost of the found flow. The complexity of the
 ///
 /// \pre \ref run() must be called before using this function.
 Cost totalCost() const {
 Cost c = 0;
 for (typename Graph::EdgeIt e(_graph_ref); e != INVALID; ++e)
-c += _flow_result[e] * _cost[_edge_ref[e]];
+c += (*_flow_result)[e] * _cost[_edge_ref[e]];
 return c;
 }
+/// @}
 private:
 /// \brief Extends the underlaying graph and initializes all the
 /// node and edge maps.
 bool init() {
 if (!_valid_supply) return false;
+// Initializing result maps
+if (!_flow_result) {
+_flow_result = new FlowMap(_graph_ref);
+_local_flow = true;
+}
+if (!_potential_result) {
+_potential_result = new PotentialMap(_graph_ref);
+_local_potential = true;
+}
 // Initializing state and flow maps
 for (EdgeIt e(_graph); e != INVALID; ++e) {
 _flow[e] = 0;
 _state[e] = STATE_LOWER;
 if (_flow[e] > 0) return false;
 // Copying flow values to _flow_result
 if (_lower) {
 for (typename Graph::EdgeIt e(_graph_ref); e != INVALID; ++e)
-_flow_result[e] = (*_lower)[e] + _flow[_edge_ref[e]];
+(*_flow_result)[e] = (*_lower)[e] + _flow[_edge_ref[e]];
 } else {
 for (typename Graph::EdgeIt e(_graph_ref); e != INVALID; ++e)
-_flow_result[e] = _flow[_edge_ref[e]];
+(*_flow_result)[e] = _flow[_edge_ref[e]];
 }
 // Copying potential values to _potential_result
 for (typename Graph::NodeIt n(_graph_ref); n != INVALID; ++n)
-_potential_result[n] = _potential[_node_ref[n]];
+(*_potential_result)[n] = _potential[_node_ref[n]];
 return true;
 }
 }; //class NetworkSimplex

changeset 2583	7216b6a52ab9
parent 2579	691ce54544c5
child 2588	4d3bc1d04c1d