LEMON/LEMON-official Changeset - r163:c82fd9568d75

Repositories » LEMON » LEMON-official

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

Changeset - r163:c82fd9568d75

« 162:33247f

164:00d297 »

r163:c82fd9568d75

Sat, 31 May 2008 12:31:21

[Not Reviewed]

0 comments (0 inline)

deba@inf.elte.hu
deba@inf.elte.hu

Bug fixes and improvements in LGF IO

0 2 0

default

2 files changed with 33 insertions and 23 deletions:

lemon/lgf_reader.h

lemon/lgf_writer.h

↑ Collapse diff ↑

lemon/lgf_reader.h

Show inline comments

@@ -462,17 +462,17 @@
 		    /// \brief Copy constructor
 		    ///
 		    /// The copy constructor transfers all data from the other reader,
 		    /// therefore the copied reader will not be usable more.
 		    DigraphReader(DigraphReader& other)
 		      : _is(other._is), local_is(other.local_is), _digraph(other._digraph),
 			_use_nodes(other._use_nodes), _use_arcs(other._use_arcs) {
-		      other.is = 0;
+		      other._is = 0;
 		      other.local_is = false;
 		      _node_index.swap(other._node_index);
 		      _arc_index.swap(other._arc_index);
 		      _node_maps.swap(other._node_maps);
 		      _arc_maps.swap(other._arc_maps);
 		      _attributes.swap(other._attributes);
@@ -1073,18 +1073,20 @@
 		    /// \name Execution of the reader
 		    /// @{
 		    /// \brief Start the batch processing
 		    ///
 		    /// This function starts the batch processing
 		    void run() {
 		      LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
 		      if (!*_is) {
 			throw DataFormatError("Cannot find file");
+		      }
 		      bool nodes_done = false;
 		      bool arcs_done = false;
 		      bool attributes_done = false;
 		      std::set<std::string> extra_sections;
 		      line_num = 0;
 		      readLine();
@@ -1155,26 +1157,29 @@
 		    /// @}
 		  };
 		  /// \relates DigraphReader
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(std::istream& is, Digraph& digraph) {
-		    return DigraphReader<Digraph>(is, digraph);
+		    DigraphReader<Digraph> tmp(is, digraph);
 		    return tmp;
+		  }
 		  /// \relates DigraphReader
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(const std::string& fn,
 						       Digraph& digraph) {
-		    return DigraphReader<Digraph>(fn, digraph);
+		    DigraphReader<Digraph> tmp(fn, digraph);
 		    return tmp;
+		  }
 		  /// \relates DigraphReader
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(const char* fn, Digraph& digraph) {
-		    return DigraphReader<Digraph>(fn, digraph);
+		    DigraphReader<Digraph> tmp(fn, digraph);
 		    return tmp;
+		  }
+		}
 		#endif

lemon/lgf_writer.h

Show inline comments

@@ -190,17 +190,19 @@
 		      case '\t':
 			os << "\\t";
 			return;
 		      case '\v':
 			os << "\\v";
 			return;
 		      default:
 			if (c < 0x20) {
 			  std::ios::fmtflags flags = os.flags();
 			  os << '\\' << std::oct << static_cast<int>(c);
 			  os.flags(flags);
 			} else {
 			  os << c;
+			}
 			return;
