Changes in lemon/lgf_reader.h [487:afd134142111:319:5e12d7734036] in lemon-1.2
- File:
-
- 1 edited
-
lemon/lgf_reader.h (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
lemon/lgf_reader.h
r487 r319 391 391 class DigraphReader; 392 392 393 /// \brief Return a \ref DigraphReader class 394 /// 395 /// This function just returns a \ref DigraphReader class. 396 /// \relates DigraphReader 393 397 template <typename Digraph> 394 DigraphReader<Digraph> digraphReader(Digraph& digraph, 395 std::istream& is = std::cin); 398 DigraphReader<Digraph> digraphReader(Digraph& digraph, 399 std::istream& is = std::cin) { 400 DigraphReader<Digraph> tmp(digraph, is); 401 return tmp; 402 } 403 404 /// \brief Return a \ref DigraphReader class 405 /// 406 /// This function just returns a \ref DigraphReader class. 407 /// \relates DigraphReader 396 408 template <typename Digraph> 397 DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn); 409 DigraphReader<Digraph> digraphReader(Digraph& digraph, 410 const std::string& fn) { 411 DigraphReader<Digraph> tmp(digraph, fn); 412 return tmp; 413 } 414 415 /// \brief Return a \ref DigraphReader class 416 /// 417 /// This function just returns a \ref DigraphReader class. 418 /// \relates DigraphReader 398 419 template <typename Digraph> 399 DigraphReader<Digraph> digraphReader(Digraph& digraph, const char *fn); 420 DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) { 421 DigraphReader<Digraph> tmp(digraph, fn); 422 return tmp; 423 } 400 424 401 425 /// \ingroup lemon_io … … 561 585 private: 562 586 563 template <typename DGR> 564 friend DigraphReader<DGR> digraphReader(DGR& digraph, std::istream& is); 565 template <typename DGR> 566 friend DigraphReader<DGR> digraphReader(DGR& digraph, 567 const std::string& fn); 568 template <typename DGR> 569 friend DigraphReader<DGR> digraphReader(DGR& digraph, const char *fn); 587 friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph, 588 std::istream& is); 589 friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph, 590 const std::string& fn); 591 friend DigraphReader<Digraph> digraphReader<>(Digraph& digraph, 592 const char *fn); 570 593 571 594 DigraphReader(DigraphReader& other) … … 1188 1211 }; 1189 1212 1190 /// \brief Return a \ref DigraphReader class 1213 template <typename Graph> 1214 class GraphReader; 1215 1216 /// \brief Return a \ref GraphReader class 1191 1217 /// 1192 /// This function just returns a \ref DigraphReader class.1193 /// \relates DigraphReader1194 template <typename Digraph>1195 DigraphReader<Digraph> digraphReader(Digraph& digraph, std::istream& is) {1196 DigraphReader<Digraph> tmp(digraph, is);1218 /// This function just returns a \ref GraphReader class. 1219 /// \relates GraphReader 1220 template <typename Graph> 1221 GraphReader<Graph> graphReader(Graph& graph, std::istream& is = std::cin) { 1222 GraphReader<Graph> tmp(graph, is); 1197 1223 return tmp; 1198 1224 } 1199 1225 1200 /// \brief Return a \ref DigraphReader class1226 /// \brief Return a \ref GraphReader class 1201 1227 /// 1202 /// This function just returns a \ref DigraphReader class. 1203 /// \relates DigraphReader 1204 template <typename Digraph> 1205 DigraphReader<Digraph> digraphReader(Digraph& digraph, 1206 const std::string& fn) { 1207 DigraphReader<Digraph> tmp(digraph, fn); 1228 /// This function just returns a \ref GraphReader class. 1229 /// \relates GraphReader 1230 template <typename Graph> 1231 GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) { 1232 GraphReader<Graph> tmp(graph, fn); 1208 1233 return tmp; 1209 1234 } 1210 1235 1211 /// \brief Return a \ref DigraphReader class1236 /// \brief Return a \ref GraphReader class 1212 1237 /// 1213 /// This function just returns a \ref DigraphReader class.1214 /// \relates DigraphReader1215 template <typename Digraph>1216 DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) {1217 DigraphReader<Digraph> tmp(digraph, fn);1238 /// This function just returns a \ref GraphReader class. 1239 /// \relates GraphReader 1240 template <typename Graph> 1241 GraphReader<Graph> graphReader(Graph& graph, const char* fn) { 1242 GraphReader<Graph> tmp(graph, fn); 1218 1243 return tmp; 1219 1244 } 1220 1221 template <typename Graph>1222 class GraphReader;1223 1224 template <typename Graph>1225 GraphReader<Graph> graphReader(Graph& graph,1226 std::istream& is = std::cin);1227 template <typename Graph>1228 GraphReader<Graph> graphReader(Graph& graph, const std::string& fn);1229 template <typename Graph>1230 GraphReader<Graph> graphReader(Graph& graph, const char *fn);1231 1245 1232 1246 /// \ingroup lemon_io … … 1355 1369 1356 1370 private: 1357 template <typename GR> 1358 friend GraphReader<GR> graphReader(GR& graph, std::istream& is); 1359 template <typename GR> 1360 friend GraphReader<GR> graphReader(GR& graph, const std::string& fn); 1361 template <typename GR> 1362 friend GraphReader<GR> graphReader(GR& graph, const char *fn); 1371 friend GraphReader<Graph> graphReader<>(Graph& graph, std::istream& is); 1372 friend GraphReader<Graph> graphReader<>(Graph& graph, 1373 const std::string& fn); 1374 friend GraphReader<Graph> graphReader<>(Graph& graph, const char *fn); 1363 1375 1364 1376 GraphReader(GraphReader& other) … … 2028 2040 2029 2041 }; 2030 2031 /// \brief Return a \ref GraphReader class2032 ///2033 /// This function just returns a \ref GraphReader class.2034 /// \relates GraphReader2035 template <typename Graph>2036 GraphReader<Graph> graphReader(Graph& graph, std::istream& is) {2037 GraphReader<Graph> tmp(graph, is);2038 return tmp;2039 }2040 2041 /// \brief Return a \ref GraphReader class2042 ///2043 /// This function just returns a \ref GraphReader class.2044 /// \relates GraphReader2045 template <typename Graph>2046 GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) {2047 GraphReader<Graph> tmp(graph, fn);2048 return tmp;2049 }2050 2051 /// \brief Return a \ref GraphReader class2052 ///2053 /// This function just returns a \ref GraphReader class.2054 /// \relates GraphReader2055 template <typename Graph>2056 GraphReader<Graph> graphReader(Graph& graph, const char* fn) {2057 GraphReader<Graph> tmp(graph, fn);2058 return tmp;2059 }2060 2042 2061 2043 class SectionReader;
Note: See TracChangeset
for help on using the changeset viewer.
