0
7
0
39
37
47
45
... | ... |
@@ -41,13 +41,13 @@ |
41 | 41 |
int main() { |
42 | 42 |
SmartDigraph g; |
43 | 43 |
SmartDigraph::ArcMap<int> cap(g); |
44 | 44 |
SmartDigraph::Node s, t; |
45 | 45 |
|
46 | 46 |
try { |
47 |
digraphReader("digraph.lgf" |
|
47 |
digraphReader(g, "digraph.lgf"). // read the directed graph into g |
|
48 | 48 |
arcMap("capacity", cap). // read the 'capacity' arc map into cap |
49 | 49 |
node("source", s). // read 'source' node to s |
50 | 50 |
node("target", t). // read 'target' node to t |
51 | 51 |
run(); |
52 | 52 |
} catch (DataFormatError& error) { // check if there was any error |
53 | 53 |
std::cerr << "Error: " << error.what() << std::endl; |
... | ... |
@@ -57,13 +57,13 @@ |
57 | 57 |
std::cout << "A digraph is read from 'digraph.lgf'." << std::endl; |
58 | 58 |
std::cout << "Number of nodes: " << countNodes(g) << std::endl; |
59 | 59 |
std::cout << "Number of arcs: " << countArcs(g) << std::endl; |
60 | 60 |
|
61 | 61 |
std::cout << "We can write it to the standard output:" << std::endl; |
62 | 62 |
|
63 |
digraphWriter( |
|
63 |
digraphWriter(g). // write g to the standard output |
|
64 | 64 |
arcMap("capacity", cap). // write cap into 'capacity' |
65 | 65 |
node("source", s). // write s to 'source' |
66 | 66 |
node("target", t). // write t to 'target' |
67 | 67 |
run(); |
68 | 68 |
|
69 | 69 |
return 0; |
... | ... |
@@ -387,19 +387,20 @@ |
387 | 387 |
} |
388 | 388 |
|
389 | 389 |
template <typename Digraph> |
390 | 390 |
class DigraphReader; |
391 | 391 |
|
392 | 392 |
template <typename Digraph> |
393 |
DigraphReader<Digraph> digraphReader( |
|
393 |
DigraphReader<Digraph> digraphReader(Digraph& digraph, |
|
394 |
std::istream& is = std::cin); |
|
394 | 395 |
|
395 | 396 |
template <typename Digraph> |
396 |
DigraphReader<Digraph> digraphReader(const std::string& fn |
|
397 |
DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn); |
|
397 | 398 |
|
398 | 399 |
template <typename Digraph> |
399 |
DigraphReader<Digraph> digraphReader(const char *fn |
|
400 |
DigraphReader<Digraph> digraphReader(Digraph& digraph, const char *fn); |
|
400 | 401 |
|
401 | 402 |
/// \ingroup lemon_io |
402 | 403 |
/// |
403 | 404 |
/// \brief \ref lgf-format "LGF" reader for directed graphs |
404 | 405 |
/// |
405 | 406 |
/// This utility reads an \ref lgf-format "LGF" file. |
... | ... |
@@ -416,13 +417,13 @@ |
416 | 417 |
/// then a default conversion will be used. One map can be read into |
417 | 418 |
/// multiple map objects at the same time. The \c attribute(), \c |
418 | 419 |
/// node() and \c arc() functions are used to add attribute reading |
419 | 420 |
/// rules. |
420 | 421 |
/// |
421 | 422 |
///\code |
422 |
/// DigraphReader<Digraph>(std::cin |
|
423 |
/// DigraphReader<Digraph>(digraph, std::cin). |
|
423 | 424 |
/// nodeMap("coordinates", coord_map). |
424 | 425 |
/// arcMap("capacity", cap_map). |
425 | 426 |
/// node("source", src). |
426 | 427 |
/// node("target", trg). |
427 | 428 |
/// attribute("caption", caption). |
428 | 429 |
/// run(); |
... | ... |
@@ -496,31 +497,31 @@ |
496 | 497 |
public: |
497 | 498 |
|
498 | 499 |
/// \brief Constructor |
499 | 500 |
/// |
500 | 501 |
/// Construct a directed graph reader, which reads from the given |
501 | 502 |
/// input stream. |
502 |
DigraphReader(std::istream& is |
|
503 |
DigraphReader(Digraph& digraph, std::istream& is = std::cin) |
|
503 | 504 |
: _is(&is), local_is(false), _digraph(digraph), |
504 | 505 |
_use_nodes(false), _use_arcs(false), |
505 | 506 |
_skip_nodes(false), _skip_arcs(false) {} |
506 | 507 |
|
507 | 508 |
/// \brief Constructor |
508 | 509 |
/// |
509 | 510 |
/// Construct a directed graph reader, which reads from the given |
510 | 511 |
/// file. |
511 |
DigraphReader(const std::string& fn |
|
512 |
DigraphReader(Digraph& digraph, const std::string& fn) |
|
512 | 513 |
: _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph), |
513 | 514 |
_use_nodes(false), _use_arcs(false), |
514 | 515 |
_skip_nodes(false), _skip_arcs(false) {} |
515 | 516 |
|
516 | 517 |
/// \brief Constructor |
517 | 518 |
/// |
518 | 519 |
/// Construct a directed graph reader, which reads from the given |
519 | 520 |
/// file. |
520 |
DigraphReader(const char* fn |
|
521 |
DigraphReader(Digraph& digraph, const char* fn) |
|
521 | 522 |
: _is(new std::ifstream(fn)), local_is(true), _digraph(digraph), |
522 | 523 |
_use_nodes(false), _use_arcs(false), |
523 | 524 |
_skip_nodes(false), _skip_arcs(false) {} |
524 | 525 |
|
525 | 526 |
/// \brief Destructor |
526 | 527 |
~DigraphReader() { |
... | ... |
@@ -544,18 +545,18 @@ |
544 | 545 |
} |
545 | 546 |
|
546 | 547 |
} |
547 | 548 |
|
548 | 549 |
private: |
549 | 550 |
|
550 |
friend DigraphReader<Digraph> digraphReader<>(std::istream& is, |
|
551 |
Digraph& digraph); |
|
552 |
friend DigraphReader<Digraph> digraphReader<>(const std::string& fn, |
|
553 |
Digraph& digraph); |
|
554 |
friend DigraphReader<Digraph> digraphReader<>(const char *fn, |
|
555 |
Digraph& digraph); |
|
551 |
friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph, |
|
552 |
std::istream& is); |
|
553 |
friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph, |
|
554 |
const std::string& fn); |
|
555 |
friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph, |
|
556 |
const char *fn); |
|
556 | 557 |
|
557 | 558 |
DigraphReader(DigraphReader& other) |
558 | 559 |
: _is(other._is), local_is(other.local_is), _digraph(other._digraph), |
559 | 560 |
_use_nodes(other._use_nodes), _use_arcs(other._use_arcs), |
560 | 561 |
_skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) { |
561 | 562 |
|
... | ... |
@@ -1177,49 +1178,51 @@ |
1177 | 1178 |
|
1178 | 1179 |
/// \brief Return a \ref DigraphReader class |
1179 | 1180 |
/// |
1180 | 1181 |
/// This function just returns a \ref DigraphReader class. |
1181 | 1182 |
/// \relates DigraphReader |
1182 | 1183 |
template <typename Digraph> |
1183 |
DigraphReader<Digraph> digraphReader(std::istream& is, Digraph& digraph) { |
|
1184 |
DigraphReader<Digraph> tmp(is, digraph); |
|
1184 |
DigraphReader<Digraph> digraphReader(Digraph& digraph, |
|
1185 |
std::istream& is = std::cin) { |
|
1186 |
DigraphReader<Digraph> tmp(digraph, is); |
|
1185 | 1187 |
return tmp; |
1186 | 1188 |
} |
1187 | 1189 |
|
1188 | 1190 |
/// \brief Return a \ref DigraphReader class |
1189 | 1191 |
/// |
1190 | 1192 |
/// This function just returns a \ref DigraphReader class. |
1191 | 1193 |
/// \relates DigraphReader |
1192 | 1194 |
template <typename Digraph> |
1193 |
DigraphReader<Digraph> digraphReader(const std::string& fn, |
|
1194 |
Digraph& digraph) { |
|
1195 |
|
|
1195 |
DigraphReader<Digraph> digraphReader(Digraph& digraph, |
|
1196 |
const std::string& fn) { |
|
1197 |
DigraphReader<Digraph> tmp(digraph, fn); |
|
1196 | 1198 |
return tmp; |
1197 | 1199 |
} |
1198 | 1200 |
|
1199 | 1201 |
/// \brief Return a \ref DigraphReader class |
1200 | 1202 |
/// |
1201 | 1203 |
/// This function just returns a \ref DigraphReader class. |
1202 | 1204 |
/// \relates DigraphReader |
1203 | 1205 |
template <typename Digraph> |
1204 |
DigraphReader<Digraph> digraphReader(const char* fn, Digraph& digraph) { |
|
1205 |
DigraphReader<Digraph> tmp(fn, digraph); |
|
1206 |
DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) { |
|
1207 |
DigraphReader<Digraph> tmp(digraph, fn); |
|
1206 | 1208 |
return tmp; |
1207 | 1209 |
} |
1208 | 1210 |
|
1209 | 1211 |
template <typename Graph> |
1210 | 1212 |
class GraphReader; |
1211 | 1213 |
|
1212 | 1214 |
template <typename Graph> |
1213 |
GraphReader<Graph> graphReader( |
|
1215 |
GraphReader<Graph> graphReader(Graph& graph, |
|
1216 |
std::istream& is = std::cin); |
|
1214 | 1217 |
|
1215 | 1218 |
template <typename Graph> |
1216 |
GraphReader<Graph> graphReader(const std::string& fn |
|
1219 |
GraphReader<Graph> graphReader(Graph& graph, const std::string& fn); |
|
1217 | 1220 |
|
1218 | 1221 |
template <typename Graph> |
1219 |
GraphReader<Graph> graphReader(const char *fn |
|
1222 |
GraphReader<Graph> graphReader(Graph& graph, const char *fn); |
|
1220 | 1223 |
|
1221 | 1224 |
/// \ingroup lemon_io |
1222 | 1225 |
/// |
1223 | 1226 |
/// \brief \ref lgf-format "LGF" reader for undirected graphs |
1224 | 1227 |
/// |
1225 | 1228 |
/// This utility reads an \ref lgf-format "LGF" file. |
... | ... |
@@ -1280,31 +1283,31 @@ |
1280 | 1283 |
public: |
1281 | 1284 |
|
1282 | 1285 |
/// \brief Constructor |
1283 | 1286 |
/// |
1284 | 1287 |
/// Construct an undirected graph reader, which reads from the given |
1285 | 1288 |
/// input stream. |
1286 |
GraphReader(std::istream& is |
|
1289 |
GraphReader(Graph& graph, std::istream& is = std::cin) |
|
1287 | 1290 |
: _is(&is), local_is(false), _graph(graph), |
1288 | 1291 |
_use_nodes(false), _use_edges(false), |
1289 | 1292 |
_skip_nodes(false), _skip_edges(false) {} |
1290 | 1293 |
|
1291 | 1294 |
/// \brief Constructor |
1292 | 1295 |
/// |
1293 | 1296 |
/// Construct an undirected graph reader, which reads from the given |
1294 | 1297 |
/// file. |
1295 |
GraphReader(const std::string& fn |
|
1298 |
GraphReader(Graph& graph, const std::string& fn) |
|
1296 | 1299 |
: _is(new std::ifstream(fn.c_str())), local_is(true), _graph(graph), |
1297 | 1300 |
_use_nodes(false), _use_edges(false), |
1298 | 1301 |
_skip_nodes(false), _skip_edges(false) {} |
1299 | 1302 |
|
1300 | 1303 |
/// \brief Constructor |
1301 | 1304 |
/// |
1302 | 1305 |
/// Construct an undirected graph reader, which reads from the given |
1303 | 1306 |
/// file. |
1304 |
GraphReader(const char* fn |
|
1307 |
GraphReader(Graph& graph, const char* fn) |
|
1305 | 1308 |
: _is(new std::ifstream(fn)), local_is(true), _graph(graph), |
1306 | 1309 |
_use_nodes(false), _use_edges(false), |
1307 | 1310 |
_skip_nodes(false), _skip_edges(false) {} |
1308 | 1311 |
|
1309 | 1312 |
/// \brief Destructor |
1310 | 1313 |
~GraphReader() { |
... | ... |
@@ -1327,16 +1330,16 @@ |
1327 | 1330 |
delete _is; |
1328 | 1331 |
} |
1329 | 1332 |
|
1330 | 1333 |
} |
1331 | 1334 |
|
1332 | 1335 |
private: |
1333 |
friend GraphReader<Graph> graphReader<>(std::istream& is, Graph& graph); |
|
1334 |
friend GraphReader<Graph> graphReader<>(const std::string& fn, |
|
1335 |
Graph& graph); |
|
1336 |
friend GraphReader<Graph> graphReader<>(const char *fn, Graph& graph); |
|
1336 |
friend GraphReader<Graph> graphReader<>(Graph& graph, std::istream& is); |
|
1337 |
friend GraphReader<Graph> graphReader<>(Graph& graph, |
|
1338 |
const std::string& fn); |
|
1339 |
friend GraphReader<Graph> graphReader<>(Graph& graph, const char *fn); |
|
1337 | 1340 |
|
1338 | 1341 |
GraphReader(GraphReader& other) |
1339 | 1342 |
: _is(other._is), local_is(other.local_is), _graph(other._graph), |
1340 | 1343 |
_use_nodes(other._use_nodes), _use_edges(other._use_edges), |
1341 | 1344 |
_skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) { |
1342 | 1345 |
|
... | ... |
@@ -2003,35 +2006,34 @@ |
2003 | 2006 |
|
2004 | 2007 |
/// \brief Return a \ref GraphReader class |
2005 | 2008 |
/// |
2006 | 2009 |
/// This function just returns a \ref GraphReader class. |
2007 | 2010 |
/// \relates GraphReader |
2008 | 2011 |
template <typename Graph> |
2009 |
GraphReader<Graph> graphReader(std::istream& is, Graph& graph) { |
|
2010 |
GraphReader<Graph> tmp(is, graph); |
|
2012 |
GraphReader<Graph> graphReader(Graph& graph, std::istream& is = std::cin) { |
|
2013 |
GraphReader<Graph> tmp(graph, is); |
|
2011 | 2014 |
return tmp; |
2012 | 2015 |
} |
2013 | 2016 |
|
2014 | 2017 |
/// \brief Return a \ref GraphReader class |
2015 | 2018 |
/// |
2016 | 2019 |
/// This function just returns a \ref GraphReader class. |
2017 | 2020 |
/// \relates GraphReader |
2018 | 2021 |
template <typename Graph> |
2019 |
GraphReader<Graph> graphReader(const std::string& fn, |
|
2020 |
Graph& graph) { |
|
2021 |
|
|
2022 |
GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) { |
|
2023 |
GraphReader<Graph> tmp(graph, fn); |
|
2022 | 2024 |
return tmp; |
2023 | 2025 |
} |
2024 | 2026 |
|
2025 | 2027 |
/// \brief Return a \ref GraphReader class |
2026 | 2028 |
/// |
2027 | 2029 |
/// This function just returns a \ref GraphReader class. |
2028 | 2030 |
/// \relates GraphReader |
2029 | 2031 |
template <typename Graph> |
2030 |
GraphReader<Graph> graphReader(const char* fn, Graph& graph) { |
|
2031 |
GraphReader<Graph> tmp(fn, graph); |
|
2032 |
GraphReader<Graph> graphReader(Graph& graph, const char* fn) { |
|
2033 |
GraphReader<Graph> tmp(graph, fn); |
|
2032 | 2034 |
return tmp; |
2033 | 2035 |
} |
2034 | 2036 |
|
2035 | 2037 |
class SectionReader; |
2036 | 2038 |
|
2037 | 2039 |
SectionReader sectionReader(std::istream& is); |
... | ... |
@@ -349,22 +349,22 @@ |
349 | 349 |
} |
350 | 350 |
|
351 | 351 |
template <typename Digraph> |
352 | 352 |
class DigraphWriter; |
353 | 353 |
|
354 | 354 |
template <typename Digraph> |
355 |
DigraphWriter<Digraph> digraphWriter(std::ostream& os, |
|
356 |
const Digraph& digraph); |
|
355 |
DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, |
|
356 |
std::ostream& os = std::cout); |
|
357 | 357 |
|
358 | 358 |
template <typename Digraph> |
359 |
DigraphWriter<Digraph> digraphWriter(const std::string& fn, |
|
360 |
const Digraph& digraph); |
|
359 |
DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, |
|
360 |
const std::string& fn); |
|
361 | 361 |
|
362 | 362 |
template <typename Digraph> |
363 |
DigraphWriter<Digraph> digraphWriter(const char *fn, |
|
364 |
const Digraph& digraph); |
|
363 |
DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, |
|
364 |
const char *fn); |
|
365 | 365 |
|
366 | 366 |
/// \ingroup lemon_io |
367 | 367 |
/// |
368 | 368 |
/// \brief \ref lgf-format "LGF" writer for directed graphs |
369 | 369 |
/// |
370 | 370 |
/// This utility writes an \ref lgf-format "LGF" file. |
... | ... |
@@ -379,13 +379,13 @@ |
379 | 379 |
/// is set, it will determine how the value type of the map is written to |
380 | 380 |
/// the output stream. If the functor is not set, then a default |
381 | 381 |
/// conversion will be used. The \c attribute(), \c node() and \c |
382 | 382 |
/// arc() functions are used to add attribute writing rules. |
383 | 383 |
/// |
384 | 384 |
///\code |
385 |
/// DigraphWriter<Digraph>(std::cout |
|
385 |
/// DigraphWriter<Digraph>(digraph, std::cout). |
|
386 | 386 |
/// nodeMap("coordinates", coord_map). |
387 | 387 |
/// nodeMap("size", size). |
388 | 388 |
/// nodeMap("title", title). |
389 | 389 |
/// arcMap("capacity", cap_map). |
390 | 390 |
/// node("source", src). |
391 | 391 |
/// node("target", trg). |
... | ... |
@@ -449,29 +449,29 @@ |
449 | 449 |
public: |
450 | 450 |
|
451 | 451 |
/// \brief Constructor |
452 | 452 |
/// |
453 | 453 |
/// Construct a directed graph writer, which writes to the given |
454 | 454 |
/// output stream. |
455 |
DigraphWriter(std::ostream& is, const Digraph& digraph) |
|
456 |
: _os(&is), local_os(false), _digraph(digraph), |
|
455 |
DigraphWriter(const Digraph& digraph, std::ostream& os = std::cout) |
|
456 |
: _os(&os), local_os(false), _digraph(digraph), |
|
457 | 457 |
_skip_nodes(false), _skip_arcs(false) {} |
458 | 458 |
|
459 | 459 |
/// \brief Constructor |
460 | 460 |
/// |
461 | 461 |
/// Construct a directed graph writer, which writes to the given |
462 | 462 |
/// output file. |
463 |
DigraphWriter(const std::string& fn |
|
463 |
DigraphWriter(const Digraph& digraph, const std::string& fn) |
|
464 | 464 |
: _os(new std::ofstream(fn.c_str())), local_os(true), _digraph(digraph), |
465 | 465 |
_skip_nodes(false), _skip_arcs(false) {} |
466 | 466 |
|
467 | 467 |
/// \brief Constructor |
468 | 468 |
/// |
469 | 469 |
/// Construct a directed graph writer, which writes to the given |
470 | 470 |
/// output file. |
471 |
DigraphWriter(const char* fn |
|
471 |
DigraphWriter(const Digraph& digraph, const char* fn) |
|
472 | 472 |
: _os(new std::ofstream(fn)), local_os(true), _digraph(digraph), |
473 | 473 |
_skip_nodes(false), _skip_arcs(false) {} |
474 | 474 |
|
475 | 475 |
/// \brief Destructor |
476 | 476 |
~DigraphWriter() { |
477 | 477 |
for (typename NodeMaps::iterator it = _node_maps.begin(); |
... | ... |
@@ -493,18 +493,18 @@ |
493 | 493 |
delete _os; |
494 | 494 |
} |
495 | 495 |
} |
496 | 496 |
|
497 | 497 |
private: |
498 | 498 |
|
499 |
friend DigraphWriter<Digraph> digraphWriter<>(std::ostream& os, |
|
500 |
const Digraph& digraph); |
|
501 |
friend DigraphWriter<Digraph> digraphWriter<>(const std::string& fn, |
|
502 |
const Digraph& digraph); |
|
503 |
friend DigraphWriter<Digraph> digraphWriter<>(const char *fn, |
|
504 |
const Digraph& digraph); |
|
499 |
friend DigraphWriter<Digraph> digraphWriter<>(const Digraph& digraph, |
|
500 |
std::ostream& os); |
|
501 |
friend DigraphWriter<Digraph> digraphWriter<>(const Digraph& digraph, |
|
502 |
const std::string& fn); |
|
503 |
friend DigraphWriter<Digraph> digraphWriter<>(const Digraph& digraph, |
|
504 |
const char *fn); |
|
505 | 505 |
|
506 | 506 |
DigraphWriter(DigraphWriter& other) |
507 | 507 |
: _os(other._os), local_os(other.local_os), _digraph(other._digraph), |
508 | 508 |
_skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) { |
509 | 509 |
|
510 | 510 |
other._os = 0; |
... | ... |
@@ -905,51 +905,52 @@ |
905 | 905 |
|
906 | 906 |
/// \brief Return a \ref DigraphWriter class |
907 | 907 |
/// |
908 | 908 |
/// This function just returns a \ref DigraphWriter class. |
909 | 909 |
/// \relates DigraphWriter |
910 | 910 |
template <typename Digraph> |
911 |
DigraphWriter<Digraph> digraphWriter(std::ostream& os, |
|
912 |
const Digraph& digraph) { |
|
913 |
|
|
911 |
DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, |
|
912 |
std::ostream& os = std::cout) { |
|
913 |
DigraphWriter<Digraph> tmp(digraph, os); |
|
914 | 914 |
return tmp; |
915 | 915 |
} |
916 | 916 |
|
917 | 917 |
/// \brief Return a \ref DigraphWriter class |
918 | 918 |
/// |
919 | 919 |
/// This function just returns a \ref DigraphWriter class. |
920 | 920 |
/// \relates DigraphWriter |
921 | 921 |
template <typename Digraph> |
922 |
DigraphWriter<Digraph> digraphWriter(const std::string& fn, |
|
923 |
const Digraph& digraph) { |
|
924 |
|
|
922 |
DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, |
|
923 |
const std::string& fn) { |
|
924 |
DigraphWriter<Digraph> tmp(digraph, fn); |
|
925 | 925 |
return tmp; |
926 | 926 |
} |
927 | 927 |
|
928 | 928 |
/// \brief Return a \ref DigraphWriter class |
929 | 929 |
/// |
930 | 930 |
/// This function just returns a \ref DigraphWriter class. |
931 | 931 |
/// \relates DigraphWriter |
932 | 932 |
template <typename Digraph> |
933 |
DigraphWriter<Digraph> digraphWriter(const char* fn, |
|
934 |
const Digraph& digraph) { |
|
935 |
|
|
933 |
DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, |
|
934 |
const char* fn) { |
|
935 |
DigraphWriter<Digraph> tmp(digraph, fn); |
|
936 | 936 |
return tmp; |
937 | 937 |
} |
938 | 938 |
|
939 | 939 |
template <typename Graph> |
940 | 940 |
class GraphWriter; |
941 | 941 |
|
942 | 942 |
template <typename Graph> |
943 |
GraphWriter<Graph> graphWriter( |
|
943 |
GraphWriter<Graph> graphWriter(const Graph& graph, |
|
944 |
std::ostream& os = std::cout); |
|
944 | 945 |
|
945 | 946 |
template <typename Graph> |
946 |
GraphWriter<Graph> graphWriter(const std::string& fn |
|
947 |
GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn); |
|
947 | 948 |
|
948 | 949 |
template <typename Graph> |
949 |
GraphWriter<Graph> graphWriter(const |
|
950 |
GraphWriter<Graph> graphWriter(const Graph& graph, const char *fn); |
|
950 | 951 |
|
951 | 952 |
/// \ingroup lemon_io |
952 | 953 |
/// |
953 | 954 |
/// \brief \ref lgf-format "LGF" writer for directed graphs |
954 | 955 |
/// |
955 | 956 |
/// This utility writes an \ref lgf-format "LGF" file. |
... | ... |
@@ -1005,29 +1006,29 @@ |
1005 | 1006 |
public: |
1006 | 1007 |
|
1007 | 1008 |
/// \brief Constructor |
1008 | 1009 |
/// |
1009 | 1010 |
/// Construct a directed graph writer, which writes to the given |
1010 | 1011 |
/// output stream. |
1011 |
GraphWriter(std::ostream& is, const Graph& graph) |
|
1012 |
: _os(&is), local_os(false), _graph(graph), |
|
1012 |
GraphWriter(const Graph& graph, std::ostream& os = std::cout) |
|
1013 |
: _os(&os), local_os(false), _graph(graph), |
|
1013 | 1014 |
_skip_nodes(false), _skip_edges(false) {} |
1014 | 1015 |
|
1015 | 1016 |
/// \brief Constructor |
1016 | 1017 |
/// |
1017 | 1018 |
/// Construct a directed graph writer, which writes to the given |
1018 | 1019 |
/// output file. |
1019 |
GraphWriter(const std::string& fn |
|
1020 |
GraphWriter(const Graph& graph, const std::string& fn) |
|
1020 | 1021 |
: _os(new std::ofstream(fn.c_str())), local_os(true), _graph(graph), |
1021 | 1022 |
_skip_nodes(false), _skip_edges(false) {} |
1022 | 1023 |
|
1023 | 1024 |
/// \brief Constructor |
1024 | 1025 |
/// |
1025 | 1026 |
/// Construct a directed graph writer, which writes to the given |
1026 | 1027 |
/// output file. |
1027 |
GraphWriter(const char* fn |
|
1028 |
GraphWriter(const Graph& graph, const char* fn) |
|
1028 | 1029 |
: _os(new std::ofstream(fn)), local_os(true), _graph(graph), |
1029 | 1030 |
_skip_nodes(false), _skip_edges(false) {} |
1030 | 1031 |
|
1031 | 1032 |
/// \brief Destructor |
1032 | 1033 |
~GraphWriter() { |
1033 | 1034 |
for (typename NodeMaps::iterator it = _node_maps.begin(); |
... | ... |
@@ -1049,18 +1050,18 @@ |
1049 | 1050 |
delete _os; |
1050 | 1051 |
} |
1051 | 1052 |
} |
1052 | 1053 |
|
1053 | 1054 |
private: |
1054 | 1055 |
|
1055 |
friend GraphWriter<Graph> graphWriter<>(std::ostream& os, |
|
1056 |
const Graph& graph); |
|
1057 |
friend GraphWriter<Graph> graphWriter<>(const std::string& fn, |
|
1058 |
const Graph& graph); |
|
1059 |
friend GraphWriter<Graph> graphWriter<>(const char *fn, |
|
1060 |
const Graph& graph); |
|
1056 |
friend GraphWriter<Graph> graphWriter<>(const Graph& graph, |
|
1057 |
std::ostream& os); |
|
1058 |
friend GraphWriter<Graph> graphWriter<>(const Graph& graph, |
|
1059 |
const std::string& fn); |
|
1060 |
friend GraphWriter<Graph> graphWriter<>(const Graph& graph, |
|
1061 |
const char *fn); |
|
1061 | 1062 |
|
1062 | 1063 |
GraphWriter(GraphWriter& other) |
1063 | 1064 |
: _os(other._os), local_os(other.local_os), _graph(other._graph), |
1064 | 1065 |
_skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) { |
1065 | 1066 |
|
1066 | 1067 |
other._os = 0; |
... | ... |
@@ -1507,34 +1508,35 @@ |
1507 | 1508 |
|
1508 | 1509 |
/// \brief Return a \ref GraphWriter class |
1509 | 1510 |
/// |
1510 | 1511 |
/// This function just returns a \ref GraphWriter class. |
1511 | 1512 |
/// \relates GraphWriter |
1512 | 1513 |
template <typename Graph> |
1513 |
GraphWriter<Graph> graphWriter(std::ostream& os, const Graph& graph) { |
|
1514 |
GraphWriter<Graph> tmp(os, graph); |
|
1514 |
GraphWriter<Graph> graphWriter(const Graph& graph, |
|
1515 |
std::ostream& os = std::cout) { |
|
1516 |
GraphWriter<Graph> tmp(graph, os); |
|
1515 | 1517 |
return tmp; |
1516 | 1518 |
} |
1517 | 1519 |
|
1518 | 1520 |
/// \brief Return a \ref GraphWriter class |
1519 | 1521 |
/// |
1520 | 1522 |
/// This function just returns a \ref GraphWriter class. |
1521 | 1523 |
/// \relates GraphWriter |
1522 | 1524 |
template <typename Graph> |
1523 |
GraphWriter<Graph> graphWriter(const std::string& fn, const Graph& graph) { |
|
1524 |
GraphWriter<Graph> tmp(fn, graph); |
|
1525 |
GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn) { |
|
1526 |
GraphWriter<Graph> tmp(graph, fn); |
|
1525 | 1527 |
return tmp; |
1526 | 1528 |
} |
1527 | 1529 |
|
1528 | 1530 |
/// \brief Return a \ref GraphWriter class |
1529 | 1531 |
/// |
1530 | 1532 |
/// This function just returns a \ref GraphWriter class. |
1531 | 1533 |
/// \relates GraphWriter |
1532 | 1534 |
template <typename Graph> |
1533 |
GraphWriter<Graph> graphWriter(const char* fn, const Graph& graph) { |
|
1534 |
GraphWriter<Graph> tmp(fn, graph); |
|
1535 |
GraphWriter<Graph> graphWriter(const Graph& graph, const char* fn) { |
|
1536 |
GraphWriter<Graph> tmp(graph, fn); |
|
1535 | 1537 |
return tmp; |
1536 | 1538 |
} |
1537 | 1539 |
|
1538 | 1540 |
class SectionWriter; |
1539 | 1541 |
|
1540 | 1542 |
SectionWriter sectionWriter(std::istream& is); |
... | ... |
@@ -141,13 +141,13 @@ |
141 | 141 |
TEMPLATE_DIGRAPH_TYPEDEFS(Digraph); |
142 | 142 |
|
143 | 143 |
Digraph G; |
144 | 144 |
Node s, t; |
145 | 145 |
|
146 | 146 |
std::istringstream input(test_lgf); |
147 |
digraphReader( |
|
147 |
digraphReader(G, input). |
|
148 | 148 |
node("source", s). |
149 | 149 |
node("target", t). |
150 | 150 |
run(); |
151 | 151 |
|
152 | 152 |
Bfs<Digraph> bfs_test(G); |
153 | 153 |
bfs_test.run(s); |
... | ... |
@@ -143,13 +143,13 @@ |
143 | 143 |
TEMPLATE_DIGRAPH_TYPEDEFS(Digraph); |
144 | 144 |
|
145 | 145 |
Digraph G; |
146 | 146 |
Node s, t; |
147 | 147 |
|
148 | 148 |
std::istringstream input(test_lgf); |
149 |
digraphReader( |
|
149 |
digraphReader(G, input). |
|
150 | 150 |
node("source", s). |
151 | 151 |
node("target", t). |
152 | 152 |
run(); |
153 | 153 |
|
154 | 154 |
Dfs<Digraph> dfs_test(G); |
155 | 155 |
dfs_test.run(s); |
... | ... |
@@ -139,13 +139,13 @@ |
139 | 139 |
|
140 | 140 |
Digraph G; |
141 | 141 |
Node s, t; |
142 | 142 |
LengthMap length(G); |
143 | 143 |
|
144 | 144 |
std::istringstream input(test_lgf); |
145 |
digraphReader( |
|
145 |
digraphReader(G, input). |
|
146 | 146 |
arcMap("length", length). |
147 | 147 |
node("source", s). |
148 | 148 |
node("target", t). |
149 | 149 |
run(); |
150 | 150 |
|
151 | 151 |
Dijkstra<Digraph, LengthMap> |
... | ... |
@@ -164,13 +164,13 @@ |
164 | 164 |
|
165 | 165 |
Digraph digraph; |
166 | 166 |
IntArcMap length(digraph); |
167 | 167 |
Node source; |
168 | 168 |
|
169 | 169 |
std::istringstream input(test_lgf); |
170 |
digraphReader( |
|
170 |
digraphReader(digraph, input). |
|
171 | 171 |
arcMap("capacity", length). |
172 | 172 |
node("source", source). |
173 | 173 |
run(); |
174 | 174 |
|
175 | 175 |
{ |
176 | 176 |
typedef BinHeap<Prio, ItemIntMap> IntHeap; |
0 comments (0 inline)