Changeset 873:f3a30fda2e49 in lemon-0.x

Timestamp:

09/16/04 21:23:41 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1175

Message:

• GraphSkeleton? renamed to ExtendableGraphSkeleton?
• Use full explicit namespaces in some places in order to work with icc. (I don't know why they are necessary.)

Files:

• doc/graphs.dox (modified) (5 diffs)
• src/hugo/skeletons/graph.h (modified) (3 diffs)
• src/test/graph_test.cc (modified) (1 diff)
• src/work/marci/graph_wrapper_test.cc (modified) (1 diff)

doc/graphs.dox

@@ -9 +9 @@
 
 
-Each graph should meet the \ref ConstGraph concept. This concept does
+Each graph should meet the
+\ref hugo::skeleton::StaticGraphSkeleton "StaticGraph" concept.
+This concept does not
 makes it possible to change the graph (i.e. it is not possible to add
 or delete edges or nodes). Most of the graph algorithms will run on
 these graphs.
 
-The graphs meeting the \ref ExtendableGraph concept allow node and
+The graphs meeting the
+\ref hugo::skeleton::ExtendableGraphSkeleton "ExtendableGraph"
+concept allow node and
 edge addition. You can also "clear" (i.e. erase all edges and nodes)
 such a graph.
 
-In case of graphs meeting the full feature \ref ErasableGraph concept
+In case of graphs meeting the full feature
+\ref hugo::skeleton::ErasableGraphSkeleton "ErasableGraph"
+concept
 you can also erase individual edges and node in arbitrary order.
 
 The implemented graph structures are the following.
 \li \ref hugo::ListGraph "ListGraph" is the most versatile graph class. It meets
-the ErasableGraph concept and it also have some convenience features.
+the hugo::skeleton::ErasableGraphSkeleton "ErasableGraph" concept
+and it also have some convenience features.
 \li \ref hugo::SmartGraph "SmartGraph" is a more memory
 efficient version of \ref hugo::ListGraph "ListGraph". The
-price of it is that it only meets the \ref ExtendableGraph concept,
+price of it is that it only meets the
+\ref hugo::skeleton::ExtendableGraphSkeleton "ExtendableGraph" concept,
 so you cannot delete individual edges or nodes.
 \li \ref hugo::SymListGraph "SymListGraph" and
@@ -47 +55 @@
 can be used as a base class of \ref hugo::EdgeSet "EdgeSet".
 \li \ref hugo::EdgeSet "EdgeSet" can be used to create a new graph on
-the edge set of another graph. The base graph can be an arbitrary graph and it
+the node set of another graph. The base graph can be an arbitrary graph and it
 is possible to attach several \ref hugo::EdgeSet "EdgeSet"'s to a base graph.
 
@@ -53 +61 @@
 \todo Some cross-refs are wrong.
 
-\bug This file must be updated accordig to the new stile iterators.
+\bug This file must be updated accordig to the new style iterators.
 
 The graph structures itself can not store data attached
@@ -59 +67 @@
 \ref maps "map classes"
 to dynamically attach data the to graph components.
-
-
-
 
 The following program demonstrates the basic features of HugoLib's graph
@@ -191 +196 @@
 \endcode
 
-In generic graph optimization programming graphs are not containers rather
+As we mentioned above, graphs are not containers rather
 incidence structures which are iterable in many ways. HugoLib introduces
 concepts that allow us to attach containers to graphs. These containers are

src/hugo/skeletons/graph.h

@@ -433 +433 @@
     /// with additional functionality which enables to build a
     /// graph from scratch.
-    class GraphSkeleton : public StaticGraphSkeleton
+    class ExtendableGraphSkeleton : public StaticGraphSkeleton
     {
     public:
@@ -440 +440 @@
       /// Defalult constructor.
       ///
-      GraphSkeleton() { }
+      ExtendableGraphSkeleton() { }
       ///Add a new node to the graph.
 
@@ -465 +465 @@
     /// This class is an extension of \c GraphSkeleton. It also makes it
     /// possible to erase edges or nodes.
-    class ErasableGraphSkeleton : public GraphSkeleton
+    class ErasableGraphSkeleton : public ExtendableGraphSkeleton
     {
     public:

src/test/graph_test.cc

@@ -53 +53 @@
 
 //Compile GraphSkeleton
-template void checkCompileStaticGraph<skeleton::StaticGraphSkeleton>
+template void hugo::checkCompileStaticGraph<skeleton::StaticGraphSkeleton>
 (skeleton::StaticGraphSkeleton &);
 
-template void checkCompileGraph<skeleton::GraphSkeleton>
-(skeleton::GraphSkeleton &);
+template void hugo::checkCompileGraph<skeleton::ExtendableGraphSkeleton>
+(skeleton::ExtendableGraphSkeleton &);
 
-template void checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>
+template void hugo::checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>
 (skeleton::ErasableGraphSkeleton &);
 
 //Compile SmartGraph
-template void checkCompileGraph<SmartGraph>(SmartGraph &);
-template void checkCompileGraphFindEdge<SmartGraph>(SmartGraph &);
+template void hugo::checkCompileGraph<SmartGraph>(SmartGraph &);
+template void hugo::checkCompileGraphFindEdge<SmartGraph>(SmartGraph &);
 
 //Compile SymSmartGraph
-template void checkCompileGraph<SymSmartGraph>(SymSmartGraph &);
-template void checkCompileGraphFindEdge<SymSmartGraph>(SymSmartGraph &);
+template void hugo::checkCompileGraph<SymSmartGraph>(SymSmartGraph &);
+template void hugo::checkCompileGraphFindEdge<SymSmartGraph>(SymSmartGraph &);
 
 //Compile ListGraph
-template void checkCompileGraph<ListGraph>(ListGraph &);
-template void checkCompileErasableGraph<ListGraph>(ListGraph &);
-template void checkCompileGraphFindEdge<ListGraph>(ListGraph &);
+template void hugo::checkCompileGraph<ListGraph>(ListGraph &);
+template void hugo::checkCompileErasableGraph<ListGraph>(ListGraph &);
+template void hugo::checkCompileGraphFindEdge<ListGraph>(ListGraph &);
 
 
 //Compile SymListGraph
-template void checkCompileGraph<SymListGraph>(SymListGraph &);
-template void checkCompileErasableGraph<SymListGraph>(SymListGraph &);
-template void checkCompileGraphFindEdge<SymListGraph>(SymListGraph &);
+template void hugo::checkCompileGraph<SymListGraph>(SymListGraph &);
+template void hugo::checkCompileErasableGraph<SymListGraph>(SymListGraph &);
+template void hugo::checkCompileGraphFindEdge<SymListGraph>(SymListGraph &);
 
 //Compile FullGraph
-template void checkCompileStaticGraph<FullGraph>(FullGraph &);
-template void checkCompileGraphFindEdge<FullGraph>(FullGraph &);
+template void hugo::checkCompileStaticGraph<FullGraph>(FullGraph &);
+template void hugo::checkCompileGraphFindEdge<FullGraph>(FullGraph &);
 
 //Compile EdgeSet <ListGraph>
-template void checkCompileGraph<EdgeSet <ListGraph> >(EdgeSet <ListGraph> &);
-template void checkCompileGraphEraseEdge<EdgeSet <ListGraph> >
+template void hugo::checkCompileGraph<EdgeSet <ListGraph> >
 (EdgeSet <ListGraph> &);
-template void checkCompileGraphFindEdge<EdgeSet <ListGraph> >
+template void hugo::checkCompileGraphEraseEdge<EdgeSet <ListGraph> >
+(EdgeSet <ListGraph> &);
+template void hugo::checkCompileGraphFindEdge<EdgeSet <ListGraph> >
 (EdgeSet <ListGraph> &);
 
 //Compile EdgeSet <NodeSet>
-template void checkCompileGraph<EdgeSet <NodeSet> >(EdgeSet <NodeSet> &);
-template void checkCompileGraphEraseEdge<EdgeSet <NodeSet> >
+template void hugo::checkCompileGraph<EdgeSet <NodeSet> >(EdgeSet <NodeSet> &);
+template void hugo::checkCompileGraphEraseEdge<EdgeSet <NodeSet> >
 (EdgeSet <NodeSet> &);
-template void checkCompileGraphFindEdge<EdgeSet <NodeSet> >
+template void hugo::checkCompileGraphFindEdge<EdgeSet <NodeSet> >
 (EdgeSet <NodeSet> &);
 

src/work/marci/graph_wrapper_test.cc

@@ -57 +57 @@
 // (skeleton::StaticGraphSkeleton &);
 
-// template void checkCompileGraph<skeleton::GraphSkeleton>
-// (skeleton::GraphSkeleton &);
+// template void checkCompileGraph<skeleton::ExtendableGraphSkeleton>
+// (skeleton::ExtendableGraphSkeleton &);
 
 // template void checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>