LEMON/LEMON-main Changeset - r293:47fbc814aa31

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r293:47fbc814aa31

« 289:d91884

294:cbe3ec »

r293:47fbc814aa31

Wed, 01 Oct 2008 12:44:16

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Change the parameter order in LGF reader and writer tools

0 7 0

default

7 files changed with 92 insertions and 88 deletions:

demo/lgf_demo.cc

lemon/lgf_reader.h

lemon/lgf_writer.h

test/bfs_test.cc

test/dfs_test.cc

test/dijkstra_test.cc

test/heap_test.cc

↑ Collapse diff ↑

demo/lgf_demo.cc

Show inline comments

@@ -46,3 +46,3 @@
 		  try {
-		    digraphReader("digraph.lgf", g). // read the directed graph into g
+		    digraphReader(g, "digraph.lgf"). // read the directed graph into g
 		      arcMap("capacity", cap).       // read the 'capacity' arc map into cap
@@ -62,3 +62,3 @@
-		  digraphWriter(std::cout, g).     // write g to the standard output
+		  digraphWriter(g).                // write g to the standard output
 		    arcMap("capacity", cap).       // write cap into 'capacity'

lemon/lgf_reader.h

Show inline comments

@@ -392,9 +392,10 @@
 		  template <typename Digraph>
-		  DigraphReader<Digraph> digraphReader(std::istream& is, Digraph& digraph);
+		  DigraphReader<Digraph> digraphReader(Digraph& digraph,
 		                                       std::istream& is = std::cin);
 		  template <typename Digraph>
-		  DigraphReader<Digraph> digraphReader(const std::string& fn, Digraph& digraph);
+		  DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn);
 		  template <typename Digraph>
-		  DigraphReader<Digraph> digraphReader(const char *fn, Digraph& digraph);
+		  DigraphReader<Digraph> digraphReader(Digraph& digraph, const char *fn);
@@ -421,3 +422,3 @@
 		  ///\code
-		  /// DigraphReader<Digraph>(std::cin, digraph).
+		  /// DigraphReader<Digraph>(digraph, std::cin).
 		  ///   nodeMap("coordinates", coord_map).
@@ -501,3 +502,3 @@
 		    /// input stream.
-		    DigraphReader(std::istream& is, Digraph& digraph)
+		    DigraphReader(Digraph& digraph, std::istream& is = std::cin)
 		      : _is(&is), local_is(false), _digraph(digraph),
@@ -510,3 +511,3 @@
 		    /// file.
-		    DigraphReader(const std::string& fn, Digraph& digraph)
+		    DigraphReader(Digraph& digraph, const std::string& fn)
 		      : _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph),
@@ -519,3 +520,3 @@
 		    /// file.
-		    DigraphReader(const char* fn, Digraph& digraph)
+		    DigraphReader(Digraph& digraph, const char* fn)
 		      : _is(new std::ifstream(fn)), local_is(true), _digraph(digraph),
@@ -549,8 +550,8 @@
 		    friend DigraphReader<Digraph> digraphReader<>(std::istream& is,
 		                                                  Digraph& digraph);
 		    friend DigraphReader<Digraph> digraphReader<>(const std::string& fn,
 		                                                  Digraph& digraph);
 		    friend DigraphReader<Digraph> digraphReader<>(const char *fn,
 		                                                  Digraph& digraph);
 		    friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph,
 		                                                  std::istream& is);
 		    friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph,
 		                                                  const std::string& fn);
 		    friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph,
 		                                                  const char *fn);