+		      }
+		    }
 		    bool requireEscape(const std::string& str) {
@@ -238,22 +240,22 @@
 		  ///
 		  /// This utility writes an \ref lgf-format "LGF" file.
 		  ///
 		  /// The writing method does a batch processing. The user creates a
 		  /// writer object, then various writing rules can be added to the
 		  /// writer, and eventually the writing is executed with the \c run()
 		  /// member function. A map writing rule can be added to the writer
 		  /// with the \c nodeMap() or \c arcMap() members. An optional
 		  /// converter parameter can also be added as a standard functor converting from
 		  /// the value type of the map to std::string. If it is set, it will
 		  /// determine how the map's value type is written to the output
 		  /// stream. If the functor is not set, then a default conversion
 		  /// will be used. The \c attribute(), \c node() and \c arc() functions
 		  /// are used to add attribute writing rules.
 		  /// converter parameter can also be added as a standard functor
 		  /// converting from the value type of the map to std::string. If it
 		  /// is set, it will determine how the map's value type is written to
 		  /// the output stream. If the functor is not set, then a default
 		  /// conversion will be used. The \c attribute(), \c node() and \c
 		  /// arc() functions are used to add attribute writing rules.
 		  ///
 		  ///\code
 		  ///     DigraphWriter<Digraph>(std::cout, digraph).
 		  ///       nodeMap("coordinates", coord_map).
 		  ///       nodeMap("size", size).
 		  ///       nodeMap("title", title).
 		  ///       arcMap("capacity", cap_map).
 		  ///       node("source", src).
@@ -264,23 +266,23 @@
 		  ///
 		  ///
 		  /// By default, the writer does not write additional captions to the
 		  /// sections, but they can be give as an optional parameter of
 		  /// the \c nodes(), \c arcs() or \c
 		  /// attributes() functions.
 		  ///
 		  /// The \c skipNodes() and \c skipArcs() functions forbid the
 		  /// writing of the sections. If two arc sections should be written to the
 		  /// output, it can be done in two passes, the first pass writes the
 		  /// node section and the first arc section, then the second pass
 		  /// skips the node section and writes just the arc section to the
 		  /// stream. The output stream can be retrieved with the \c ostream()
 		  /// function, hence the second pass can append its output to the output of the
-		  /// first pass.
+		  /// writing of the sections. If two arc sections should be written
 		  /// to the output, it can be done in two passes, the first pass
 		  /// writes the node section and the first arc section, then the
 		  /// second pass skips the node section and writes just the arc
 		  /// section to the stream. The output stream can be retrieved with
 		  /// the \c ostream() function, hence the second pass can append its
 		  /// output to the output of the first pass.
 		  template <typename _Digraph>
 		  class DigraphWriter {
 		  public:
 		    typedef _Digraph Digraph;
 		    TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
 		  private:
@@ -344,17 +346,17 @@
 		    /// \brief Copy constructor
 		    ///
 		    /// The copy constructor transfers all data from the other writer,
 		    /// therefore the copied writer will not be usable more.
 		    DigraphWriter(DigraphWriter& other)
 		      : _os(other._os), local_os(other.local_os), _digraph(other._digraph),
 			_skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
-		      other.is = 0;
+		      other._os = 0;
 		      other.local_os = false;
 		      _node_index.swap(other._node_index);
 		      _arc_index.swap(other._arc_index);
 		      _node_maps.swap(other._node_maps);
 		      _arc_maps.swap(other._arc_maps);
 		      _attributes.swap(other._attributes);
@@ -712,27 +714,30 @@
 		      return *_os;
+		    }
 		    /// @}
 		  };
 		  /// \relates DigraphWriter
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(std::istream& is, Digraph& digraph) {
 		    return DigraphWriter<Digraph>(is, digraph);
 		  DigraphWriter<Digraph> digraphWriter(std::ostream& os, Digraph& digraph) {
 		    DigraphWriter<Digraph> tmp(os, digraph);
 		    return tmp;
+		  }
 		  /// \relates DigraphWriter
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const std::string& fn,
 						       Digraph& digraph) {
-		    return DigraphWriter<Digraph>(fn, digraph);
+		    DigraphWriter<Digraph> tmp(fn, digraph);
 		    return tmp;
+		  }
 		  /// \relates DigraphWriter
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const char* fn, Digraph& digraph) {
-		    return DigraphWriter<Digraph>(fn, digraph);
+		    DigraphWriter<Digraph> tmp(fn, digraph);
 		    return tmp;
+		  }
+		}
 		#endif

0 comments (0 inline)

RhodeCode

Login to your account