lemon-0.x: comparison src/lemon/lemon

equal deleted inserted replaced

-:4c5e124f6dfd
+:eff9af67fc3f
 IdWriter(const BoxedIdWriter& _idWriter)
 	: idWriter(_idWriter) {}
 virtual void write(std::ostream& os, const Item& item) const {
-	return idWriter.writeId(os, item);
+	idWriter.writeId(os, item);
 }
 };
 };
 /// \ingroup io_group
 typedef CommonSectionWriterBase Parent;
 public:
 typedef _Graph Graph;
 typedef _Traits Traits;
-typedef typename Graph::Node Item;
+typedef typename Graph::Node Node;
 /// \brief Constructor.
 ///
 /// Constructor for NodeSetWriter. It creates the NodeSetWriter and
 /// attach it into the given LemonWriter. If the \c _forceIdMap
 /// Add a new node map writer command for the writer.
 template <typename Writer, typename Map>
 NodeSetWriter& writeNodeMap(std::string name, const Map& map,
 			    const Writer& writer = Writer()) {
 writers.push_back(
-	make_pair(name, new MapWriter<Item, Map, Writer>(map, writer)));
+	make_pair(name, new MapWriter<Node, Map, Writer>(map, writer)));
 return *this;
 }
 protected:
 ///
 /// It writes the id of the given node. If there was written an "id"
 /// named map then it will write the map value belongs to the node.
 /// Otherwise if the \c forceId parameter was true it will write
 /// its id in the graph.
-void writeId(std::ostream& os, const Item& item) const {
+void writeId(std::ostream& os, const Node& item) const {
 if (forceIdMap) {
 	os << graph.id(item);
 } else {
 	idMap->write(os, item);
 }
 }
 private:
-typedef std::vector<std::pair<std::string, WriterBase<Item>*> > MapWriters;
+typedef std::vector<std::pair<std::string, WriterBase<Node>*> > MapWriters;
 MapWriters writers;
-WriterBase<Item>* idMap;
+WriterBase<Node>* idMap;
 bool forceIdMap;
 typename SmartConstReference<Graph>::Type graph;
 std::string id;
 typedef CommonSectionWriterBase Parent;
 public:
 typedef _Graph Graph;
 typedef _Traits Traits;
-typedef typename Graph::Edge Item;
+typedef typename Graph::Node Node;
+typedef typename Graph::Edge Edge;
 /// \brief Constructor.
 ///
 /// Constructor for EdgeSetWriter. It creates the EdgeSetWriter and
 /// attach it into the given LemonWriter. It will write node ids by
 		  const NodeIdWriter& _nodeIdWriter,
 		  const std::string& _id = std::string(),
 		  bool _forceIdMap = true)
 : Parent(_writer), idMap(0), forceIdMap(_forceIdMap),
 	graph(_graph), id(_id),
-	nodeIdWriter(new IdWriter<typename Graph::Node, NodeIdWriter>
+	nodeIdWriter(new IdWriter<Node, NodeIdWriter>(_nodeIdWriter)) {}
-		     (_nodeIdWriter)) {}
 /// \brief Destructor.
 ///
 /// Destructor for EdgeSetWriter.
 virtual ~EdgeSetWriter() {
 /// Add a new edge map writer command for the writer.
 template <typename Writer, typename Map>
 EdgeSetWriter& writeEdgeMap(std::string name, const Map& map,
 			    const Writer& writer = Writer()) {
 writers.push_back(
-	make_pair(name, new MapWriter<Item, Map, Writer>(map, writer)));
+	make_pair(name, new MapWriter<Edge, Map, Writer>(map, writer)));
 return *this;
 }
 protected:
 ///
 /// It writes the id of the given edge. If there was written an "id"
 /// named map then it will write the map value belongs to the edge.
 /// Otherwise if the \c forceId parameter was true it will write
 /// its id in the graph.
-void writeId(std::ostream& os, const Item& item) const {
+void writeId(std::ostream& os, const Edge& item) const {
 if (forceIdMap) {
 	os << graph.id(item);
 } else {
 	idMap->write(os, item);
 }
 }
 private:
-typedef std::vector<std::pair<std::string, WriterBase<Item>*> > MapWriters;
+typedef std::vector<std::pair<std::string, WriterBase<Edge>*> > MapWriters;
 MapWriters writers;
-WriterBase<Item>* idMap;
+WriterBase<Edge>* idMap;
 bool forceIdMap;
 typename SmartConstReference<Graph>::Type graph;
 std::string id;
-std::auto_ptr<IdWriterBase<typename Graph::Node> > nodeIdWriter;
+std::auto_ptr<IdWriterBase<Node> > nodeIdWriter;
 };
 /// \ingroup io_group
 /// \brief SectionWriter for writing a undirected edgeset.
 ///
 typedef CommonSectionWriterBase Parent;
 public:
 typedef _Graph Graph;
 typedef _Traits Traits;
