equal
deleted
inserted
replaced
337 CapacityMap& capacity, |
337 CapacityMap& capacity, |
338 typename CapacityMap::Value infty = 0, |
338 typename CapacityMap::Value infty = 0, |
339 DimacsDescriptor desc=DimacsDescriptor()) { |
339 DimacsDescriptor desc=DimacsDescriptor()) { |
340 typename Digraph::Node u,v; |
340 typename Digraph::Node u,v; |
341 if(desc.type==DimacsDescriptor::NONE) desc=dimacsType(is); |
341 if(desc.type==DimacsDescriptor::NONE) desc=dimacsType(is); |
342 if(desc.type!=DimacsDescriptor::MAX || desc.type!=DimacsDescriptor::SP) |
342 if(desc.type!=DimacsDescriptor::MAX && desc.type!=DimacsDescriptor::SP) |
343 throw FormatError("Problem type mismatch"); |
343 throw FormatError("Problem type mismatch"); |
344 _readDimacs(is, g, capacity, u, v, infty, desc); |
344 _readDimacs(is, g, capacity, u, v, infty, desc); |
345 } |
345 } |
346 |
346 |
347 template<typename Graph> |
347 template<typename Graph> |