lemon-0.x: comparison lemon/graph

equal deleted inserted replaced

-:685f1667d96e
+:b970e4c777ab
 return graph->maxEdgeId();
 }
 typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
-NodeNotifier& getNotifier(Node) const {
+NodeNotifier& notifier(Node) const {
-return graph->getNotifier(Node());
+return graph->notifier(Node());
 }
 typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
-EdgeNotifier& getNotifier(Edge) const {
+EdgeNotifier& notifier(Edge) const {
-return graph->getNotifier(Edge());
+return graph->notifier(Edge());
 }
 template <typename _Value>
 class NodeMap : public Graph::template NodeMap<_Value> {
 public:
 AlterableUndirGraphAdaptor()
 : Parent(), edge_notifier(*this), edge_notifier_proxy(*this) {}
 void setGraph(_Graph& graph) {
 Parent::setGraph(graph);
-edge_notifier_proxy.setNotifier(graph.getNotifier(GraphEdge()));
+edge_notifier_proxy.setNotifier(graph.notifier(GraphEdge()));
 }
 public:
 ~AlterableUndirGraphAdaptor() {
 typedef typename Parent::UEdge UEdge;
 typedef typename Parent::Edge Edge;
 typedef typename Parent::EdgeNotifier UEdgeNotifier;
-using Parent::getNotifier;
+using Parent::notifier;
 typedef AlterationNotifier<AlterableUndirGraphAdaptor,
 Edge> EdgeNotifier;
-EdgeNotifier& getNotifier(Edge) const { return edge_notifier; }
+EdgeNotifier& notifier(Edge) const { return edge_notifier; }
 protected:
 class NotifierProxy : public Graph::EdgeNotifier::ObserverBase {
 public:
 virtual void add(const GraphEdge& ge) {
 std::vector<Edge> edges;
 edges.push_back(AdaptorBase::Parent::direct(ge, true));
 edges.push_back(AdaptorBase::Parent::direct(ge, false));
-adaptor->getNotifier(Edge()).add(edges);
+adaptor->notifier(Edge()).add(edges);
 }
 virtual void add(const std::vector<GraphEdge>& ge) {
 std::vector<Edge> edges;
 for (int i = 0; i < (int)ge.size(); ++i) {
 edges.push_back(AdaptorBase::Parent::direct(ge[i], true));
 edges.push_back(AdaptorBase::Parent::direct(ge[i], false));
 }
-adaptor->getNotifier(Edge()).add(edges);
+adaptor->notifier(Edge()).add(edges);
 }
 virtual void erase(const GraphEdge& ge) {
 std::vector<Edge> edges;
 edges.push_back(AdaptorBase::Parent::direct(ge, true));
 edges.push_back(AdaptorBase::Parent::direct(ge, false));
-adaptor->getNotifier(Edge()).erase(edges);
+adaptor->notifier(Edge()).erase(edges);
 }
 virtual void erase(const std::vector<GraphEdge>& ge) {
 std::vector<Edge> edges;
 for (int i = 0; i < (int)ge.size(); ++i) {
 edges.push_back(AdaptorBase::Parent::direct(ge[i], true));
 edges.push_back(AdaptorBase::Parent::direct(ge[i], false));
 }
-adaptor->getNotifier(Edge()).erase(edges);
+adaptor->notifier(Edge()).erase(edges);
 }
 virtual void build() {
-adaptor->getNotifier(Edge()).build();
+adaptor->notifier(Edge()).build();
 }
 virtual void clear() {
-adaptor->getNotifier(Edge()).clear();
+adaptor->notifier(Edge()).clear();
 }
 const AdaptorBase* adaptor;
 };
 AlterableSplitGraphAdaptor()
 : Parent(), node_notifier(*this), node_notifier_proxy(*this) {}
 void setGraph(_Graph& graph) {
 Parent::setGraph(graph);
-node_notifier_proxy.setNotifier(graph.getNotifier(GraphNode()));
+node_notifier_proxy.setNotifier(graph.notifier(GraphNode()));
 }
 public:
 ~AlterableSplitGraphAdaptor() {
 }
 typedef AlterationNotifier<AlterableSplitGraphAdaptor, Node> NodeNotifier;
 typedef InvalidType EdgeNotifier;
-NodeNotifier& getNotifier(Node) const { return node_notifier; }
+NodeNotifier& notifier(Node) const { return node_notifier; }
 protected:
 class NodeNotifierProxy : public Graph::NodeNotifier::ObserverBase {
 public:
 virtual void add(const GraphNode& gn) {
 std::vector<Node> nodes;
 nodes.push_back(AdaptorBase::Parent::inNode(gn));
 nodes.push_back(AdaptorBase::Parent::outNode(gn));
-adaptor->getNotifier(Node()).add(nodes);
+adaptor->notifier(Node()).add(nodes);
 }
 virtual void add(const std::vector<GraphNode>& gn) {
 std::vector<Node> nodes;
 for (int i = 0; i < (int)gn.size(); ++i) {
 nodes.push_back(AdaptorBase::Parent::inNode(gn[i]));
 nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
 }
-adaptor->getNotifier(Node()).add(nodes);
+adaptor->notifier(Node()).add(nodes);
 }
 virtual void erase(const GraphNode& gn) {
 std::vector<Node> nodes;
 nodes.push_back(AdaptorBase::Parent::inNode(gn));
 nodes.push_back(AdaptorBase::Parent::outNode(gn));
-adaptor->getNotifier(Node()).erase(nodes);
+adaptor->notifier(Node()).erase(nodes);
 }
 virtual void erase(const std::vector<GraphNode>& gn) {
 std::vector<Node> nodes;
 for (int i = 0; i < (int)gn.size(); ++i) {
 nodes.push_back(AdaptorBase::Parent::inNode(gn[i]));
 nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
 }
-adaptor->getNotifier(Node()).erase(nodes);
+adaptor->notifier(Node()).erase(nodes);
 }
 virtual void build() {
-adaptor->getNotifier(Node()).build();
+adaptor->notifier(Node()).build();
 }
 virtual void clear() {
-adaptor->getNotifier(Node()).clear();
+adaptor->notifier(Node()).clear();
 }
 const AdaptorBase* adaptor;
 };
 : Parent(), node_notifier(*this), edge_notifier(*this),
 node_notifier_proxy(*this), edge_notifier_proxy(*this) {}
 void setGraph(_Graph& graph) {
 Parent::setGraph(graph);
-node_notifier_proxy.setNotifier(graph.getNotifier(GraphNode()));
+node_notifier_proxy.setNotifier(graph.notifier(GraphNode()));
-edge_notifier_proxy.setNotifier(graph.getNotifier(GraphEdge()));
+edge_notifier_proxy.setNotifier(graph.notifier(GraphEdge()));
 }
 public:
 ~AlterableSplitGraphAdaptor() {
 }
 typedef AlterationNotifier<AlterableSplitGraphAdaptor, Node> NodeNotifier;
 typedef AlterationNotifier<AlterableSplitGraphAdaptor, Edge> EdgeNotifier;
-NodeNotifier& getNotifier(Node) const { return node_notifier; }
+NodeNotifier& notifier(Node) const { return node_notifier; }
-EdgeNotifier& getNotifier(Edge) const { return edge_notifier; }
+EdgeNotifier& notifier(Edge) const { return edge_notifier; }
 protected:
 class NodeNotifierProxy : public Graph::NodeNotifier::ObserverBase {
 public:
 virtual void add(const GraphNode& gn) {
 std::vector<Node> nodes;
 nodes.push_back(AdaptorBase::Parent::inNode(gn));
 nodes.push_back(AdaptorBase::Parent::outNode(gn));
-adaptor->getNotifier(Node()).add(nodes);
+adaptor->notifier(Node()).add(nodes);
-adaptor->getNotifier(Edge()).add(AdaptorBase::Parent::edge(gn));
+adaptor->notifier(Edge()).add(AdaptorBase::Parent::edge(gn));
 }
 virtual void add(const std::vector<GraphNode>& gn) {
 std::vector<Node> nodes;
 std::vector<Edge> edges;
 for (int i = 0; i < (int)gn.size(); ++i) {
 edges.push_back(AdaptorBase::Parent::edge(gn[i]));
 nodes.push_back(AdaptorBase::Parent::inNode(gn[i]));
 nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
 }
-adaptor->getNotifier(Node()).add(nodes);
+adaptor->notifier(Node()).add(nodes);
-adaptor->getNotifier(Edge()).add(edges);
+adaptor->notifier(Edge()).add(edges);
 }
 virtual void erase(const GraphNode& gn) {
-adaptor->getNotifier(Edge()).erase(AdaptorBase::Parent::edge(gn));
+adaptor->notifier(Edge()).erase(AdaptorBase::Parent::edge(gn));
 std::vector<Node> nodes;
 nodes.push_back(AdaptorBase::Parent::inNode(gn));
 nodes.push_back(AdaptorBase::Parent::outNode(gn));
-adaptor->getNotifier(Node()).erase(nodes);
+adaptor->notifier(Node()).erase(nodes);
 }
 virtual void erase(const std::vector<GraphNode>& gn) {
 std::vector<Node> nodes;
 std::vector<Edge> edges;
 for (int i = 0; i < (int)gn.size(); ++i) {
 edges.push_back(AdaptorBase::Parent::edge(gn[i]));
 nodes.push_back(AdaptorBase::Parent::inNode(gn[i]));
 nodes.push_back(AdaptorBase::Parent::outNode(gn[i]));
 }
-adaptor->getNotifier(Edge()).erase(edges);
+adaptor->notifier(Edge()).erase(edges);
-adaptor->getNotifier(Node()).erase(nodes);
+adaptor->notifier(Node()).erase(nodes);
 }
 virtual void build() {
 std::vector<Edge> edges;
-const typename Parent::Notifier* notifier = Parent::getNotifier();
+const typename Parent::Notifier* notifier = Parent::notifier();
 GraphNode it;
 for (notifier->first(it); it != INVALID; notifier->next(it)) {
 edges.push_back(AdaptorBase::Parent::edge(it));
 }
-adaptor->getNotifier(Node()).build();
+adaptor->notifier(Node()).build();
-adaptor->getNotifier(Edge()).add(edges);
+adaptor->notifier(Edge()).add(edges);
 }
 virtual void clear() {
 std::vector<Edge> edges;
-const typename Parent::Notifier* notifier = Parent::getNotifier();
+const typename Parent::Notifier* notifier = Parent::notifier();
 GraphNode it;
 for (notifier->first(it); it != INVALID; notifier->next(it)) {
 edges.push_back(AdaptorBase::Parent::edge(it));
 }
-adaptor->getNotifier(Edge()).erase(edges);
+adaptor->notifier(Edge()).erase(edges);
-adaptor->getNotifier(Node()).clear();
+adaptor->notifier(Node()).clear();
 }
 const AdaptorBase* adaptor;
 };
 protected:
 virtual void add(const GraphEdge& ge) {
-adaptor->getNotifier(Edge()).add(AdaptorBase::edge(ge));
+adaptor->notifier(Edge()).add(AdaptorBase::edge(ge));
 }
 virtual void add(const std::vector<GraphEdge>& ge) {
 std::vector<Edge> edges;
 for (int i = 0; i < (int)ge.size(); ++i) {
 edges.push_back(AdaptorBase::edge(ge[i]));
 }
-adaptor->getNotifier(Edge()).add(edges);
+adaptor->notifier(Edge()).add(edges);
 }
 virtual void erase(const GraphEdge& ge) {
-adaptor->getNotifier(Edge()).erase(AdaptorBase::edge(ge));
+adaptor->notifier(Edge()).erase(AdaptorBase::edge(ge));
 }
 virtual void erase(const std::vector<GraphEdge>& ge) {
 std::vector<Edge> edges;
 for (int i = 0; i < (int)ge.size(); ++i) {
 edges.push_back(AdaptorBase::edge(ge[i]));
 }
-adaptor->getNotifier(Edge()).erase(edges);
+adaptor->notifier(Edge()).erase(edges);
 }
 virtual void build() {
 std::vector<Edge> edges;
-const typename Parent::Notifier* notifier = Parent::getNotifier();
+const typename Parent::Notifier* notifier = Parent::notifier();
 GraphEdge it;
 for (notifier->first(it); it != INVALID; notifier->next(it)) {
 edges.push_back(AdaptorBase::Parent::edge(it));
 }
-adaptor->getNotifier(Edge()).add(edges);
+adaptor->notifier(Edge()).add(edges);
 }
 virtual void clear() {
 std::vector<Edge> edges;
-const typename Parent::Notifier* notifier = Parent::getNotifier();
+const typename Parent::Notifier* notifier = Parent::notifier();
 GraphEdge it;
 for (notifier->first(it); it != INVALID; notifier->next(it)) {
 edges.push_back(AdaptorBase::Parent::edge(it));
 }
-adaptor->getNotifier(Edge()).erase(edges);
+adaptor->notifier(Edge()).erase(edges);
 }
 const AdaptorBase* adaptor;
 };

changeset 2385	096d83158d41
parent 2340	03c71d754990
child 2386	81b47fc5c444