[Lemon-commits] [lemon_svn] klao: r1321 - in hugo/branches/graph_factory/src: lemon work/klao

[Lemon SVN]

Author: klao
Date: Thu Oct 28 00:22:22 2004
New Revision: 1321

Removed:
   hugo/branches/graph_factory/src/lemon/graph_extender.h
Modified:
   hugo/branches/graph_factory/src/lemon/Makefile.am
   hugo/branches/graph_factory/src/lemon/alteration_observer_registry.h
   hugo/branches/graph_factory/src/lemon/array_map.h
   hugo/branches/graph_factory/src/lemon/clearable_graph_extender.h
   hugo/branches/graph_factory/src/lemon/default_map.h
   hugo/branches/graph_factory/src/lemon/iterable_graph_extender.h
   hugo/branches/graph_factory/src/lemon/list_graph.h
   hugo/branches/graph_factory/src/lemon/smart_graph.h
   hugo/branches/graph_factory/src/work/klao/TODO

Log:
Many small (and not very important) changes.


Modified: hugo/branches/graph_factory/src/lemon/Makefile.am
==============================================================================
--- hugo/branches/graph_factory/src/lemon/Makefile.am	(original)
+++ hugo/branches/graph_factory/src/lemon/Makefile.am	Thu Oct 28 00:22:22 2004
@@ -26,6 +26,9 @@
 	unionfind.h							\
 	vector_map.h                                                    \
 	xy.h								\
+	concept_check.h							\
+	map_defines.h							\
+	map_bits.h							\
 	iterable_graph_extender.h					\
 	idmappable_graph_extender.h				   	\
 	extendable_graph_extender.h					\

Modified: hugo/branches/graph_factory/src/lemon/alteration_observer_registry.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/alteration_observer_registry.h	(original)
+++ hugo/branches/graph_factory/src/lemon/alteration_observer_registry.h	Thu Oct 28 00:22:22 2004
@@ -124,7 +124,7 @@
       Registry* registry;
       int registry_index;
 
-    protected:
+    public:
 
       /// \brief The member function to notificate the observer about an
       /// item is added to the container.

Modified: hugo/branches/graph_factory/src/lemon/array_map.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/array_map.h	(original)
+++ hugo/branches/graph_factory/src/lemon/array_map.h	Thu Oct 28 00:22:22 2004
@@ -20,7 +20,6 @@
 #include <memory>
 
 #include <lemon/map_iterator.h>
-#include <lemon/map_bits.h>
 
 ///\ingroup graphmaps
 ///\file

Modified: hugo/branches/graph_factory/src/lemon/clearable_graph_extender.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/clearable_graph_extender.h	(original)
+++ hugo/branches/graph_factory/src/lemon/clearable_graph_extender.h	Thu Oct 28 00:22:22 2004
@@ -15,9 +15,6 @@
     typedef ClearableGraphExtender Graph;
     typedef _Base Parent;
 
-    typedef typename Parent::Node Node;
-    typedef typename Parent::Edge Edge;
-
     void clear() {
       Parent::getNodeObserverRegistry().clear();
       Parent::getEdgeObserverRegistry().clear();

Modified: hugo/branches/graph_factory/src/lemon/default_map.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/default_map.h	(original)
+++ hugo/branches/graph_factory/src/lemon/default_map.h	Thu Oct 28 00:22:22 2004
@@ -23,7 +23,7 @@
 
 ///\ingroup graphmaps
 ///\file
-///\brief Graph maps that construates and destruates
+///\brief Graph maps that construct and destruct
 ///their elements dynamically.
 
 namespace lemon {

Modified: hugo/branches/graph_factory/src/lemon/iterable_graph_extender.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/iterable_graph_extender.h	(original)
+++ hugo/branches/graph_factory/src/lemon/iterable_graph_extender.h	Thu Oct 28 00:22:22 2004
@@ -26,7 +26,7 @@
 
       NodeIt(Invalid i) : Node(i) { }
 
-      NodeIt(const Graph& _graph) : Node(), graph(&_graph) {
+      explicit NodeIt(const Graph& _graph) : Node(), graph(&_graph) {
 	_graph.first(*static_cast<Node*>(this));
       }
 
@@ -49,7 +49,7 @@
 
       EdgeIt(Invalid i) : Edge(i) { }
 
-      EdgeIt(const Graph& _graph) : Edge(), graph(&_graph) {
+      explicit EdgeIt(const Graph& _graph) : Edge(), graph(&_graph) {
 	_graph.first(*static_cast<Edge*>(this));
       }
 

Modified: hugo/branches/graph_factory/src/lemon/list_graph.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/list_graph.h	(original)
+++ hugo/branches/graph_factory/src/lemon/list_graph.h	Thu Oct 28 00:22:22 2004
@@ -81,10 +81,6 @@
       : nodes(), first_node(-1),
 	first_free_node(-1), edges(), first_free_edge(-1) {}
 
-    ListGraphBase(const ListGraphBase &g) 
-      : nodes(g.nodes), first_node(g.first_node),
-	first_free_node(g.first_free_node), edges(g.edges),
-	first_free_edge(g.first_free_edge) {}
     
     ///it possible to avoid the superfluous memory allocation.
     void reserveEdge(int n) { edges.reserve(n); };
@@ -94,6 +90,7 @@
     /// Maximum node ID.
     ///\sa id(Node)
     int maxNodeId() const { return nodes.size()-1; } 
+
     /// Maximum edge ID.
     
     /// Maximum edge ID.
@@ -104,7 +101,6 @@
     Node head(Edge e) const { return edges[e.id].head; }
 
 
-
     void first(Node& node) const { 
       node.id = first_node;
     }

Modified: hugo/branches/graph_factory/src/lemon/smart_graph.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/smart_graph.h	(original)
+++ hugo/branches/graph_factory/src/lemon/smart_graph.h	Thu Oct 28 00:22:22 2004
@@ -169,22 +169,19 @@
       nodes.clear();
     }
 
+
     class Node {
       friend class SmartGraphBase;
 
     protected:
-
       int n;
       Node(int nn) {n=nn;}
-
     public:
       Node() {}
       Node (Invalid) { n=-1; }
       bool operator==(const Node i) const {return n==i.n;}
       bool operator!=(const Node i) const {return n!=i.n;}
       bool operator<(const Node i) const {return n<i.n;}
-      //      ///Validity check
-      //      operator bool() { return n!=-1; }
     };
     
 
@@ -195,17 +192,11 @@
       int n;
       Edge(int nn) {n=nn;}
     public:
-      /// An Edge with id \c n.
-
       Edge() { }
       Edge (Invalid) { n=-1; }
       bool operator==(const Edge i) const {return n==i.n;}
       bool operator!=(const Edge i) const {return n!=i.n;}
       bool operator<(const Edge i) const {return n<i.n;}
-      //       ///Validity check
-      //       operator bool() { return n!=-1; }
-
-
     };
 
     void first(Node& node) const {

Modified: hugo/branches/graph_factory/src/work/klao/TODO
==============================================================================
--- hugo/branches/graph_factory/src/work/klao/TODO	(original)
+++ hugo/branches/graph_factory/src/work/klao/TODO	Thu Oct 28 00:22:22 2004
@@ -1 +1,3 @@
+full_graph.h -t atnez(et)ni!
+
 megcsinalni, hogy mukodjon a kereses a doksiban