[Lemon-commits] [lemon_svn] deba: r1429 - hugo/trunk/src/lemon
Lemon SVN
svn at lemon.cs.elte.hu
Mon Nov 6 20:45:23 CET 2006
Author: deba
Date: Thu Dec 16 13:26:57 2004
New Revision: 1429
Added:
hugo/trunk/src/lemon/alteration_notifier.h
- copied, changed from r1428, /hugo/trunk/src/lemon/alteration_observer_registry.h
Removed:
hugo/trunk/src/lemon/alteration_observer_registry.h
Modified:
hugo/trunk/src/lemon/Makefile.am
hugo/trunk/src/lemon/array_map.h
hugo/trunk/src/lemon/clearable_graph_extender.h
hugo/trunk/src/lemon/erasable_graph_extender.h
hugo/trunk/src/lemon/extendable_graph_extender.h
hugo/trunk/src/lemon/full_graph.h
hugo/trunk/src/lemon/list_graph.h
hugo/trunk/src/lemon/smart_graph.h
hugo/trunk/src/lemon/vector_map.h
Log:
AlterationObserverRegistry -> AlterationNotifier
2 step
Modified: hugo/trunk/src/lemon/Makefile.am
==============================================================================
--- hugo/trunk/src/lemon/Makefile.am (original)
+++ hugo/trunk/src/lemon/Makefile.am Thu Dec 16 13:26:57 2004
@@ -14,7 +14,7 @@
invalid.h \
kruskal.h \
list_graph.h \
- alteration_observer_registry.h \
+ alteration_notifier.h \
maps.h \
min_cost_flow.h \
suurballe.h \
Copied: hugo/trunk/src/lemon/alteration_notifier.h (from r1428, /hugo/trunk/src/lemon/alteration_observer_registry.h)
==============================================================================
--- /hugo/trunk/src/lemon/alteration_observer_registry.h (original)
+++ hugo/trunk/src/lemon/alteration_notifier.h Thu Dec 16 13:26:57 2004
@@ -187,14 +187,14 @@
/// Copy constructor of the AlterationNotifier.
/// It creates only an empty registry because the copiable
/// registry's observers have to be registered still into that registry.
- AlterationNotifier(const AlterationObserverRegistry&) {}
+ AlterationNotifier(const AlterationNotifier&) {}
/// Assign operator.
/// Assign operator for the AlterationNotifier.
/// It makes the registry only empty because the copiable
/// registry's observers have to be registered still into that registry.
- AlterationNotifier& operator=(const AlterationObserverRegistry&) {
+ AlterationNotifier& operator=(const AlterationNotifier&) {
typename Container::iterator it;
for (it = container.begin(); it != container.end(); ++it) {
(*it)->registry = 0;
@@ -308,9 +308,9 @@
typedef typename Parent::Edge Edge;
/// The edge observer registry.
- typedef AlterationNotifier<Edge> EdgeObserverRegistry;
+ typedef AlterationNotifier<Edge> EdgeNotifier;
/// The node observer registry.
- typedef AlterationNotifier<Node> NodeObserverRegistry;
+ typedef AlterationNotifier<Node> NodeNotifier;
protected:
@@ -321,11 +321,11 @@
public:
- EdgeNotifier& getObserverRegistry(Edge = INVALID) const {
+ EdgeNotifier& getNotifier(Edge = INVALID) const {
return edge_observers;
}
- NodeNotifier& getObserverRegistry(Node = INVALID) const {
+ NodeNotifier& getNotifier(Node = INVALID) const {
return node_observers;
}
@@ -358,7 +358,7 @@
typedef typename Parent::UndirEdge UndirEdge;
/// The edge observer registry.
- typedef AlterationNotifier<UndirEdge> UndirEdgeObserverRegistry;
+ typedef AlterationNotifier<UndirEdge> UndirEdgeNotifier;
protected:
@@ -367,7 +367,7 @@
public:
using Parent::getNotifier;
- UndirEdgeNotifier& getObserverRegistry(UndirEdge) const {
+ UndirEdgeNotifier& getNotifier(UndirEdge) const {
return undir_edge_observers;
}
Modified: hugo/trunk/src/lemon/array_map.h
==============================================================================
--- hugo/trunk/src/lemon/array_map.h (original)
+++ hugo/trunk/src/lemon/array_map.h Thu Dec 16 13:26:57 2004
@@ -43,7 +43,7 @@
typename _Item,
typename _ItemIt,
typename _Value>
- class ArrayMap : public AlterationObserverRegistry<_Item>::ObserverBase {
+ class ArrayMap : public AlterationNotifier<_Item>::ObserverBase {
public:
@@ -52,7 +52,7 @@
/// The key type of the maps.
typedef _Item Key;
- typedef AlterationObserverRegistry<_Item> Registry;
+ typedef AlterationNotifier<_Item> Registry;
private:
/// The iterator to iterate on the keys.
@@ -88,7 +88,7 @@
/** Graph and Registry initialized map constructor.
*/
ArrayMap(const Graph& _g) : graph(&_g) {
- attach(_g.getObserverRegistry(_Item()));
+ attach(_g.getNotifier(_Item()));
allocate_memory();
for (KeyIt it(*graph); it != INVALID; ++it) {
int id = graph->id(it);;
@@ -101,7 +101,7 @@
/// It constrates a map and initialize all of the the map.
ArrayMap(const Graph& _g, const Value& _v) : graph(&_g) {
- attach(_g.getObserverRegistry(_Item()));
+ attach(_g.getNotifier(_Item()));
allocate_memory();
for (KeyIt it(*graph); it != INVALID; ++it) {
int id = graph->id(it);;
@@ -336,11 +336,11 @@
typedef typename Parent::Node Node;
typedef typename Parent::NodeIt NodeIt;
- typedef typename Parent::NodeObserverRegistry NodeObserverRegistry;
+ typedef typename Parent::NodeNotifier NodeObserverRegistry;
typedef typename Parent::Edge Edge;
typedef typename Parent::EdgeIt EdgeIt;
- typedef typename Parent::EdgeObserverRegistry EdgeObserverRegistry;
+ typedef typename Parent::EdgeNotifier EdgeObserverRegistry;
Modified: hugo/trunk/src/lemon/clearable_graph_extender.h
==============================================================================
--- hugo/trunk/src/lemon/clearable_graph_extender.h (original)
+++ hugo/trunk/src/lemon/clearable_graph_extender.h Thu Dec 16 13:26:57 2004
@@ -18,8 +18,8 @@
typedef typename Parent::Edge Edge;
void clear() {
- Parent::getObserverRegistry(Node()).clear();
- Parent::getObserverRegistry(Edge()).clear();
+ Parent::getNotifier(Node()).clear();
+ Parent::getNotifier(Edge()).clear();
Parent::clear();
}
@@ -36,9 +36,9 @@
typedef typename Parent::Edge Edge;
void clear() {
- Parent::getObserverRegistry(Node()).clear();
- Parent::getObserverRegistry(UndirEdge()).clear();
- Parent::getObserverRegistry(Edge()).clear();
+ Parent::getNotifier(Node()).clear();
+ Parent::getNotifier(UndirEdge()).clear();
+ Parent::getNotifier(Edge()).clear();
Parent::clear();
}
Modified: hugo/trunk/src/lemon/erasable_graph_extender.h
==============================================================================
--- hugo/trunk/src/lemon/erasable_graph_extender.h (original)
+++ hugo/trunk/src/lemon/erasable_graph_extender.h Thu Dec 16 13:26:57 2004
@@ -32,12 +32,12 @@
Parent::firstIn(edge, node);
}
- Parent::getObserverRegistry(Node()).erase(node);
+ Parent::getNotifier(Node()).erase(node);
Parent::erase(node);
}
void erase(const Edge& edge) {
- Parent::getObserverRegistry(Edge()).erase(edge);
+ Parent::getNotifier(Edge()).erase(edge);
Parent::erase(edge);
}
@@ -62,14 +62,14 @@
Parent::firstOut(edge, node);
}
- Parent::getObserverRegistry(Node()).erase(node);
+ Parent::getNotifier(Node()).erase(node);
Parent::erase(node);
}
void erase(const UndirEdge& uedge) {
- Parent::getObserverRegistry(Edge()).erase(Edge(uedge,true));
- Parent::getObserverRegistry(Edge()).erase(Edge(uedge,false));
- Parent::getObserverRegistry(UndirEdge()).erase(uedge);
+ Parent::getNotifier(Edge()).erase(Edge(uedge,true));
+ Parent::getNotifier(Edge()).erase(Edge(uedge,false));
+ Parent::getNotifier(UndirEdge()).erase(uedge);
Parent::erase(uedge);
}
Modified: hugo/trunk/src/lemon/extendable_graph_extender.h
==============================================================================
--- hugo/trunk/src/lemon/extendable_graph_extender.h (original)
+++ hugo/trunk/src/lemon/extendable_graph_extender.h Thu Dec 16 13:26:57 2004
@@ -17,13 +17,13 @@
Node addNode() {
Node node = Parent::addNode();
- Parent::getObserverRegistry(Node()).add(node);
+ Parent::getNotifier(Node()).add(node);
return node;
}
Edge addEdge(const Node& from, const Node& to) {
Edge edge = Parent::addEdge(from, to);
- Parent::getObserverRegistry(Edge()).add(edge);
+ Parent::getNotifier(Edge()).add(edge);
return edge;
}
@@ -42,18 +42,18 @@
Node addNode() {
Node node = Parent::addNode();
- Parent::getObserverRegistry(Node()).add(node);
+ Parent::getNotifier(Node()).add(node);
return node;
}
UndirEdge addEdge(const Node& from, const Node& to) {
UndirEdge uedge = Parent::addEdge(from, to);
- Parent::getObserverRegistry(UndirEdge()).add(uedge);
+ Parent::getNotifier(UndirEdge()).add(uedge);
Edge edge_forward(uedge, true);
Edge edge_backward(uedge, false);
- Parent::getObserverRegistry(Edge()).add(edge_forward);
- Parent::getObserverRegistry(Edge()).add(edge_backward);
+ Parent::getNotifier(Edge()).add(edge_forward);
+ Parent::getNotifier(Edge()).add(edge_backward);
return uedge;
}
Modified: hugo/trunk/src/lemon/full_graph.h
==============================================================================
--- hugo/trunk/src/lemon/full_graph.h (original)
+++ hugo/trunk/src/lemon/full_graph.h Thu Dec 16 13:26:57 2004
@@ -21,7 +21,7 @@
#include <lemon/iterable_graph_extender.h>
-#include <lemon/alteration_observer_registry.h>
+#include <lemon/alteration_notifier.h>
#include <lemon/default_map.h>
#include <lemon/invalid.h>
Modified: hugo/trunk/src/lemon/list_graph.h
==============================================================================
--- hugo/trunk/src/lemon/list_graph.h (original)
+++ hugo/trunk/src/lemon/list_graph.h Thu Dec 16 13:26:57 2004
@@ -25,7 +25,7 @@
#include <lemon/clearable_graph_extender.h>
#include <lemon/extendable_graph_extender.h>
#include <lemon/iterable_graph_extender.h>
-#include <lemon/alteration_observer_registry.h>
+#include <lemon/alteration_notifier.h>
#include <lemon/default_map.h>
#include <lemon/undir_graph_extender.h>
@@ -399,8 +399,8 @@
///\warning SnapShots cannot be nested.
///\ingroup graphs
///\todo \c SnapShot or \c Snapshot?
- class SnapShot : protected AlterationObserverRegistry<Node>::ObserverBase,
- protected AlterationObserverRegistry<Edge>::ObserverBase
+ class SnapShot : protected AlterationNotifier<Node>::ObserverBase,
+ protected AlterationNotifier<Edge>::ObserverBase
{
protected:
@@ -430,16 +430,16 @@
void regist(ListGraph &_g) {
g=&_g;
- AlterationObserverRegistry<Node>::ObserverBase::
+ AlterationNotifier<Node>::ObserverBase::
attach(g->node_observers);
- AlterationObserverRegistry<Edge>::ObserverBase::
+ AlterationNotifier<Edge>::ObserverBase::
attach(g->edge_observers);
}
void deregist() {
- AlterationObserverRegistry<Node>::ObserverBase::
+ AlterationNotifier<Node>::ObserverBase::
detach();
- AlterationObserverRegistry<Edge>::ObserverBase::
+ AlterationNotifier<Edge>::ObserverBase::
detach();
g=0;
}
Modified: hugo/trunk/src/lemon/smart_graph.h
==============================================================================
--- hugo/trunk/src/lemon/smart_graph.h (original)
+++ hugo/trunk/src/lemon/smart_graph.h Thu Dec 16 13:26:57 2004
@@ -28,7 +28,7 @@
#include <lemon/clearable_graph_extender.h>
#include <lemon/extendable_graph_extender.h>
#include <lemon/iterable_graph_extender.h>
-#include <lemon/alteration_observer_registry.h>
+#include <lemon/alteration_notifier.h>
#include <lemon/default_map.h>
#include <lemon/undir_graph_extender.h>
Modified: hugo/trunk/src/lemon/vector_map.h
==============================================================================
--- hugo/trunk/src/lemon/vector_map.h (original)
+++ hugo/trunk/src/lemon/vector_map.h Thu Dec 16 13:26:57 2004
@@ -20,7 +20,7 @@
#include <vector>
#include <algorithm>
-#include <lemon/alteration_observer_registry.h>
+#include <lemon/alteration_notifier.h>
///\ingroup graphmaps
///\file
@@ -37,7 +37,7 @@
/// the container functionality. This map factory
/// uses the std::vector to implement the container function.
///
- /// \param Registry The AlterationObserverRegistry that will notify this map.
+ /// \param Registry The AlterationNotifier that will notify this map.
/// \param IdMap The IdMap type of the graph items.
/// \param Value The value type of the map.
///
@@ -47,7 +47,7 @@
template <typename _Graph,
typename _Item,
typename _Value>
- class VectorMap : public AlterationObserverRegistry<_Item>::ObserverBase {
+ class VectorMap : public AlterationNotifier<_Item>::ObserverBase {
public:
/// The graph type of the map.
@@ -55,7 +55,7 @@
/// The key type of the map.
typedef _Item Key;
/// The id map type of the map.
- typedef AlterationObserverRegistry<_Item> Registry;
+ typedef AlterationNotifier<_Item> Registry;
/// The value type of the map.
typedef _Value Value;
@@ -89,7 +89,7 @@
/// It adds all the items of the graph to the map.
VectorMap(const Graph& _g) : graph(&_g) {
- attach(_g.getObserverRegistry(_Item()));
+ attach(_g.getNotifier(_Item()));
build();
}
@@ -99,7 +99,7 @@
/// It adds all the items of the graph to the map.
VectorMap(const Graph& _g, const Value& _v) : graph(&_g) {
- attach(_g.getObserverRegistry(_Item()));
+ attach(_g.getNotifier(_Item()));
container.resize(graph->maxId(_Item()) + 1, _v);
}
@@ -224,12 +224,12 @@
typedef typename Parent::Node Node;
typedef typename Parent::NodeIt NodeIt;
typedef typename Parent::NodeIdMap NodeIdMap;
- typedef typename Parent::NodeObserverRegistry NodeObserverRegistry;
+ typedef typename Parent::NodeNotifier NodeObserverRegistry;
typedef typename Parent::Edge Edge;
typedef typename Parent::EdgeIt EdgeIt;
typedef typename Parent::EdgeIdMap EdgeIdMap;
- typedef typename Parent::EdgeObserverRegistry EdgeObserverRegistry;
+ typedef typename Parent::EdgeNotifier EdgeObserverRegistry;
More information about the Lemon-commits
mailing list