1.1 --- a/lemon/full_graph.h Thu Jan 26 06:44:22 2006 +0000
1.2 +++ b/lemon/full_graph.h Thu Jan 26 15:42:13 2006 +0000
1.3 @@ -31,7 +31,7 @@
1.4
1.5 ///\ingroup graphs
1.6 ///\file
1.7 -///\brief FullGraph and UndirFullGraph classes.
1.8 +///\brief FullGraph and FullUGraph classes.
1.9
1.10
1.11 namespace lemon {
1.12 @@ -213,19 +213,19 @@
1.13 };
1.14
1.15
1.16 - class UndirFullGraphBase {
1.17 + class FullUGraphBase {
1.18 int _nodeNum;
1.19 int _edgeNum;
1.20 public:
1.21
1.22 - typedef UndirFullGraphBase Graph;
1.23 + typedef FullUGraphBase Graph;
1.24
1.25 class Node;
1.26 class Edge;
1.27
1.28 public:
1.29
1.30 - UndirFullGraphBase() {}
1.31 + FullUGraphBase() {}
1.32
1.33
1.34 ///Creates a full graph with \c n nodes.
1.35 @@ -301,7 +301,7 @@
1.36
1.37
1.38 class Node {
1.39 - friend class UndirFullGraphBase;
1.40 + friend class FullUGraphBase;
1.41
1.42 protected:
1.43 int id;
1.44 @@ -317,7 +317,7 @@
1.45
1.46
1.47 class Edge {
1.48 - friend class UndirFullGraphBase;
1.49 + friend class FullUGraphBase;
1.50
1.51 protected:
1.52 int id; // _nodeNum * target + source;
1.53 @@ -377,10 +377,10 @@
1.54
1.55 };
1.56
1.57 - typedef StaticMappableUndirGraphExtender<
1.58 - IterableUndirGraphExtender<
1.59 - AlterableUndirGraphExtender<
1.60 - UndirGraphExtender<UndirFullGraphBase> > > > ExtendedUndirFullGraphBase;
1.61 + typedef StaticMappableUGraphExtender<
1.62 + IterableUGraphExtender<
1.63 + AlterableUGraphExtender<
1.64 + UGraphExtender<FullUGraphBase> > > > ExtendedFullUGraphBase;
1.65
1.66 /// \ingroup graphs
1.67 ///
1.68 @@ -390,20 +390,20 @@
1.69 /// It is completely static, so you can neither add nor delete either
1.70 /// edges or nodes.
1.71 ///
1.72 - /// The main difference beetween the \e FullGraph and \e UndirFullGraph class
1.73 + /// The main difference beetween the \e FullGraph and \e FullUGraph class
1.74 /// is that this class conforms to the undirected graph concept and
1.75 /// it does not contain the loop edges.
1.76 ///
1.77 /// \sa FullGraph
1.78 ///
1.79 /// \author Balazs Dezso
1.80 - class UndirFullGraph : public ExtendedUndirFullGraphBase {
1.81 + class FullUGraph : public ExtendedFullUGraphBase {
1.82 public:
1.83 - UndirFullGraph(int n) { construct(n); }
1.84 + FullUGraph(int n) { construct(n); }
1.85 };
1.86
1.87
1.88 - class FullUndirBipartiteGraphBase {
1.89 + class FullUBipartiteGraphBase {
1.90 protected:
1.91
1.92 int _upperNodeNum;
1.93 @@ -415,12 +415,12 @@
1.94
1.95 class NodeSetError : public LogicError {
1.96 virtual const char* exceptionName() const {
1.97 - return "lemon::FullUndirBipartiteGraph::NodeSetError";
1.98 + return "lemon::FullUBipartiteGraph::NodeSetError";
1.99 }
1.100 };
1.101
1.102 class Node {
1.103 - friend class FullUndirBipartiteGraphBase;
1.104 + friend class FullUBipartiteGraphBase;
1.105 protected:
1.106 int id;
1.107
1.108 @@ -434,7 +434,7 @@
1.109 };
1.110
1.111 class Edge {
1.112 - friend class FullUndirBipartiteGraphBase;
1.113 + friend class FullUBipartiteGraphBase;
1.114 protected:
1.115 int id;
1.116
1.117 @@ -575,19 +575,19 @@
1.118 };
1.119
1.120
1.121 - typedef StaticMappableUndirBipartiteGraphExtender<
1.122 - IterableUndirBipartiteGraphExtender<
1.123 - AlterableUndirBipartiteGraphExtender<
1.124 - UndirBipartiteGraphExtender <
1.125 - FullUndirBipartiteGraphBase> > > >
1.126 - ExtendedFullUndirBipartiteGraphBase;
1.127 + typedef StaticMappableUBipartiteGraphExtender<
1.128 + IterableUBipartiteGraphExtender<
1.129 + AlterableUBipartiteGraphExtender<
1.130 + UBipartiteGraphExtender <
1.131 + FullUBipartiteGraphBase> > > >
1.132 + ExtendedFullUBipartiteGraphBase;
1.133
1.134
1.135 - class FullUndirBipartiteGraph :
1.136 - public ExtendedFullUndirBipartiteGraphBase {
1.137 + class FullUBipartiteGraph :
1.138 + public ExtendedFullUBipartiteGraphBase {
1.139 public:
1.140 - typedef ExtendedFullUndirBipartiteGraphBase Parent;
1.141 - FullUndirBipartiteGraph(int upperNodeNum, int lowerNodeNum) {
1.142 + typedef ExtendedFullUBipartiteGraphBase Parent;
1.143 + FullUBipartiteGraph(int upperNodeNum, int lowerNodeNum) {
1.144 Parent::construct(upperNodeNum, lowerNodeNum);
1.145 }
1.146 };