-typedef typename Graph::UndirEdge Item;
+typedef typename Graph::Node Node;
+typedef typename Graph::Edge Edge;
+typedef typename Graph::UndirEdge UndirEdge;
 /// \brief Constructor.
 ///
 /// Constructor for UndirEdgeSetWriter. It creates the UndirEdgeSetWriter
 /// and attach it into the given LemonWriter. It will write node ids by
 		       const NodeIdWriter& _nodeIdWriter,
 		       const std::string& _id = std::string(),
 		       bool _forceIdMap = true)
 : Parent(_writer), idMap(0), forceIdMap(_forceIdMap),
 	graph(_graph), id(_id),
-	nodeIdWriter(new IdWriter<typename Graph::Node, NodeIdWriter>
+	nodeIdWriter(new IdWriter<Node, NodeIdWriter>(_nodeIdWriter)) {}
-		     (_nodeIdWriter)) {}
 /// \brief Destructor.
 ///
 /// Destructor for UndirEdgeSetWriter.
 virtual ~UndirEdgeSetWriter() {
 /// Add a new undirected map writer command for the writer.
 template <typename Writer, typename Map>
 UndirEdgeSetWriter& writeUndirEdgeMap(std::string name, const Map& map,
 					  const Writer& writer = Writer()) {
 writers.push_back(
-	make_pair(name, new MapWriter<Item, Map, Writer>(map, writer)));
+	make_pair(name, new MapWriter<UndirEdge, Map, Writer>(map, writer)));
 return *this;
 }
 /// \brief Add a new directed edge map writer command for the writer.
 ///
 ///
 /// It writes the id of the given undirected edge. If there was written
 /// an "id" named map then it will write the map value belongs to the
 /// undirected edge. Otherwise if the \c forceId parameter was true it
 /// will write its id in the graph.
