Changeset 2001:c9e5de6e3eac in lemon-0.x
- Timestamp:
- 03/07/06 12:06:57 (19 years ago)
- Branch:
- default
- Phase:
- public
- Convert:
- svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2611
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/lemon_reader.h
r2000 r2001 896 896 index.push_back(&skipper); 897 897 } 898 if (id == "label" || (id =="id" && inverter.get() == 0)) {898 if (id == "label") { 899 899 inverter.reset(index.back()->getInverter()); 900 900 index.back() = inverter.get(); … … 921 921 if (readers.empty()) return; 922 922 ErrorMessage msg; 923 msg << "NodeSet section not found in file: " << name;923 msg << "NodeSet section not found in file: @nodeset " << name; 924 924 throw IOParameterError(msg.message()); 925 925 } … … 1129 1129 index.push_back(&skipper); 1130 1130 } 1131 if (id == "label" || (id =="id" && inverter.get() == 0)) {1131 if (id == "label") { 1132 1132 inverter.reset(index.back()->getInverter()); 1133 1133 index.back() = inverter.get(); … … 1156 1156 if (readers.empty()) return; 1157 1157 ErrorMessage msg; 1158 msg << "EdgeSet section not found in file: " << name;1158 msg << "EdgeSet section not found in file: @edgeset " << name; 1159 1159 throw IOParameterError(msg.message()); 1160 1160 } … … 1180 1180 private: 1181 1181 1182 typedef std::map<std::string, _reader_bits::MapReaderBase<Edge>*> MapReaders; 1182 typedef std::map<std::string, _reader_bits::MapReaderBase<Edge>*> 1183 MapReaders; 1184 1183 1185 MapReaders readers; 1184 1186 … … 1214 1216 /// 1215 1217 /// The undirected edgeset reader needs a node id reader to identify which 1216 /// nodes have to be connected. If a NodeSetReader reads an "label" named map,1217 /// it will be able to resolve the nodes by ids.1218 /// nodes have to be connected. If a NodeSetReader reads an "label" named 1219 /// map, it will be able to resolve the nodes by ids. 1218 1220 /// 1219 1221 /// \relates LemonReader … … 1432 1434 index.push_back(&skipper); 1433 1435 } 1434 if (id == "label" || (id =="id" && inverter.get() == 0)) {1436 if (id == "label") { 1435 1437 inverter.reset(index.back()->getInverter()); 1436 1438 index.back() = inverter.get(); … … 1459 1461 if (readers.empty()) return; 1460 1462 ErrorMessage msg; 1461 msg << "UEdgeSet section not found in file: " << name;1463 msg << "UEdgeSet section not found in file: @uedgeset " << name; 1462 1464 throw IOParameterError(msg.message()); 1463 1465 } … … 1616 1618 if (readers.empty()) return; 1617 1619 ErrorMessage msg; 1618 msg << "Nodes section not found in file: " << name;1620 msg << "Nodes section not found in file: @nodes " << name; 1619 1621 throw IOParameterError(msg.message()); 1620 1622 } … … 1729 1731 if (readers.empty()) return; 1730 1732 ErrorMessage msg; 1731 msg << "Edges section not found in file: " << name;1733 msg << "Edges section not found in file: @edges " << name; 1732 1734 throw IOParameterError(msg.message()); 1733 1735 } … … 1881 1883 if (edgeReaders.empty() && uEdgeReaders.empty()) return; 1882 1884 ErrorMessage msg; 1883 msg << "UEdges section not found in file: " << name;1885 msg << "UEdges section not found in file: @uedges " << name; 1884 1886 throw IOParameterError(msg.message()); 1885 1887 } … … 2008 2010 if (readers.empty()) return; 2009 2011 ErrorMessage msg; 2010 msg << "Attribute section not found in file: " << name;2012 msg << "Attribute section not found in file: @attributes " << name; 2011 2013 throw IOParameterError(msg.message()); 2012 2014 }
Note: See TracChangeset
for help on using the changeset viewer.