@@ -1182,4 +1183,5 @@
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(std::istream& is, Digraph& digraph) {
 		    DigraphReader<Digraph> tmp(is, digraph);
 		  DigraphReader<Digraph> digraphReader(Digraph& digraph,
 		                                       std::istream& is = std::cin) {
 		    DigraphReader<Digraph> tmp(digraph, is);
 		    return tmp;
@@ -1192,5 +1194,5 @@
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(const std::string& fn,
 		                                       Digraph& digraph) {
-		    DigraphReader<Digraph> tmp(fn, digraph);
+		  DigraphReader<Digraph> digraphReader(Digraph& digraph,
 		                                       const std::string& fn) {
 		    DigraphReader<Digraph> tmp(digraph, fn);
 		    return tmp;
@@ -1203,4 +1205,4 @@
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(const char* fn, Digraph& digraph) {
 		    DigraphReader<Digraph> tmp(fn, digraph);
 		  DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) {
 		    DigraphReader<Digraph> tmp(digraph, fn);
 		    return tmp;
@@ -1212,9 +1214,10 @@
 		  template <typename Graph>
-		  GraphReader<Graph> graphReader(std::istream& is, Graph& graph);
+		  GraphReader<Graph> graphReader(Graph& graph,
 		                                 std::istream& is = std::cin);
 		  template <typename Graph>
-		  GraphReader<Graph> graphReader(const std::string& fn, Graph& graph);
+		  GraphReader<Graph> graphReader(Graph& graph, const std::string& fn);
 		  template <typename Graph>
-		  GraphReader<Graph> graphReader(const char *fn, Graph& graph);
+		  GraphReader<Graph> graphReader(Graph& graph, const char *fn);
@@ -1285,3 +1288,3 @@
 		    /// input stream.
-		    GraphReader(std::istream& is, Graph& graph)
+		    GraphReader(Graph& graph, std::istream& is = std::cin)
 		      : _is(&is), local_is(false), _graph(graph),
@@ -1294,3 +1297,3 @@
 		    /// file.
-		    GraphReader(const std::string& fn, Graph& graph)
+		    GraphReader(Graph& graph, const std::string& fn)
 		      : _is(new std::ifstream(fn.c_str())), local_is(true), _graph(graph),
@@ -1303,3 +1306,3 @@
 		    /// file.
-		    GraphReader(const char* fn, Graph& graph)
+		    GraphReader(Graph& graph, const char* fn)
 		      : _is(new std::ifstream(fn)), local_is(true), _graph(graph),
@@ -1332,6 +1335,6 @@
 		  private:
 		    friend GraphReader<Graph> graphReader<>(std::istream& is, Graph& graph);
 		    friend GraphReader<Graph> graphReader<>(const std::string& fn,
 		                                            Graph& graph);
 		    friend GraphReader<Graph> graphReader<>(const char *fn, Graph& graph);
 		    friend GraphReader<Graph> graphReader<>(Graph& graph, std::istream& is);
 		    friend GraphReader<Graph> graphReader<>(Graph& graph,
 		                                            const std::string& fn);
 		    friend GraphReader<Graph> graphReader<>(Graph& graph, const char *fn);
@@ -2008,4 +2011,4 @@
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(std::istream& is, Graph& graph) {
 		    GraphReader<Graph> tmp(is, graph);
 		  GraphReader<Graph> graphReader(Graph& graph, std::istream& is = std::cin) {
 		    GraphReader<Graph> tmp(graph, is);
 		    return tmp;
@@ -2018,5 +2021,4 @@
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(const std::string& fn,
 		                                       Graph& graph) {
-		    GraphReader<Graph> tmp(fn, graph);
+		  GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) {
 		    GraphReader<Graph> tmp(graph, fn);
 		    return tmp;
@@ -2029,4 +2031,4 @@
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(const char* fn, Graph& graph) {
 		    GraphReader<Graph> tmp(fn, graph);
 		  GraphReader<Graph> graphReader(Graph& graph, const char* fn) {
 		    GraphReader<Graph> tmp(graph, fn);
 		    return tmp;

lemon/lgf_writer.h

Show inline comments

@@ -354,12 +354,12 @@
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(std::ostream& os,
 		                                       const Digraph& digraph);
 		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       std::ostream& os = std::cout);
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const std::string& fn,
 		                                       const Digraph& digraph);
 		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       const std::string& fn);
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const char *fn,
 		                                       const Digraph& digraph);
 		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       const char *fn);
@@ -384,3 +384,3 @@
 		  ///\code
-		  /// DigraphWriter<Digraph>(std::cout, digraph).
+		  /// DigraphWriter<Digraph>(digraph, std::cout).
 		  ///   nodeMap("coordinates", coord_map).
@@ -454,4 +454,4 @@
 		    /// output stream.
 		    DigraphWriter(std::ostream& is, const Digraph& digraph)
 		      : _os(&is), local_os(false), _digraph(digraph),
 		    DigraphWriter(const Digraph& digraph, std::ostream& os = std::cout)
 		      : _os(&os), local_os(false), _digraph(digraph),
 		        _skip_nodes(false), _skip_arcs(false) {}
@@ -462,3 +462,3 @@
 		    /// output file.
-		    DigraphWriter(const std::string& fn, const Digraph& digraph)
+		    DigraphWriter(const Digraph& digraph, const std::string& fn)
 		      : _os(new std::ofstream(fn.c_str())), local_os(true), _digraph(digraph),
@@ -470,3 +470,3 @@
 		    /// output file.
-		    DigraphWriter(const char* fn, const Digraph& digraph)
+		    DigraphWriter(const Digraph& digraph, const char* fn)
 		      : _os(new std::ofstream(fn)), local_os(true), _digraph(digraph),
@@ -498,8 +498,8 @@
 		    friend DigraphWriter<Digraph> digraphWriter<>(std::ostream& os,
 		                                                  const Digraph& digraph);
 		    friend DigraphWriter<Digraph> digraphWriter<>(const std::string& fn,
 		                                                  const Digraph& digraph);
 		    friend DigraphWriter<Digraph> digraphWriter<>(const char *fn,
 		                                                  const Digraph& digraph);
 		    friend DigraphWriter<Digraph> digraphWriter<>(const Digraph& digraph,
 		                                                  std::ostream& os);
 		    friend DigraphWriter<Digraph> digraphWriter<>(const Digraph& digraph,
 		                                                  const std::string& fn);
 		    friend DigraphWriter<Digraph> digraphWriter<>(const Digraph& digraph,
 		                                                  const char *fn);
@@ -910,5 +910,5 @@
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(std::ostream& os,
 		                                       const Digraph& digraph) {
-		    DigraphWriter<Digraph> tmp(os, digraph);
+		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       std::ostream& os = std::cout) {
 		    DigraphWriter<Digraph> tmp(digraph, os);
 		    return tmp;
@@ -921,5 +921,5 @@
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const std::string& fn,
 		                                       const Digraph& digraph) {
-		    DigraphWriter<Digraph> tmp(fn, digraph);
+		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       const std::string& fn) {
 		    DigraphWriter<Digraph> tmp(digraph, fn);
 		    return tmp;
@@ -932,5 +932,5 @@
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const char* fn,
 		                                       const Digraph& digraph) {
-		    DigraphWriter<Digraph> tmp(fn, digraph);
+		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       const char* fn) {
 		    DigraphWriter<Digraph> tmp(digraph, fn);
 		    return tmp;
@@ -942,9 +942,10 @@
 		  template <typename Graph>
-		  GraphWriter<Graph> graphWriter(std::ostream& os, const Graph& graph);
+		  GraphWriter<Graph> graphWriter(const Graph& graph,
 		                                 std::ostream& os = std::cout);
 		  template <typename Graph>
-		  GraphWriter<Graph> graphWriter(const std::string& fn, const Graph& graph);
+		  GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn);
 		  template <typename Graph>
-		  GraphWriter<Graph> graphWriter(const char *fn, const Graph& graph);
+		  GraphWriter<Graph> graphWriter(const Graph& graph, const char *fn);
@@ -1010,4 +1011,4 @@
 		    /// output stream.
 		    GraphWriter(std::ostream& is, const Graph& graph)
 		      : _os(&is), local_os(false), _graph(graph),
 		    GraphWriter(const Graph& graph, std::ostream& os = std::cout)
 		      : _os(&os), local_os(false), _graph(graph),
 		        _skip_nodes(false), _skip_edges(false) {}
@@ -1018,3 +1019,3 @@
 		    /// output file.
-		    GraphWriter(const std::string& fn, const Graph& graph)
+		    GraphWriter(const Graph& graph, const std::string& fn)
 		      : _os(new std::ofstream(fn.c_str())), local_os(true), _graph(graph),
@@ -1026,3 +1027,3 @@
 		    /// output file.
-		    GraphWriter(const char* fn, const Graph& graph)
+		    GraphWriter(const Graph& graph, const char* fn)
 		      : _os(new std::ofstream(fn)), local_os(true), _graph(graph),
@@ -1054,8 +1055,8 @@
 		    friend GraphWriter<Graph> graphWriter<>(std::ostream& os,
 		                                            const Graph& graph);
 		    friend GraphWriter<Graph> graphWriter<>(const std::string& fn,
 		                                            const Graph& graph);
 		    friend GraphWriter<Graph> graphWriter<>(const char *fn,
 		                                            const Graph& graph);
 		    friend GraphWriter<Graph> graphWriter<>(const Graph& graph,
 		                                            std::ostream& os);
 		    friend GraphWriter<Graph> graphWriter<>(const Graph& graph,
 		                                            const std::string& fn);
 		    friend GraphWriter<Graph> graphWriter<>(const Graph& graph,
 		                                            const char *fn);
@@ -1512,4 +1513,5 @@
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(std::ostream& os, const Graph& graph) {
 		    GraphWriter<Graph> tmp(os, graph);
 		  GraphWriter<Graph> graphWriter(const Graph& graph,
 		                                 std::ostream& os = std::cout) {
 		    GraphWriter<Graph> tmp(graph, os);
 		    return tmp;
@@ -1522,4 +1524,4 @@
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(const std::string& fn, const Graph& graph) {
 		    GraphWriter<Graph> tmp(fn, graph);
 		  GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn) {
 		    GraphWriter<Graph> tmp(graph, fn);
 		    return tmp;
@@ -1532,4 +1534,4 @@
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(const char* fn, const Graph& graph) {
 		    GraphWriter<Graph> tmp(fn, graph);
 		  GraphWriter<Graph> graphWriter(const Graph& graph, const char* fn) {
 		    GraphWriter<Graph> tmp(graph, fn);
 		    return tmp;

test/bfs_test.cc

Show inline comments

@@ -146,3 +146,3 @@
 		  std::istringstream input(test_lgf);
-		  digraphReader(input, G).
+		  digraphReader(G, input).
 		    node("source", s).

test/dfs_test.cc

Show inline comments

@@ -148,3 +148,3 @@
 		  std::istringstream input(test_lgf);
-		  digraphReader(input, G).
+		  digraphReader(G, input).
 		    node("source", s).

test/dijkstra_test.cc

Show inline comments

@@ -144,3 +144,3 @@
 		  std::istringstream input(test_lgf);
-		  digraphReader(input, G).
+		  digraphReader(G, input).
 		    arcMap("length", length).

test/heap_test.cc

Show inline comments

@@ -169,3 +169,3 @@
 		  std::istringstream input(test_lgf);
-		  digraphReader(input, digraph).
+		  digraphReader(digraph, input).
 		    arcMap("capacity", length).

0 comments (0 inline)

RhodeCode

Login to your account