[Lemon-commits] [Lemon-1.0 commits] Alpar Juttner: Merge
Lemon HG
hg at lemon.cs.elte.hu
Thu Oct 9 16:44:40 CEST 2008
details: http://lemon.cs.elte.hu/hg/lemon-1.0/rev/1e81878b0e54
changeset: 308:1e81878b0e54
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Wed Oct 08 13:18:33 2008 +0100
description:
Merge
diffstat:
2 files changed, 92 insertions(+), 134 deletions(-)
lemon/lgf_reader.h | 112 ++++++++++++++++++++-------------------------------
lemon/lgf_writer.h | 114 ++++++++++++++++++++--------------------------------
diffs (truncated from 310 to 300 lines):
diff -r 1871777f62b7 -r 1e81878b0e54 lemon/lgf_reader.h
--- a/lemon/lgf_reader.h Wed Oct 08 13:16:04 2008 +0100
+++ b/lemon/lgf_reader.h Wed Oct 08 13:18:33 2008 +0100
@@ -391,15 +391,37 @@
template <typename Digraph>
class DigraphReader;
+ /// \brief Return a \ref DigraphReader class
+ ///
+ /// This function just returns a \ref DigraphReader class.
+ /// \relates DigraphReader
template <typename Digraph>
DigraphReader<Digraph> digraphReader(Digraph& digraph,
- std::istream& is = std::cin);
+ std::istream& is = std::cin) {
+ DigraphReader<Digraph> tmp(digraph, is);
+ return tmp;
+ }
+ /// \brief Return a \ref DigraphReader class
+ ///
+ /// This function just returns a \ref DigraphReader class.
+ /// \relates DigraphReader
template <typename Digraph>
- DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn);
+ DigraphReader<Digraph> digraphReader(Digraph& digraph,
+ const std::string& fn) {
+ DigraphReader<Digraph> tmp(digraph, fn);
+ return tmp;
+ }
+ /// \brief Return a \ref DigraphReader class
+ ///
+ /// This function just returns a \ref DigraphReader class.
+ /// \relates DigraphReader
template <typename Digraph>
- DigraphReader<Digraph> digraphReader(Digraph& digraph, const char *fn);
+ DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) {
+ DigraphReader<Digraph> tmp(digraph, fn);
+ return tmp;
+ }
/// \ingroup lemon_io
///
@@ -1189,50 +1211,38 @@
};
- /// \brief Return a \ref DigraphReader class
+ template <typename Graph>
+ class GraphReader;
+
+ /// \brief Return a \ref GraphReader class
///
- /// This function just returns a \ref DigraphReader class.
- /// \relates DigraphReader
- template <typename Digraph>
- DigraphReader<Digraph> digraphReader(Digraph& digraph,
- std::istream& is = std::cin) {
- DigraphReader<Digraph> tmp(digraph, is);
+ /// This function just returns a \ref GraphReader class.
+ /// \relates GraphReader
+ template <typename Graph>
+ GraphReader<Graph> graphReader(Graph& graph, std::istream& is = std::cin) {
+ GraphReader<Graph> tmp(graph, is);
return tmp;
}
- /// \brief Return a \ref DigraphReader class
+ /// \brief Return a \ref GraphReader class
///
- /// This function just returns a \ref DigraphReader class.
- /// \relates DigraphReader
- template <typename Digraph>
- DigraphReader<Digraph> digraphReader(Digraph& digraph,
- const std::string& fn) {
- DigraphReader<Digraph> tmp(digraph, fn);
+ /// This function just returns a \ref GraphReader class.
+ /// \relates GraphReader
+ template <typename Graph>
+ GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) {
+ GraphReader<Graph> tmp(graph, fn);
return tmp;
}
- /// \brief Return a \ref DigraphReader class
+ /// \brief Return a \ref GraphReader class
///
- /// This function just returns a \ref DigraphReader class.
- /// \relates DigraphReader
- template <typename Digraph>
- DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) {
- DigraphReader<Digraph> tmp(digraph, fn);
+ /// This function just returns a \ref GraphReader class.
+ /// \relates GraphReader
+ template <typename Graph>
+ GraphReader<Graph> graphReader(Graph& graph, const char* fn) {
+ GraphReader<Graph> tmp(graph, fn);
return tmp;
}
-
- template <typename Graph>
- class GraphReader;
-
- template <typename Graph>
- GraphReader<Graph> graphReader(Graph& graph,
- std::istream& is = std::cin);
-
- template <typename Graph>
- GraphReader<Graph> graphReader(Graph& graph, const std::string& fn);
-
- template <typename Graph>
- GraphReader<Graph> graphReader(Graph& graph, const char *fn);
/// \ingroup lemon_io
///
@@ -2031,36 +2041,6 @@
};
- /// \brief Return a \ref GraphReader class
- ///
- /// This function just returns a \ref GraphReader class.
- /// \relates GraphReader
- template <typename Graph>
- GraphReader<Graph> graphReader(Graph& graph, std::istream& is = std::cin) {
- GraphReader<Graph> tmp(graph, is);
- return tmp;
- }
-
- /// \brief Return a \ref GraphReader class
- ///
- /// This function just returns a \ref GraphReader class.
- /// \relates GraphReader
- template <typename Graph>
- GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) {
- GraphReader<Graph> tmp(graph, fn);
- return tmp;
- }
-
- /// \brief Return a \ref GraphReader class
- ///
- /// This function just returns a \ref GraphReader class.
- /// \relates GraphReader
- template <typename Graph>
- GraphReader<Graph> graphReader(Graph& graph, const char* fn) {
- GraphReader<Graph> tmp(graph, fn);
- return tmp;
- }
-
class SectionReader;
SectionReader sectionReader(std::istream& is);
diff -r 1871777f62b7 -r 1e81878b0e54 lemon/lgf_writer.h
--- a/lemon/lgf_writer.h Wed Oct 08 13:16:04 2008 +0100
+++ b/lemon/lgf_writer.h Wed Oct 08 13:18:33 2008 +0100
@@ -351,17 +351,38 @@
template <typename Digraph>
class DigraphWriter;
+ /// \brief Return a \ref DigraphWriter class
+ ///
+ /// This function just returns a \ref DigraphWriter class.
+ /// \relates DigraphWriter
template <typename Digraph>
DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
- std::ostream& os = std::cout);
+ std::ostream& os = std::cout) {
+ DigraphWriter<Digraph> tmp(digraph, os);
+ return tmp;
+ }
+ /// \brief Return a \ref DigraphWriter class
+ ///
+ /// This function just returns a \ref DigraphWriter class.
+ /// \relates DigraphWriter
template <typename Digraph>
DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
- const std::string& fn);
+ const std::string& fn) {
+ DigraphWriter<Digraph> tmp(digraph, fn);
+ return tmp;
+ }
+ /// \brief Return a \ref DigraphWriter class
+ ///
+ /// This function just returns a \ref DigraphWriter class.
+ /// \relates DigraphWriter
template <typename Digraph>
DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
- const char *fn);
+ const char* fn) {
+ DigraphWriter<Digraph> tmp(digraph, fn);
+ return tmp;
+ }
/// \ingroup lemon_io
///
@@ -913,51 +934,39 @@
/// @}
};
- /// \brief Return a \ref DigraphWriter class
+ template <typename Graph>
+ class GraphWriter;
+
+ /// \brief Return a \ref GraphWriter class
///
- /// This function just returns a \ref DigraphWriter class.
- /// \relates DigraphWriter
- template <typename Digraph>
- DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
- std::ostream& os = std::cout) {
- DigraphWriter<Digraph> tmp(digraph, os);
+ /// This function just returns a \ref GraphWriter class.
+ /// \relates GraphWriter
+ template <typename Graph>
+ GraphWriter<Graph> graphWriter(const Graph& graph,
+ std::ostream& os = std::cout) {
+ GraphWriter<Graph> tmp(graph, os);
return tmp;
}
- /// \brief Return a \ref DigraphWriter class
+ /// \brief Return a \ref GraphWriter class
///
- /// This function just returns a \ref DigraphWriter class.
- /// \relates DigraphWriter
- template <typename Digraph>
- DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
- const std::string& fn) {
- DigraphWriter<Digraph> tmp(digraph, fn);
+ /// This function just returns a \ref GraphWriter class.
+ /// \relates GraphWriter
+ template <typename Graph>
+ GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn) {
+ GraphWriter<Graph> tmp(graph, fn);
return tmp;
}
- /// \brief Return a \ref DigraphWriter class
+ /// \brief Return a \ref GraphWriter class
///
- /// This function just returns a \ref DigraphWriter class.
- /// \relates DigraphWriter
- template <typename Digraph>
- DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
- const char* fn) {
- DigraphWriter<Digraph> tmp(digraph, fn);
+ /// This function just returns a \ref GraphWriter class.
+ /// \relates GraphWriter
+ template <typename Graph>
+ GraphWriter<Graph> graphWriter(const Graph& graph, const char* fn) {
+ GraphWriter<Graph> tmp(graph, fn);
return tmp;
}
-
- template <typename Graph>
- class GraphWriter;
-
- template <typename Graph>
- GraphWriter<Graph> graphWriter(const Graph& graph,
- std::ostream& os = std::cout);
-
- template <typename Graph>
- GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn);
-
- template <typename Graph>
- GraphWriter<Graph> graphWriter(const Graph& graph, const char *fn);
/// \ingroup lemon_io
///
@@ -1526,37 +1535,6 @@
/// @}
};
- /// \brief Return a \ref GraphWriter class
- ///
- /// This function just returns a \ref GraphWriter class.
- /// \relates GraphWriter
- template <typename Graph>
- GraphWriter<Graph> graphWriter(const Graph& graph,
- std::ostream& os = std::cout) {
- GraphWriter<Graph> tmp(graph, os);
- return tmp;
- }
-
- /// \brief Return a \ref GraphWriter class
- ///
- /// This function just returns a \ref GraphWriter class.
- /// \relates GraphWriter
- template <typename Graph>
- GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn) {
- GraphWriter<Graph> tmp(graph, fn);
- return tmp;
- }
-
- /// \brief Return a \ref GraphWriter class
- ///
- /// This function just returns a \ref GraphWriter class.
More information about the Lemon-commits
mailing list