lemon-0.x: comparison lemon/full

equal deleted inserted replaced

-:f1795a0cc47f
+:b288123b6fa2
 public:
 FullUGraph(int n) { construct(n); }
 };
-class FullUBipartiteGraphBase {
+class FullBpUGraphBase {
 protected:
-int _upperNodeNum;
+int _aNodeNum;
-int _lowerNodeNum;
+int _bNodeNum;
 int _edgeNum;
 public:
 class NodeSetError : public LogicError {
 virtual const char* exceptionName() const {
-	return "lemon::FullUBipartiteGraph::NodeSetError";
+	return "lemon::FullBpUGraph::NodeSetError";
 }
 };
 class Node {
-friend class FullUBipartiteGraphBase;
+friend class FullBpUGraphBase;
 protected:
 int id;
 Node(int _id) : id(_id) {}
 public:
 bool operator!=(const Node i) const {return id!=i.id;}
 bool operator<(const Node i) const {return id<i.id;}
 };
 class Edge {
-friend class FullUBipartiteGraphBase;
+friend class FullBpUGraphBase;
 protected:
 int id;
 Edge(int _id) { id = _id;}
 public:
 bool operator==(const Edge i) const {return id==i.id;}
 bool operator!=(const Edge i) const {return id!=i.id;}
 bool operator<(const Edge i) const {return id<i.id;}
 };
-void construct(int upperNodeNum, int lowerNodeNum) {
+void construct(int aNodeNum, int bNodeNum) {
-_upperNodeNum = upperNodeNum;
+_aNodeNum = aNodeNum;
-_lowerNodeNum = lowerNodeNum;
+_bNodeNum = bNodeNum;
-_edgeNum = upperNodeNum * lowerNodeNum;
+_edgeNum = aNodeNum * bNodeNum;
 }
-void firstUpper(Node& node) const {
+void firstANode(Node& node) const {
-node.id = 2 * _upperNodeNum - 2;
+node.id = 2 * _aNodeNum - 2;
 if (node.id < 0) node.id = -1;
 }
-void nextUpper(Node& node) const {
+void nextANode(Node& node) const {
 node.id -= 2;
 if (node.id < 0) node.id = -1;
 }
-void firstLower(Node& node) const {
+void firstBNode(Node& node) const {
-node.id = 2 * _lowerNodeNum - 1;
+node.id = 2 * _bNodeNum - 1;
 }
-void nextLower(Node& node) const {
+void nextBNode(Node& node) const {
 node.id -= 2;
 }
 void first(Node& node) const {
-if (_upperNodeNum > 0) {
+if (_aNodeNum > 0) {
-	node.id = 2 * _upperNodeNum - 2;
+	node.id = 2 * _aNodeNum - 2;
 } else {
-	node.id = 2 * _lowerNodeNum - 1;
+	node.id = 2 * _bNodeNum - 1;
 }
 }
 void next(Node& node) const {
 node.id -= 2;
 if (node.id == -2) {
-	node.id = 2 * _lowerNodeNum - 1;
+	node.id = 2 * _bNodeNum - 1;
 }
 }
 void first(Edge& edge) const {
 edge.id = _edgeNum - 1;
 }
 void next(Edge& edge) const {
 --edge.id;
 }
-void firstDown(Edge& edge, const Node& node) const {
+void firstOut(Edge& edge, const Node& node) const {
 LEMON_ASSERT((node.id & 1) == 0, NodeSetError());
-edge.id = (node.id >> 1) * _lowerNodeNum;
+edge.id = (node.id >> 1) * _bNodeNum;
 }
-void nextDown(Edge& edge) const {
+void nextOut(Edge& edge) const {
 ++(edge.id);
-if (edge.id % _lowerNodeNum == 0) edge.id = -1;
+if (edge.id % _bNodeNum == 0) edge.id = -1;
 }
-void firstUp(Edge& edge, const Node& node) const {
+void firstIn(Edge& edge, const Node& node) const {
 LEMON_ASSERT((node.id & 1) == 1, NodeSetError());
 edge.id = (node.id >> 1);
 }
-void nextUp(Edge& edge) const {
+void nextIn(Edge& edge) const {
-edge.id += _lowerNodeNum;
+edge.id += _bNodeNum;
 if (edge.id >= _edgeNum) edge.id = -1;
 }
 static int id(const Node& node) {
 return node.id;
 }
 static Node nodeFromId(int id) {
 return Node(id);
 }
 int maxNodeId() const {
-return _upperNodeNum > _lowerNodeNum ?
+return _aNodeNum > _bNodeNum ?
-	_upperNodeNum * 2 - 2 : _lowerNodeNum * 2 - 1;
+	_aNodeNum * 2 - 2 : _bNodeNum * 2 - 1;
 }
 static int id(const Edge& edge) {
 return edge.id;
 }
 }
 int maxEdgeId() const {
 return _edgeNum - 1;
 }
-static int upperId(const Node& node) {
+static int aNodeId(const Node& node) {
 return node.id >> 1;
 }
-static Node fromUpperId(int id, Node) {
+static Node fromANodeId(int id, Node) {
 return Node(id << 1);
 }
-int maxUpperId() const {
+int maxANodeId() const {
-return _upperNodeNum;
+return _aNodeNum;
 }
-static int lowerId(const Node& node) {
+static int bNodeId(const Node& node) {
 return node.id >> 1;
 }
-static Node fromLowerId(int id) {
+static Node fromBNodeId(int id) {
 return Node((id << 1) + 1);
 }
-int maxLowerId() const {
+int maxBNodeId() const {
-return _lowerNodeNum;
+return _bNodeNum;
 }
-Node upperNode(const Edge& edge) const {
+Node aNode(const Edge& edge) const {
-return Node((edge.id / _lowerNodeNum) << 1);
+return Node((edge.id / _bNodeNum) << 1);
 }
-Node lowerNode(const Edge& edge) const {
+Node bNode(const Edge& edge) const {
-return Node(((edge.id % _lowerNodeNum) << 1) + 1);
+return Node(((edge.id % _bNodeNum) << 1) + 1);
 }
-static bool upper(const Node& node) {
+static bool aNode(const Node& node) {
 return (node.id & 1) == 0;
 }
-static bool lower(const Node& node) {
+static bool bNode(const Node& node) {
 return (node.id & 1) == 1;
 }
-static Node upperNode(int index) {
+static Node aNode(int index) {
 return Node(index << 1);
 }
-static Node lowerNode(int index) {
+static Node bNode(int index) {
 return Node((index << 1) + 1);
 }
 };
-typedef StaticMappableUBipartiteGraphExtender<
+typedef StaticMappableBpUGraphExtender<
-IterableUBipartiteGraphExtender<
+IterableBpUGraphExtender<
-AlterableUBipartiteGraphExtender<
+AlterableBpUGraphExtender<
-UBipartiteGraphExtender <
+BpUGraphExtender <
-FullUBipartiteGraphBase> > > >
+FullBpUGraphBase> > > >
-ExtendedFullUBipartiteGraphBase;
+ExtendedFullBpUGraphBase;
-class FullUBipartiteGraph :
+/// \ingroup graphs
-public ExtendedFullUBipartiteGraphBase {
+///
-public:
+/// \brief An undirected full bipartite graph class.
-typedef ExtendedFullUBipartiteGraphBase Parent;
+///
-FullUBipartiteGraph(int upperNodeNum, int lowerNodeNum) {
+/// This is a simple and fast bipartite undirected full graph implementation.
-Parent::construct(upperNodeNum, lowerNodeNum);
+/// It is completely static, so you can neither add nor delete either
+/// edges or nodes.
+///
+/// \sa FullGraph
+///
+/// \author Balazs Dezso
+class FullBpUGraph :
+public ExtendedFullBpUGraphBase {
+public:
+typedef ExtendedFullBpUGraphBase Parent;
+FullBpUGraph(int aNodeNum, int bNodeNum) {
+Parent::construct(aNodeNum, bNodeNum);
 }
 };
 } //namespace lemon

changeset 1933	a876a3d6a4c7
parent 1909	2d806130e700
child 1956	a055123339d5