-void writeId(std::ostream& os, const Item& item) const {
+void writeId(std::ostream& os, const UndirEdge& item) const {
 if (forceIdMap) {
 	os << graph.id(item);
 } else {
 	idMap->write(os, item);
 }
 }
-private:
+/// \brief Write the id of the given edge.
+///
-typedef std::vector<std::pair<std::string, WriterBase<Item>*> > MapWriters;
+/// It writes the id of the given edge. If there was written
+/// an "id" named map then it will write the map value belongs to the
+/// edge. Otherwise if the \c forceId parameter was true it
+/// will write its id in the graph. If the edge is forward map
+/// then its prefix character is \c '+' elsewhere \c '-'.
+void writeId(std::ostream& os, const Edge& item) const {
+if (graph.forward(item)) {
+	os << "+ ";
+} else {
+	os << "- ";
+}
+if (forceIdMap) {
+	os << graph.id(item);
+} else {
+	idMap->write(os, item);
+}
+}
+private:
+typedef std::vector<std::pair<std::string,
+				  WriterBase<UndirEdge>*> > MapWriters;
 MapWriters writers;
-WriterBase<Item>* idMap;
+WriterBase<UndirEdge>* idMap;
 bool forceIdMap;
 typename SmartConstReference<Graph>::Type graph;
 std::string id;
-std::auto_ptr<IdWriterBase<typename Graph::Node> > nodeIdWriter;
+std::auto_ptr<IdWriterBase<Node> > nodeIdWriter;
 };
 /// \ingroup io_group
 /// \brief SectionWriter for writing labeled nodes.
 ///
 /// \relates LemonWriter
 template <typename _Graph>
 class NodeWriter : public CommonSectionWriterBase {
 typedef CommonSectionWriterBase Parent;
 typedef _Graph Graph;
-typedef typename Graph::Node Item;
+typedef typename Graph::Node Node;
 public:
 /// \brief Constructor.
 ///
 /// Constructor for NodeWriter. It creates the NodeWriter and
 public:
 /// \brief Add a node writer command for the NodeWriter.
 ///
 /// Add a node writer command for the NodeWriter.
-void writeNode(const std::string& name, const Item& item) {
+void writeNode(const std::string& name, const Node& item) {
 writers.push_back(make_pair(name, &item));
 }
 protected:
 private:
 std::string id;
-typedef std::vector<std::pair<std::string, const Item*> > ItemWriters;
+typedef std::vector<std::pair<std::string, const Node*> > NodeWriters;
-ItemWriters writers;
+NodeWriters writers;
-std::auto_ptr<IdWriterBase<Item> > idWriter;
+std::auto_ptr<IdWriterBase<Node> > idWriter;
 };
 /// \ingroup io_group
 /// \brief SectionWriter for writing labeled edges.
 ///
 /// \relates LemonWriter
 template <typename _Graph>
 class EdgeWriter : public CommonSectionWriterBase {
 typedef CommonSectionWriterBase Parent;
 typedef _Graph Graph;
-typedef typename Graph::Edge Item;
+typedef typename Graph::Edge Edge;
 public:
 /// \brief Constructor.
 ///
 /// Constructor for EdgeWriter. It creates the EdgeWriter and
 public:
 /// \brief Add an edge writer command for the EdgeWriter.
 ///
 /// Add an edge writer command for the EdgeWriter.
-void writeEdge(const std::string& name, const Item& item) {
+void writeEdge(const std::string& name, const Edge& item) {
 writers.push_back(make_pair(name, &item));
 }
 protected:
 private:
 std::string id;
-typedef std::vector<std::pair<std::string, const Item*> > ItemWriters;
+typedef std::vector<std::pair<std::string, const Edge*> > EdgeWriters;
-ItemWriters writers;
+EdgeWriters writers;
-std::auto_ptr<IdWriterBase<Item> > idWriter;
+std::auto_ptr<IdWriterBase<Edge> > idWriter;
 };
 /// \ingroup io_group
 /// \brief SectionWriter for writing labeled undirected edges.
 ///
 /// \relates LemonWriter
 template <typename _Graph>
 class UndirEdgeWriter : public CommonSectionWriterBase {
 typedef CommonSectionWriterBase Parent;
 typedef _Graph Graph;
-typedef typename Graph::UndirEdge Item;
+typedef typename Graph::Node Node;
+typedef typename Graph::Edge Edge;
+typedef typename Graph::UndirEdge UndirEdge;
 public:
 /// \brief Constructor.
 ///
 /// Constructor for UndirEdgeWriter. It creates the UndirEdgeWriter and
 /// edgeset writer.
 template <typename _IdWriter>
 UndirEdgeWriter(LemonWriter& _writer, const _IdWriter& _idWriter,
 	       const std::string& _id = std::string())
 : Parent(_writer), id(_id),
-	idWriter(new IdWriter<typename Graph::UndirEdge, _IdWriter>
+	undirEdgeIdWriter(new IdWriter<UndirEdge, _IdWriter>(_idWriter)),
-		 (_idWriter)) {}
+	edgeIdWriter(new IdWriter<Edge, _IdWriter>(_idWriter)) {}
 /// \brief Destructor.
 ///
 /// Destructor for UndirEdgeWriter.
 virtual ~UndirEdgeWriter() {}
 UndirEdgeWriter(const UndirEdgeWriter&);
 void operator=(const UndirEdgeWriter&);
 public:
+/// \brief Add an edge writer command for the UndirEdgeWriter.
+///
+/// Add an edge writer command for the UndirEdgeWriter.
+void writeEdge(const std::string& name, const Edge& item) {
+edgeWriters.push_back(make_pair(name, &item));
+}
 /// \brief Add an undirected edge writer command for the UndirEdgeWriter.
 ///
-/// Add an edge writer command for the UndirEdgeWriter.
+/// Add an undirected edge writer command for the UndirEdgeWriter.
-void writeUndirEdge(const std::string& name, const Item& item) {
+void writeUndirEdge(const std::string& name, const UndirEdge& item) {
-writers.push_back(make_pair(name, &item));
+undirEdgeWriters.push_back(make_pair(name, &item));
 }
 protected:
 /// \brief Header checking function.
 ///
 /// It gives back true when the header line start with \c \@undiredges,
 /// and the header line's id and the writer's id are the same.
 virtual std::string header() {
-return "@edges " + id;
+return "@undiredges " + id;
 }
 /// \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) {
+for (int i = 0; i < (int)undirEdgeWriters.size(); ++i) {
-	os << writers[i].first << ' ';
+	os << undirEdgeWriters[i].first << ' ';
-	idWriter->write(os, *(writers[i].second));
+	undirEdgeIdWriter->write(os, *(undirEdgeWriters[i].second));
 	os << std::endl;
 }
+for (int i = 0; i < (int)edgeWriters.size(); ++i) {
+	os << edgeWriters[i].first << ' ';
+	edgeIdWriter->write(os, *(edgeWriters[i].second));
+	os << std::endl;
+}
 }
 private:
 std::string id;
-typedef std::vector<std::pair<std::string, const Item*> > ItemWriters;
+typedef std::vector<std::pair<std::string,
-ItemWriters writers;
+				  const UndirEdge*> > UndirEdgeWriters;
+UndirEdgeWriters undirEdgeWriters;
-std::auto_ptr<IdWriterBase<Item> > idWriter;
+std::auto_ptr<IdWriterBase<UndirEdge> > undirEdgeIdWriter;
+typedef std::vector<std::pair<std::string, const Edge*> > EdgeWriters;
+EdgeWriters edgeWriters;
+std::auto_ptr<IdWriterBase<Edge> > edgeIdWriter;
 };
 /// \ingroup io_group
 /// \brief SectionWriter for attributes.
 ///

changeset 1429	4283998fb2be
parent 1421	7a21e1414c38