Changes in lemon/lgf_reader.h [291:d901321d6555:294:cbe3ec2d59d2] in lemon-main
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/lgf_reader.h
r291 r294 393 393 394 394 template <typename Digraph> 395 DigraphReader<Digraph> digraphReader(std::istream& is, Digraph& digraph); 395 DigraphReader<Digraph> digraphReader(Digraph& digraph, 396 std::istream& is = std::cin); 396 397 397 398 template <typename Digraph> 398 DigraphReader<Digraph> digraphReader( const std::string& fn, Digraph& digraph);399 DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn); 399 400 400 401 template <typename Digraph> 401 DigraphReader<Digraph> digraphReader( const char *fn, Digraph& digraph);402 DigraphReader<Digraph> digraphReader(Digraph& digraph, const char *fn); 402 403 403 404 /// \ingroup lemon_io … … 422 423 /// 423 424 ///\code 424 /// DigraphReader<Digraph>( std::cin, digraph).425 /// DigraphReader<Digraph>(digraph, std::cin). 425 426 /// nodeMap("coordinates", coord_map). 426 427 /// arcMap("capacity", cap_map). … … 503 504 /// Construct a directed graph reader, which reads from the given 504 505 /// input stream. 505 DigraphReader( std::istream& is, Digraph& digraph)506 DigraphReader(Digraph& digraph, std::istream& is = std::cin) 506 507 : _is(&is), local_is(false), _digraph(digraph), 507 508 _use_nodes(false), _use_arcs(false), … … 512 513 /// Construct a directed graph reader, which reads from the given 513 514 /// file. 514 DigraphReader( const std::string& fn, Digraph& digraph)515 DigraphReader(Digraph& digraph, const std::string& fn) 515 516 : _is(new std::ifstream(fn.c_str())), local_is(true), 516 517 _filename(fn), _digraph(digraph), … … 524 525 /// Construct a directed graph reader, which reads from the given 525 526 /// file. 526 DigraphReader( const char* fn, Digraph& digraph)527 DigraphReader(Digraph& digraph, const char* fn) 527 528 : _is(new std::ifstream(fn)), local_is(true), 528 529 _filename(fn), _digraph(digraph), … … 557 558 private: 558 559 559 friend DigraphReader<Digraph> digraphReader<>( std::istream& is,560 Digraph& digraph);561 friend DigraphReader<Digraph> digraphReader<>( const std::string& fn,562 Digraph& digraph);563 friend DigraphReader<Digraph> digraphReader<>( const char *fn,564 Digraph& digraph);560 friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph, 561 std::istream& is); 562 friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph, 563 const std::string& fn); 564 friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph, 565 const char *fn); 565 566 566 567 DigraphReader(DigraphReader& other) … … 1188 1189 /// \relates DigraphReader 1189 1190 template <typename Digraph> 1190 DigraphReader<Digraph> digraphReader(std::istream& is, Digraph& digraph) { 1191 DigraphReader<Digraph> tmp(is, digraph); 1191 DigraphReader<Digraph> digraphReader(Digraph& digraph, 1192 std::istream& is = std::cin) { 1193 DigraphReader<Digraph> tmp(digraph, is); 1192 1194 return tmp; 1193 1195 } … … 1198 1200 /// \relates DigraphReader 1199 1201 template <typename Digraph> 1200 DigraphReader<Digraph> digraphReader( const std::string& fn,1201 Digraph& digraph) {1202 DigraphReader<Digraph> tmp( fn, digraph);1202 DigraphReader<Digraph> digraphReader(Digraph& digraph, 1203 const std::string& fn) { 1204 DigraphReader<Digraph> tmp(digraph, fn); 1203 1205 return tmp; 1204 1206 } … … 1209 1211 /// \relates DigraphReader 1210 1212 template <typename Digraph> 1211 DigraphReader<Digraph> digraphReader( const char* fn, Digraph& digraph) {1212 DigraphReader<Digraph> tmp( fn, digraph);1213 DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) { 1214 DigraphReader<Digraph> tmp(digraph, fn); 1213 1215 return tmp; 1214 1216 } … … 1218 1220 1219 1221 template <typename Graph> 1220 GraphReader<Graph> graphReader(std::istream& is, Graph& graph); 1222 GraphReader<Graph> graphReader(Graph& graph, 1223 std::istream& is = std::cin); 1221 1224 1222 1225 template <typename Graph> 1223 GraphReader<Graph> graphReader( const std::string& fn, Graph& graph);1226 GraphReader<Graph> graphReader(Graph& graph, const std::string& fn); 1224 1227 1225 1228 template <typename Graph> 1226 GraphReader<Graph> graphReader( const char *fn, Graph& graph);1229 GraphReader<Graph> graphReader(Graph& graph, const char *fn); 1227 1230 1228 1231 /// \ingroup lemon_io … … 1292 1295 /// Construct an undirected graph reader, which reads from the given 1293 1296 /// input stream. 1294 GraphReader( std::istream& is, Graph& graph)1297 GraphReader(Graph& graph, std::istream& is = std::cin) 1295 1298 : _is(&is), local_is(false), _graph(graph), 1296 1299 _use_nodes(false), _use_edges(false), … … 1301 1304 /// Construct an undirected graph reader, which reads from the given 1302 1305 /// file. 1303 GraphReader( const std::string& fn, Graph& graph)1306 GraphReader(Graph& graph, const std::string& fn) 1304 1307 : _is(new std::ifstream(fn.c_str())), local_is(true), 1305 1308 _filename(fn), _graph(graph), … … 1313 1316 /// Construct an undirected graph reader, which reads from the given 1314 1317 /// file. 1315 GraphReader( const char* fn, Graph& graph)1318 GraphReader(Graph& graph, const char* fn) 1316 1319 : _is(new std::ifstream(fn)), local_is(true), 1317 1320 _filename(fn), _graph(graph), … … 1345 1348 1346 1349 private: 1347 friend GraphReader<Graph> graphReader<>( std::istream& is, Graph& graph);1348 friend GraphReader<Graph> graphReader<>( const std::string& fn,1349 Graph& graph);1350 friend GraphReader<Graph> graphReader<>( const char *fn, Graph& graph);1350 friend GraphReader<Graph> graphReader<>(Graph& graph, std::istream& is); 1351 friend GraphReader<Graph> graphReader<>(Graph& graph, 1352 const std::string& fn); 1353 friend GraphReader<Graph> graphReader<>(Graph& graph, const char *fn); 1351 1354 1352 1355 GraphReader(GraphReader& other) … … 2022 2025 /// \relates GraphReader 2023 2026 template <typename Graph> 2024 GraphReader<Graph> graphReader( std::istream& is, Graph& graph) {2025 GraphReader<Graph> tmp( is, graph);2027 GraphReader<Graph> graphReader(Graph& graph, std::istream& is = std::cin) { 2028 GraphReader<Graph> tmp(graph, is); 2026 2029 return tmp; 2027 2030 } … … 2032 2035 /// \relates GraphReader 2033 2036 template <typename Graph> 2034 GraphReader<Graph> graphReader(const std::string& fn, 2035 Graph& graph) { 2036 GraphReader<Graph> tmp(fn, graph); 2037 GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) { 2038 GraphReader<Graph> tmp(graph, fn); 2037 2039 return tmp; 2038 2040 } … … 2043 2045 /// \relates GraphReader 2044 2046 template <typename Graph> 2045 GraphReader<Graph> graphReader( const char* fn, Graph& graph) {2046 GraphReader<Graph> tmp( fn, graph);2047 GraphReader<Graph> graphReader(Graph& graph, const char* fn) { 2048 GraphReader<Graph> tmp(graph, fn); 2047 2049 return tmp; 2048 2050 }
Note: See TracChangeset
for help on using the changeset viewer.