lemon-0.x: comparison lemon/lemon

equal deleted inserted replaced

-:cba0d41a1e54
+:ee9bb6fc00c0
 * express or implied, and with no claim as to its suitability for any
 * purpose.
 *
 */
-///\ingroup io_group
+///\ingroup lemon_io
 ///\file
 ///\brief Lemon Format writer.
 #ifndef LEMON_LEMON_WRITER_H
 #define LEMON_LEMON_WRITER_H
 }
 };
 }
-/// \ingroup io_group
+/// \ingroup lemon_io
 /// \brief Lemon Format writer class.
 ///
 /// The Lemon Format contains several sections. We do not want to
 /// determine what sections are in a lemon file we give only a framework
 /// to write a section oriented format.
 /// \brief The header of section.
 ///
 /// It gives back the header of the section.
 virtual std::string header() = 0;
-/// \brief  Writer function of the section.
+/// \brief Writer function of the section.
 ///
 /// Write the content of the section.
 virtual void write(std::ostream& os) = 0;
+/// \brief Gives back true when the section should be written.
+///
+/// Gives back true when the section should be written.
+virtual bool valid() { return true; }
 };
 /// \brief Constructor for LemonWriter.
 ///
 /// Constructor for LemonWriter which writes to the given stream.
 ///
 /// It executes the LemonWriter.
 void run() {
 SectionWriters::iterator it;
 for (it = writers.begin(); it != writers.end(); ++it) {
-	*os << (*it)->header() << std::endl;
+if ((*it)->valid()) {
-	(*it)->write(*os);
+*os << (*it)->header() << std::endl;
+(*it)->write(*os);
+}
 }
 *os << "@end" << std::endl;
 }
 /// \brief  Writer function of the section.
 ///
 /// Write the content of the section.
 virtual void write(std::ostream& os) {
 for (int i = 0; i < (int)writers.size(); ++i) {
-	if (writers[i].first == "label" || (writers[i].first == "id" && labelMap == 0)) {
+	if (writers[i].first == "label") {
 	  labelMap = writers[i].second;
 	  forceLabelMap = false;
 	  break;
 	}
 }
 virtual void write(std::ostream& os) {
 if (!nodeLabelWriter->isLabelWriter()) {
 	throw DataFormatError("Cannot find nodeset or label map");
 }
 for (int i = 0; i < (int)writers.size(); ++i) {
-	if (writers[i].first == "label" || (writers[i].first == "id" && labelMap == 0)) {
+	if (writers[i].first == "label") {
 	  labelMap = writers[i].second;
 	  forceLabelMap = false;
 	  break;
 	}
 }
 	os << writers[i].first << ' ';
 	labelWriter->write(os, *(writers[i].second));
 	os << std::endl;
 }
 }
+/// \brief Gives back true when the section should be written.
+///
+/// Gives back true when the section should be written.
+virtual bool valid() { return !writers.empty(); }
 private:
 std::string name;
 	os << writers[i].first << ' ';
 	labelWriter->write(os, *(writers[i].second));
 	os << std::endl;
 }
 }
+/// \brief Gives back true when the section should be written.
+///
+/// Gives back true when the section should be written.
+virtual bool valid() { return !writers.empty(); }
 private:
 std::string name;
 	os << edgeWriters[i].first << ' ';
 	edgeLabelWriter->write(os, *(edgeWriters[i].second));
 	os << std::endl;
 }
 }
+/// \brief Gives back true when the section should be written.
+///
+/// Gives back true when the section should be written.
+virtual bool valid() {
+return !uEdgeWriters.empty() || !edgeWriters.empty();
+}
 private:
 std::string name;
 	it->second->write(os);
 	os << std::endl;
 }
 }
+/// \brief Gives back true when the section should be written.
+///
+/// Gives back true when the section should be written.
+virtual bool valid() { return !writers.empty(); }
 private:
 std::string name;
 typedef std::vector<std::pair<std::string,
 				  _writer_bits::ValueWriterBase*> > Writers;

changeset 2099	eb126f29038c
parent 2016	ecb067198349
child 2101	439b7f21ccc4