1.1 --- a/lemon/lemon_reader.h Thu Jan 26 06:44:22 2006 +0000
1.2 +++ b/lemon/lemon_reader.h Thu Jan 26 15:42:13 2006 +0000
1.3 @@ -104,7 +104,7 @@
1.4 template <typename Graph, typename Map>
1.5 class ForwardComposeMap {
1.6 public:
1.7 - typedef typename Graph::UndirEdge Key;
1.8 + typedef typename Graph::UEdge Key;
1.9 typedef typename Map::Value Value;
1.10
1.11 ForwardComposeMap(const Graph& _graph, typename Arg<Map>::Type _map)
1.12 @@ -134,7 +134,7 @@
1.13 template <typename Graph, typename Map>
1.14 class BackwardComposeMap {
1.15 public:
1.16 - typedef typename Graph::UndirEdge Key;
1.17 + typedef typename Graph::UEdge Key;
1.18 typedef typename Map::Value Value;
1.19
1.20 BackwardComposeMap(const Graph& _graph, typename Arg<Map>::Type _map)
1.21 @@ -1167,8 +1167,8 @@
1.22 /// \brief SectionReader for reading a undirected graph's edgeset.
1.23 ///
1.24 /// The lemon format can store multiple undirected edgesets with several
1.25 - /// maps. The undirected edgeset section's header line is \c \@undiredgeset
1.26 - /// \c undiredgeset_name, but the \c undiredgeset_name may be empty.
1.27 + /// maps. The undirected edgeset section's header line is \c \@uedgeset
1.28 + /// \c uedgeset_name, but the \c uedgeset_name may be empty.
1.29 ///
1.30 /// The first line of the section contains the names of the maps separated
1.31 /// with white spaces. Each next lines describes an edge in the edgeset. The
1.32 @@ -1183,7 +1183,7 @@
1.33 /// If the edgeset contains an \c "label" named map then it will be regarded
1.34 /// as id map. This map should contain only unique values and when the
1.35 /// \c readLabel() member will read a value from the given stream it will
1.36 - /// give back that undiricted edge which is mapped to this value.
1.37 + /// give back that uicted edge which is mapped to this value.
1.38 ///
1.39 /// The undirected edgeset reader needs a node id reader to identify which
1.40 /// nodes have to be connected. If a NodeSetReader reads an "label" named map,
1.41 @@ -1191,7 +1191,7 @@
1.42 ///
1.43 /// \relates LemonReader
1.44 template <typename _Graph, typename _Traits = DefaultReaderTraits>
1.45 - class UndirEdgeSetReader : public LemonReader::SectionReader {
1.46 + class UEdgeSetReader : public LemonReader::SectionReader {
1.47 typedef LemonReader::SectionReader Parent;
1.48 public:
1.49
1.50 @@ -1199,19 +1199,19 @@
1.51 typedef _Traits Traits;
1.52 typedef typename Graph::Node Node;
1.53 typedef typename Graph::Edge Edge;
1.54 - typedef typename Graph::UndirEdge UndirEdge;
1.55 + typedef typename Graph::UEdge UEdge;
1.56 typedef typename Traits::Skipper DefaultSkipper;
1.57
1.58 /// \brief Constructor.
1.59 ///
1.60 - /// Constructor for UndirEdgeSetReader. It creates the UndirEdgeSetReader
1.61 + /// Constructor for UEdgeSetReader. It creates the UEdgeSetReader
1.62 /// and attach it into the given LemonReader. The undirected edgeset
1.63 /// reader will add the readed undirected edges to the given Graph. It
1.64 /// will use the given node id reader to read the source and target
1.65 /// nodes of the edges. The reader will read the section only if the
1.66 - /// \c _name and the \c undiredgset_name are the same.
1.67 + /// \c _name and the \c uedgset_name are the same.
1.68 template <typename NodeLabelReader>
1.69 - UndirEdgeSetReader(LemonReader& _reader,
1.70 + UEdgeSetReader(LemonReader& _reader,
1.71 Graph& _graph,
1.72 const NodeLabelReader& _nodeLabelReader,
1.73 const std::string& _name = std::string(),
1.74 @@ -1223,8 +1223,8 @@
1.75 }
1.76 /// \brief Destructor.
1.77 ///
1.78 - /// Destructor for UndirEdgeSetReader.
1.79 - virtual ~UndirEdgeSetReader() {
1.80 + /// Destructor for UEdgeSetReader.
1.81 + virtual ~UEdgeSetReader() {
1.82 for (typename MapReaders::iterator it = readers.begin();
1.83 it != readers.end(); ++it) {
1.84 delete it->second;
1.85 @@ -1232,8 +1232,8 @@
1.86 }
1.87
1.88 private:
1.89 - UndirEdgeSetReader(const UndirEdgeSetReader&);
1.90 - void operator=(const UndirEdgeSetReader&);
1.91 + UEdgeSetReader(const UEdgeSetReader&);
1.92 + void operator=(const UEdgeSetReader&);
1.93
1.94 public:
1.95
1.96 @@ -1241,14 +1241,14 @@
1.97 ///
1.98 /// Add a new edge undirected map reader command for the reader.
1.99 template <typename Map>
1.100 - UndirEdgeSetReader& readUndirEdgeMap(std::string name, Map& map) {
1.101 + UEdgeSetReader& readUEdgeMap(std::string name, Map& map) {
1.102 return _readMap<
1.103 typename Traits::template Reader<typename Map::Value>, Map,
1.104 typename _reader_bits::Arg<Map>::Type>(name, map);
1.105 }
1.106
1.107 template <typename Map>
1.108 - UndirEdgeSetReader& readUndirEdgeMap(std::string name, const Map& map) {
1.109 + UEdgeSetReader& readUEdgeMap(std::string name, const Map& map) {
1.110 return _readMap<
1.111 typename Traits::template Reader<typename Map::Value>, Map,
1.112 typename _reader_bits::Arg<Map>::Type>(name, map);
1.113 @@ -1258,14 +1258,14 @@
1.114 ///
1.115 /// Add a new edge undirected map reader command for the reader.
1.116 template <typename Reader, typename Map>
1.117 - UndirEdgeSetReader& readUndirEdgeMap(std::string name, Map& map,
1.118 + UEdgeSetReader& readUEdgeMap(std::string name, Map& map,
1.119 const Reader& reader = Reader()) {
1.120 return _readMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
1.121 (name, map, reader);
1.122 }
1.123
1.124 template <typename Reader, typename Map>
1.125 - UndirEdgeSetReader& readUndirEdgeMap(std::string name, const Map& map,
1.126 + UEdgeSetReader& readUEdgeMap(std::string name, const Map& map,
1.127 const Reader& reader = Reader()) {
1.128 return _readMap<Reader, Map, typename _reader_bits::Arg<Map>::Type >
1.129 (name, map, reader);
1.130 @@ -1274,9 +1274,9 @@
1.131 private:
1.132
1.133 template <typename Reader, typename Map, typename MapParameter>
1.134 - UndirEdgeSetReader& _readMap(std::string name, MapParameter map,
1.135 + UEdgeSetReader& _readMap(std::string name, MapParameter map,
1.136 const Reader& reader = Reader()) {
1.137 - checkConcept<concept::WriteMap<UndirEdge, typename Map::Value>, Map>();
1.138 + checkConcept<concept::WriteMap<UEdge, typename Map::Value>, Map>();
1.139 checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
1.140 if (readers.find(name) != readers.end()) {
1.141 ErrorMessage msg;
1.142 @@ -1285,7 +1285,7 @@
1.143 }
1.144 readers.insert(
1.145 make_pair(name, new _reader_bits::
1.146 - MapReader<UndirEdge, Map, Reader>(map, reader)));
1.147 + MapReader<UEdge, Map, Reader>(map, reader)));
1.148 return *this;
1.149 }
1.150
1.151 @@ -1295,7 +1295,7 @@
1.152 ///
1.153 /// Add a new undirected edge map skipper command for the reader.
1.154 template <typename Reader>
1.155 - UndirEdgeSetReader& skipUndirEdgeMap(std::string name,
1.156 + UEdgeSetReader& skipUEdgeMap(std::string name,
1.157 const Reader& reader = Reader()) {
1.158 if (readers.find(name) != readers.end()) {
1.159 ErrorMessage msg;
1.160 @@ -1303,7 +1303,7 @@
1.161 throw IOParameterError(msg.message());
1.162 }
1.163 readers.insert(make_pair(name, new _reader_bits::
1.164 - SkipReader<UndirEdge, Reader>(reader)));
1.165 + SkipReader<UEdge, Reader>(reader)));
1.166 return *this;
1.167 }
1.168
1.169 @@ -1311,14 +1311,14 @@
1.170 ///
1.171 /// Add a new directed edge map reader command for the reader.
1.172 template <typename Map>
1.173 - UndirEdgeSetReader& readEdgeMap(std::string name, Map& map) {
1.174 + UEdgeSetReader& readEdgeMap(std::string name, Map& map) {
1.175 return _readDirMap<
1.176 typename Traits::template Reader<typename Map::Value>, Map,
1.177 typename _reader_bits::Arg<Map>::Type>(name, map);
1.178 }
1.179
1.180 template <typename Map>
1.181 - UndirEdgeSetReader& readEdgeMap(std::string name, const Map& map) {
1.182 + UEdgeSetReader& readEdgeMap(std::string name, const Map& map) {
1.183 return _readDirMap<
1.184 typename Traits::template Reader<typename Map::Value>, Map,
1.185 typename _reader_bits::Arg<Map>::Type>(name, map);
1.186 @@ -1328,14 +1328,14 @@
1.187 ///
1.188 /// Add a new directed edge map reader command for the reader.
1.189 template <typename Reader, typename Map>
1.190 - UndirEdgeSetReader& readEdgeMap(std::string name, Map& map,
1.191 + UEdgeSetReader& readEdgeMap(std::string name, Map& map,
1.192 const Reader& reader = Reader()) {
1.193 return _readDirMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
1.194 (name, map, reader);
1.195 }
1.196
1.197 template <typename Reader, typename Map>
1.198 - UndirEdgeSetReader& readEdgeMap(std::string name, const Map& map,
1.199 + UEdgeSetReader& readEdgeMap(std::string name, const Map& map,
1.200 const Reader& reader = Reader()) {
1.201 return _readDirMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
1.202 (name, map, reader);
1.203 @@ -1344,7 +1344,7 @@
1.204 private:
1.205
1.206 template <typename Reader, typename Map, typename MapParameter>
1.207 - UndirEdgeSetReader& _readDirMap(std::string name, MapParameter map,
1.208 + UEdgeSetReader& _readDirMap(std::string name, MapParameter map,
1.209 const Reader& reader = Reader()) {
1.210 checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
1.211 checkConcept<concept::WriteMap<Edge, typename Map::Value>, Map>();
1.212 @@ -1361,7 +1361,7 @@
1.213 ///
1.214 /// Add a new directed edge map skipper command for the reader.
1.215 template <typename Reader>
1.216 - UndirEdgeSetReader& skipEdgeMap(std::string name,
1.217 + UEdgeSetReader& skipEdgeMap(std::string name,
1.218 const Reader& reader = Reader()) {
1.219 skipMap("+" + name, reader);
1.220 skipMap("-" + name, reader);
1.221 @@ -1373,14 +1373,14 @@
1.222 /// \brief Gives back true when the SectionReader can process
1.223 /// the section with the given header line.
1.224 ///
1.225 - /// It gives back true when the header line starts with \c \@undiredgeset,
1.226 + /// It gives back true when the header line starts with \c \@uedgeset,
1.227 /// and the header line's name and the edgeset's name are the same.
1.228 virtual bool header(const std::string& line) {
1.229 std::istringstream ls(line);
1.230 std::string command;
1.231 std::string id;
1.232 ls >> command >> name;
1.233 - return command == "@undiredgeset" && name == id;
1.234 + return command == "@uedgeset" && name == id;
1.235 }
1.236
1.237 /// \brief Reader function of the section.
1.238 @@ -1390,7 +1390,7 @@
1.239 if (!nodeLabelReader->isLabelReader()) {
1.240 throw DataFormatError("Cannot find nodeset or label map");
1.241 }
1.242 - std::vector<_reader_bits::MapReaderBase<UndirEdge>* > index;
1.243 + std::vector<_reader_bits::MapReaderBase<UEdge>* > index;
1.244 std::string line;
1.245
1.246 getline(is, line);
1.247 @@ -1421,7 +1421,7 @@
1.248 std::istringstream ls(line);
1.249 Node from = nodeLabelReader->read(ls);
1.250 Node to = nodeLabelReader->read(ls);
1.251 - UndirEdge edge = graph.addEdge(from, to);
1.252 + UEdge edge = graph.addEdge(from, to);
1.253 for (int i = 0; i < (int)index.size(); ++i) {
1.254 index[i]->read(ls, edge);
1.255 }
1.256 @@ -1442,8 +1442,8 @@
1.257 ///
1.258 /// It reads an id from the stream and gives back which undirected edge
1.259 /// belongs to it. It is possible only if there was read an "label" named map.
1.260 - void readLabel(std::istream& is, UndirEdge& undirEdge) const {
1.261 - undirEdge = inverter->read(is);
1.262 + void readLabel(std::istream& is, UEdge& uEdge) const {
1.263 + uEdge = inverter->read(is);
1.264 }
1.265
1.266 /// \brief Gives back the directed edge by its label.
1.267 @@ -1455,11 +1455,11 @@
1.268 void readLabel(std::istream& is, Edge& edge) const {
1.269 char c;
1.270 is >> c;
1.271 - UndirEdge undirEdge = inverter->read(is);
1.272 + UEdge uEdge = inverter->read(is);
1.273 if (c == '+') {
1.274 - edge = graph.direct(undirEdge, true);
1.275 + edge = graph.direct(uEdge, true);
1.276 } else if (c == '-') {
1.277 - edge = graph.direct(undirEdge, false);
1.278 + edge = graph.direct(uEdge, false);
1.279 } else {
1.280 throw DataFormatError("Wrong id format for edge "
1.281 "in undirected edgeset");
1.282 @@ -1469,14 +1469,14 @@
1.283 private:
1.284
1.285 typedef std::map<std::string,
1.286 - _reader_bits::MapReaderBase<UndirEdge>*> MapReaders;
1.287 + _reader_bits::MapReaderBase<UEdge>*> MapReaders;
1.288 MapReaders readers;
1.289
1.290 Graph& graph;
1.291 std::string name;
1.292 - _reader_bits::SkipReader<UndirEdge, DefaultSkipper> skipper;
1.293 + _reader_bits::SkipReader<UEdge, DefaultSkipper> skipper;
1.294
1.295 - std::auto_ptr<_reader_bits::MapInverterBase<UndirEdge> > inverter;
1.296 + std::auto_ptr<_reader_bits::MapInverterBase<UEdge> > inverter;
1.297 std::auto_ptr<_reader_bits::LabelReaderBase<Node> > nodeLabelReader;
1.298 };
1.299
1.300 @@ -1696,66 +1696,66 @@
1.301 /// \ingroup io_group
1.302 /// \brief SectionReader for reading labeled undirected edges.
1.303 ///
1.304 - /// The undirected edges section's header line is \c \@undiredges
1.305 - /// \c undiredges_name, but the \c undiredges_name may be empty.
1.306 + /// The undirected edges section's header line is \c \@uedges
1.307 + /// \c uedges_name, but the \c uedges_name may be empty.
1.308 ///
1.309 /// Each line in the section contains the name of the undirected edge
1.310 /// and then the undirected edge id.
1.311 ///
1.312 /// \relates LemonReader
1.313 template <typename _Graph>
1.314 - class UndirEdgeReader : public LemonReader::SectionReader {
1.315 + class UEdgeReader : public LemonReader::SectionReader {
1.316 typedef LemonReader::SectionReader Parent;
1.317 typedef _Graph Graph;
1.318 typedef typename Graph::Edge Edge;
1.319 - typedef typename Graph::UndirEdge UndirEdge;
1.320 + typedef typename Graph::UEdge UEdge;
1.321 public:
1.322
1.323 /// \brief Constructor.
1.324 ///
1.325 - /// Constructor for UndirEdgeReader. It creates the UndirEdgeReader and
1.326 + /// Constructor for UEdgeReader. It creates the UEdgeReader and
1.327 /// attach it into the given LemonReader. It will use the given
1.328 /// undirected edge id reader to give back the edges. The reader will
1.329 - /// read the section only if the \c _name and the \c undiredges_name are
1.330 + /// read the section only if the \c _name and the \c uedges_name are
1.331 /// the same.
1.332 template <typename _LabelReader>
1.333 - UndirEdgeReader(LemonReader& _reader, const _LabelReader& _labelReader,
1.334 + UEdgeReader(LemonReader& _reader, const _LabelReader& _labelReader,
1.335 const std::string& _name = std::string())
1.336 : Parent(_reader), name(_name) {
1.337 - checkConcept<_reader_bits::ItemLabelReader<UndirEdge>, _LabelReader>();
1.338 + checkConcept<_reader_bits::ItemLabelReader<UEdge>, _LabelReader>();
1.339 checkConcept<_reader_bits::ItemLabelReader<Edge>, _LabelReader>();
1.340 - undirEdgeLabelReader.reset(new _reader_bits::
1.341 - LabelReader<UndirEdge, _LabelReader>(_labelReader));
1.342 + uEdgeLabelReader.reset(new _reader_bits::
1.343 + LabelReader<UEdge, _LabelReader>(_labelReader));
1.344 edgeLabelReader.reset(new _reader_bits::
1.345 LabelReader<Edge, _LabelReader>(_labelReader));
1.346 }
1.347
1.348 /// \brief Destructor.
1.349 ///
1.350 - /// Destructor for UndirEdgeReader.
1.351 - virtual ~UndirEdgeReader() {}
1.352 + /// Destructor for UEdgeReader.
1.353 + virtual ~UEdgeReader() {}
1.354 private:
1.355 - UndirEdgeReader(const UndirEdgeReader&);
1.356 - void operator=(const UndirEdgeReader&);
1.357 + UEdgeReader(const UEdgeReader&);
1.358 + void operator=(const UEdgeReader&);
1.359
1.360 public:
1.361
1.362 - /// \brief Add an undirected edge reader command for the UndirEdgeReader.
1.363 + /// \brief Add an undirected edge reader command for the UEdgeReader.
1.364 ///
1.365 - /// Add an undirected edge reader command for the UndirEdgeReader.
1.366 - void readUndirEdge(const std::string& name, UndirEdge& item) {
1.367 - if (undirEdgeReaders.find(name) != undirEdgeReaders.end()) {
1.368 + /// Add an undirected edge reader command for the UEdgeReader.
1.369 + void readUEdge(const std::string& name, UEdge& item) {
1.370 + if (uEdgeReaders.find(name) != uEdgeReaders.end()) {
1.371 ErrorMessage msg;
1.372 msg << "Multiple read rule for undirected edge: " << name;
1.373 throw IOParameterError(msg.message());
1.374 }
1.375 - undirEdgeReaders.insert(make_pair(name, _reader_bits::
1.376 - ItemStore<UndirEdge>(item)));
1.377 + uEdgeReaders.insert(make_pair(name, _reader_bits::
1.378 + ItemStore<UEdge>(item)));
1.379 }
1.380
1.381 - /// \brief Add an edge reader command for the UndirEdgeReader.
1.382 + /// \brief Add an edge reader command for the UEdgeReader.
1.383 ///
1.384 - /// Add an edge reader command for the UndirEdgeReader.
1.385 + /// Add an edge reader command for the UEdgeReader.
1.386 void readEdge(const std::string& name, Edge& item) {
1.387 if (edgeReaders.find(name) != edgeReaders.end()) {
1.388 ErrorMessage msg;
1.389 @@ -1777,7 +1777,7 @@
1.390 std::string command;
1.391 std::string id;
1.392 ls >> command >> name;
1.393 - return command == "@undiredges" && name == id;
1.394 + return command == "@uedges" && name == id;
1.395 }
1.396
1.397 /// \brief Reader function of the section.
1.398 @@ -1787,7 +1787,7 @@
1.399 if (!edgeLabelReader->isLabelReader()) {
1.400 throw DataFormatError("Cannot find undirected edgeset or label map");
1.401 }
1.402 - if (!undirEdgeLabelReader->isLabelReader()) {
1.403 + if (!uEdgeLabelReader->isLabelReader()) {
1.404 throw DataFormatError("Cannot find undirected edgeset or label map");
1.405 }
1.406 std::string line;
1.407 @@ -1796,9 +1796,9 @@
1.408 std::string id;
1.409 ls >> id;
1.410 {
1.411 - typename UndirEdgeReaders::iterator it = undirEdgeReaders.find(id);
1.412 - if (it != undirEdgeReaders.end()) {
1.413 - it->second.read(undirEdgeLabelReader->read(ls));
1.414 + typename UEdgeReaders::iterator it = uEdgeReaders.find(id);
1.415 + if (it != uEdgeReaders.end()) {
1.416 + it->second.read(uEdgeLabelReader->read(ls));
1.417 it->second.touch();
1.418 continue;
1.419 }
1.420 @@ -1819,11 +1819,11 @@
1.421 throw IOParameterError(msg.message());
1.422 }
1.423 }
1.424 - for (typename UndirEdgeReaders::iterator it = undirEdgeReaders.begin();
1.425 - it != undirEdgeReaders.end(); ++it) {
1.426 + for (typename UEdgeReaders::iterator it = uEdgeReaders.begin();
1.427 + it != uEdgeReaders.end(); ++it) {
1.428 if (!it->second.touched()) {
1.429 ErrorMessage msg;
1.430 - msg << "UndirEdge not found in file: " << it->first;
1.431 + msg << "UEdge not found in file: " << it->first;
1.432 throw IOParameterError(msg.message());
1.433 }
1.434 }
1.435 @@ -1834,9 +1834,9 @@
1.436 std::string name;
1.437
1.438 typedef std::map<std::string,
1.439 - _reader_bits::ItemStore<UndirEdge> > UndirEdgeReaders;
1.440 - UndirEdgeReaders undirEdgeReaders;
1.441 - std::auto_ptr<_reader_bits::LabelReaderBase<UndirEdge> > undirEdgeLabelReader;
1.442 + _reader_bits::ItemStore<UEdge> > UEdgeReaders;
1.443 + UEdgeReaders uEdgeReaders;
1.444 + std::auto_ptr<_reader_bits::LabelReaderBase<UEdge> > uEdgeLabelReader;
1.445
1.446 typedef std::map<std::string, _reader_bits::ItemStore<Edge> > EdgeReaders;
1.447 EdgeReaders edgeReaders;
1.448 @@ -2025,24 +2025,24 @@
1.449 /// \brief Gives back how many undirected edgesets are in the file.
1.450 ///
1.451 /// Gives back how many undirected edgesets are in the file.
1.452 - int undirEdgeSetNum() const {
1.453 - return undiredgesets.size();
1.454 + int uEdgeSetNum() const {
1.455 + return uedgesets.size();
1.456 }
1.457
1.458 /// \brief Gives back the name of undirected edgeset on the indiced
1.459 /// position.
1.460 ///
1.461 /// Gives back the name of undirected edgeset on the indiced position.
1.462 - std::string undirEdgeSetName(int index) const {
1.463 - return undiredgesets[index].name;
1.464 + std::string uEdgeSetName(int index) const {
1.465 + return uedgesets[index].name;
1.466 }
1.467
1.468 /// \brief Gives back the map names of undirected edgeset on the indiced
1.469 /// position.
1.470 ///
1.471 /// Gives back the map names of undirected edgeset on the indiced position.
1.472 - const std::vector<std::string>& undirEdgeSetMaps(int index) const {
1.473 - return undiredgesets[index].items;
1.474 + const std::vector<std::string>& uEdgeSetMaps(int index) const {
1.475 + return uedgesets[index].items;
1.476 }
1.477
1.478 /// \brief Gives back how many labeled nodes section are in the file.
1.479 @@ -2095,8 +2095,8 @@
1.480 /// in the file.
1.481 ///
1.482 /// Gives back how many labeled undirected edges section are in the file.
1.483 - int undirEdgesNum() const {
1.484 - return undiredges.size();
1.485 + int uEdgesNum() const {
1.486 + return uedges.size();
1.487 }
1.488
1.489 /// \brief Gives back the name of labeled undirected edges section
1.490 @@ -2104,8 +2104,8 @@
1.491 ///
1.492 /// Gives back the name of labeled undirected edges section on the
1.493 /// indiced position.
1.494 - std::string undirEdgesName(int index) const {
1.495 - return undiredges[index].name;
1.496 + std::string uEdgesName(int index) const {
1.497 + return uedges[index].name;
1.498 }
1.499
1.500 /// \brief Gives back the names of the labeled undirected edges in
1.501 @@ -2113,8 +2113,8 @@
1.502 ///
1.503 /// Gives back the names of the labeled undirected edges in the
1.504 /// indiced section.
1.505 - const std::vector<std::string>& undirEdgesItems(int index) const {
1.506 - return undiredges[index].items;
1.507 + const std::vector<std::string>& uEdgesItems(int index) const {
1.508 + return uedges[index].items;
1.509 }
1.510
1.511
1.512 @@ -2160,18 +2160,18 @@
1.513 } else if (command == "@edgeset") {
1.514 current = command;
1.515 edgesets.push_back(SectionInfo(name));
1.516 - } else if (command == "@undiredgeset") {
1.517 + } else if (command == "@uedgeset") {
1.518 current = command;
1.519 - undiredgesets.push_back(SectionInfo(name));
1.520 + uedgesets.push_back(SectionInfo(name));
1.521 } else if (command == "@nodes") {
1.522 current = command;
1.523 nodes.push_back(SectionInfo(name));
1.524 } else if (command == "@edges") {
1.525 current = command;
1.526 edges.push_back(SectionInfo(name));
1.527 - } else if (command == "@undiredges") {
1.528 + } else if (command == "@uedges") {
1.529 current = command;
1.530 - undiredges.push_back(SectionInfo(name));
1.531 + uedges.push_back(SectionInfo(name));
1.532 } else if (command == "@attributes") {
1.533 current = command;
1.534 attributes.push_back(SectionInfo(name));
1.535 @@ -2190,14 +2190,14 @@
1.536 readMapNames(is, nodesets.back().items);
1.537 } else if (current == "@edgeset") {
1.538 readMapNames(is, edgesets.back().items);
1.539 - } else if (current == "@undiredgeset") {
1.540 - readMapNames(is, undiredgesets.back().items);
1.541 + } else if (current == "@uedgeset") {
1.542 + readMapNames(is, uedgesets.back().items);
1.543 } else if (current == "@nodes") {
1.544 readItemNames(is, nodes.back().items);
1.545 } else if (current == "@edges") {
1.546 readItemNames(is, edges.back().items);
1.547 - } else if (current == "@undiredges") {
1.548 - readItemNames(is, undiredges.back().items);
1.549 + } else if (current == "@uedges") {
1.550 + readItemNames(is, uedges.back().items);
1.551 } else if (current == "@attributes") {
1.552 readItemNames(is, attributes.back().items);
1.553 }
1.554 @@ -2233,11 +2233,11 @@
1.555
1.556 std::vector<SectionInfo> nodesets;
1.557 std::vector<SectionInfo> edgesets;
1.558 - std::vector<SectionInfo> undiredgesets;
1.559 + std::vector<SectionInfo> uedgesets;
1.560
1.561 std::vector<SectionInfo> nodes;
1.562 std::vector<SectionInfo> edges;
1.563 - std::vector<SectionInfo> undiredges;
1.564 + std::vector<SectionInfo> uedges;
1.565
1.566 std::vector<SectionInfo> attributes;
1.567