[Lemon-commits] [lemon_svn] deba: r1280 - in hugo/branches/graph_factory/src: lemon lemon/skeletons test
Lemon SVN
svn at lemon.cs.elte.hu
Mon Nov 6 20:44:21 CET 2006
Author: deba
Date: Thu Oct 7 12:28:15 2004
New Revision: 1280
Added:
hugo/branches/graph_factory/src/lemon/clearable_graph_extender.h
- copied, changed from r1279, /hugo/branches/graph_factory/src/lemon/clear_graph_extension.h
hugo/branches/graph_factory/src/lemon/erasable_graph_extender.h
- copied, changed from r1279, /hugo/branches/graph_factory/src/lemon/erase_graph_extension.h
hugo/branches/graph_factory/src/lemon/extendable_graph_extender.h
- copied, changed from r1279, /hugo/branches/graph_factory/src/lemon/extend_graph_extension.h
hugo/branches/graph_factory/src/lemon/idmappable_graph_extender.h
- copied, changed from r1279, /hugo/branches/graph_factory/src/lemon/id_map_graph_extension.h
hugo/branches/graph_factory/src/lemon/iterable_graph_extender.h
- copied, changed from r1279, /hugo/branches/graph_factory/src/lemon/iterator_graph_extension.h
hugo/branches/graph_factory/src/lemon/mappable_graph_extender.h
- copied, changed from r1279, /hugo/branches/graph_factory/src/lemon/map_graph_extension.h
Removed:
hugo/branches/graph_factory/src/lemon/clear_graph_extension.h
hugo/branches/graph_factory/src/lemon/erase_graph_extension.h
hugo/branches/graph_factory/src/lemon/extend_graph_extension.h
hugo/branches/graph_factory/src/lemon/id_map_graph_extension.h
hugo/branches/graph_factory/src/lemon/iterator_graph_extension.h
hugo/branches/graph_factory/src/lemon/map_graph_extension.h
Modified:
hugo/branches/graph_factory/src/lemon/skeletons/base_graph.h
hugo/branches/graph_factory/src/lemon/skeletons/extended_graph.h
hugo/branches/graph_factory/src/lemon/test_graph.h
hugo/branches/graph_factory/src/test/base_graph_test.cc
hugo/branches/graph_factory/src/test/extended_graph_test.cc
Log:
Class naming convention modification in Extenders.
Copied: hugo/branches/graph_factory/src/lemon/clearable_graph_extender.h (from r1279, /hugo/branches/graph_factory/src/lemon/clear_graph_extension.h)
==============================================================================
--- /hugo/branches/graph_factory/src/lemon/clear_graph_extension.h (original)
+++ hugo/branches/graph_factory/src/lemon/clearable_graph_extender.h Thu Oct 7 12:28:15 2004
@@ -1,7 +1,7 @@
// -*- c++ -*-
-#ifndef LEMON_CLEAR_GRAPH_EXTENSION_H
-#define LEMON_CLEAR_GRAPH_EXTENSION_H
+#ifndef LEMON_CLEARABLE_GRAPH_EXTENDER_H
+#define LEMON_CLEARABLE_GRAPH_EXTENDER_H
#include <lemon/invalid.h>
@@ -9,10 +9,10 @@
namespace lemon {
template <typename Base>
- class ClearGraphExtension : public Base {
+ class ClearableGraphExtender : public Base {
public:
- typedef ClearGraphExtension Graph;
+ typedef ClearableGraphExtender Graph;
typedef Base Parent;
typedef typename Parent::Node Node;
Copied: hugo/branches/graph_factory/src/lemon/erasable_graph_extender.h (from r1279, /hugo/branches/graph_factory/src/lemon/erase_graph_extension.h)
==============================================================================
--- /hugo/branches/graph_factory/src/lemon/erase_graph_extension.h (original)
+++ hugo/branches/graph_factory/src/lemon/erasable_graph_extender.h Thu Oct 7 12:28:15 2004
@@ -1,7 +1,7 @@
// -*- c++ -*-
-#ifndef LEMON_ERASE_GRAPH_EXTENSION_H
-#define LEMON_ERASE_GRAPH_EXTENSION_H
+#ifndef LEMON_ERASABLE_GRAPH_EXTENDER_H
+#define LEMON_ERASABLE_GRAPH_EXTENDER_H
#include <lemon/invalid.h>
@@ -9,10 +9,10 @@
namespace lemon {
template <typename Base>
- class EraseGraphExtension : public Base {
+ class ErasableGraphExtender : public Base {
public:
- typedef EraseGraphExtension Graph;
+ typedef ErasableGraphExtender Graph;
typedef Base Parent;
typedef typename Parent::Node Node;
Copied: hugo/branches/graph_factory/src/lemon/extendable_graph_extender.h (from r1279, /hugo/branches/graph_factory/src/lemon/extend_graph_extension.h)
==============================================================================
--- /hugo/branches/graph_factory/src/lemon/extend_graph_extension.h (original)
+++ hugo/branches/graph_factory/src/lemon/extendable_graph_extender.h Thu Oct 7 12:28:15 2004
@@ -1,15 +1,15 @@
// -*- c++ -*-
-#ifndef LEMON_EXTEND_GRAPH_EXTENSION_H
-#define LEMON_EXTEND_GRAPH_EXTENSION_H
+#ifndef LEMON_EXTENDABLE_GRAPH_EXTENDER_H
+#define LEMON_EXTENDABLE_GRAPH_EXTENDER_H
namespace lemon {
template <typename Base>
- class ExtendGraphExtension : public Base {
+ class ExtendableGraphExtender : public Base {
public:
- typedef ExtendGraphExtension Graph;
+ typedef ExtendableGraphExtender Graph;
typedef Base Parent;
typedef typename Parent::Node Node;
Copied: hugo/branches/graph_factory/src/lemon/idmappable_graph_extender.h (from r1279, /hugo/branches/graph_factory/src/lemon/id_map_graph_extension.h)
==============================================================================
--- /hugo/branches/graph_factory/src/lemon/id_map_graph_extension.h (original)
+++ hugo/branches/graph_factory/src/lemon/idmappable_graph_extender.h Thu Oct 7 12:28:15 2004
@@ -1,16 +1,16 @@
// -*- c++ -*-
-#ifndef LEMON_ID_MAP_GRAPH_EXTENSION_H
-#define LEMON_ID_MAP_GRAPH_EXTENSION_H
+#ifndef LEMON_IDMAPPABLE_GRAPH_EXTENDER_H
+#define LEMON_IDMAPPABLE_GRAPH_EXTENDER_H
namespace lemon {
template <typename Base>
- class IdMapGraphExtension : public Base {
+ class IdMappableGraphExtender : public Base {
public:
- typedef IdMapGraphExtension Graph;
+ typedef IdMappableGraphExtender Graph;
typedef Base Parent;
Copied: hugo/branches/graph_factory/src/lemon/iterable_graph_extender.h (from r1279, /hugo/branches/graph_factory/src/lemon/iterator_graph_extension.h)
==============================================================================
--- /hugo/branches/graph_factory/src/lemon/iterator_graph_extension.h (original)
+++ hugo/branches/graph_factory/src/lemon/iterable_graph_extender.h Thu Oct 7 12:28:15 2004
@@ -1,17 +1,17 @@
// -*- c++ -*-
-#ifndef LEMON_ITERATOR_GRAPH_EXTENSION_H
-#define LEMON_ITERATOR_GRAPH_EXTENSION_H
+#ifndef LEMON_ITERABLE_GRAPH_EXTENDER_H
+#define LEMON_ITERABLE_GRAPH_EXTENDER_H
#include <lemon/invalid.h>
namespace lemon {
template <typename Base>
- class IteratorGraphExtension : public Base {
+ class IterableGraphExtender : public Base {
public:
- typedef IteratorGraphExtension Graph;
+ typedef IterableGraphExtender Graph;
typedef Base Parent;
typedef typename Parent::Node Node;
@@ -88,10 +88,10 @@
template <typename Base>
- class StaticIteratorGraphExtension : public Base {
+ class StaticIterableGraphExtension : public Base {
typedef Base Parent;
- typedef StaticIteratorGraphExtension Graph;
+ typedef StaticIterableGraphExtension Graph;
typedef typename Parent::Node Node;
typedef typename Parent::Edge Edge;
Copied: hugo/branches/graph_factory/src/lemon/mappable_graph_extender.h (from r1279, /hugo/branches/graph_factory/src/lemon/map_graph_extension.h)
==============================================================================
--- /hugo/branches/graph_factory/src/lemon/map_graph_extension.h (original)
+++ hugo/branches/graph_factory/src/lemon/mappable_graph_extender.h Thu Oct 7 12:28:15 2004
@@ -1,17 +1,17 @@
// -*- c++ -*-
-#ifndef LEMON_MAP_GRAPH_EXTENSION_H
-#define LEMON_MAP_GRAPH_EXTENSION_H
+#ifndef LEMON_MAPPABLE_GRAPH_EXTENDER_H
+#define LEMON_MAPPABLE_GRAPH_EXTENDER_H
#include <lemon/map_registry.h>
namespace lemon {
template <typename Base, template <typename,typename,typename> class DynMap>
- class MapGraphExtension : public Base {
+ class MappableGraphExtender : public Base {
public:
- typedef MapGraphExtension Graph;
+ typedef MappableGraphExtender Graph;
typedef Base Parent;
typedef typename Parent::Node Node;
Modified: hugo/branches/graph_factory/src/lemon/skeletons/base_graph.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/skeletons/base_graph.h (original)
+++ hugo/branches/graph_factory/src/lemon/skeletons/base_graph.h Thu Oct 7 12:28:15 2004
@@ -76,7 +76,7 @@
}
}
- class IterateBaseGraph : public BaseGraph {
+ class IterableBaseGraph : public BaseGraph {
public:
typedef BaseGraph::Node Node;
@@ -97,7 +97,7 @@
};
template <typename Graph>
- void checkIterateBaseGraph(Graph& graph) {
+ void checkIterableBaseGraph(Graph& graph) {
const Graph& cgraph = graph;
typename Graph::Node node;
cgraph.first(node);
@@ -111,7 +111,7 @@
cgraph.nextOutEdge(edge);
}
- class IdBaseGraph : public BaseGraph {
+ class IdableBaseGraph : public BaseGraph {
public:
typedef BaseGraph::Node Node;
@@ -122,7 +122,7 @@
};
template <typename Graph>
- void checkIdBaseGraph(Graph& graph) {
+ void checkIdableBaseGraph(Graph& graph) {
const Graph& cgraph = graph;
typename Graph::Node node;
int nid = cgraph.id(node);
@@ -130,7 +130,7 @@
int eid = cgraph.id(edge);
}
- class MaxIdBaseGraph : public BaseGraph {
+ class MaxIdableBaseGraph : public BaseGraph {
public:
int maxEdgeId() const { return -1;}
@@ -138,17 +138,15 @@
};
template <typename Graph>
- void checkMaxIdBaseGraph(Graph& graph) {
+ void checkMaxIdableBaseGraph(Graph& graph) {
const Graph& cgraph = graph;
int nid = cgraph.maxEdgeId();
int eid = cgraph.maxNodeId();
}
- class ExtendBaseGraph : public BaseGraph {
+ class ExtendableBaseGraph : public BaseGraph {
public:
- typedef ExtendBaseGraph Graph;
-
typedef BaseGraph::Node Node;
typedef BaseGraph::Edge Edge;
@@ -163,48 +161,39 @@
};
template <typename Graph>
- void checkExtendBaseGraph(Graph& graph) {
+ void checkExtendableBaseGraph(Graph& graph) {
typename Graph::Node node_a, node_b;
node_a = graph.addNode();
typename Graph::Edge edge;
edge = graph.addEdge(node_a, node_b);
}
- class EraseBaseGraph : public BaseGraph {
+ class ErasableBaseGraph : public BaseGraph {
public:
- typedef EraseBaseGraph Graph;
-
typedef BaseGraph::Node Node;
typedef BaseGraph::Edge Edge;
- void erase(const Node& node) {}
+ void erase(const Node&) {}
void erase(const Edge&) {}
};
template <typename Graph>
- void checkEraseBaseGraph(Graph& graph) {
+ void checkErasableBaseGraph(Graph& graph) {
typename Graph::Node node;
graph.erase(node);
typename Graph::Edge edge;
graph.erase(edge);
}
- class ClearBaseGraph : public BaseGraph {
+ class ClearableBaseGraph : public BaseGraph {
public:
-
- typedef ClearBaseGraph Graph;
-
- typedef BaseGraph::Node Node;
- typedef BaseGraph::Edge Edge;
-
void clear() {}
-
};
template <typename Graph>
- void checkClearBaseGraph(Graph& graph) {
+ void checkClearableBaseGraph(Graph& graph) {
graph.clear();
}
Modified: hugo/branches/graph_factory/src/lemon/skeletons/extended_graph.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/skeletons/extended_graph.h (original)
+++ hugo/branches/graph_factory/src/lemon/skeletons/extended_graph.h Thu Oct 7 12:28:15 2004
@@ -11,11 +11,11 @@
namespace skeleton {
- class IteratorExtendedGraph : public BaseGraph {
+ class IterableExtendedGraph : public BaseGraph {
public:
- typedef IteratorExtendedGraph Graph;
+ typedef IterableExtendedGraph Graph;
typedef BaseGraph::Node Node;
typedef BaseGraph::Edge Edge;
@@ -75,7 +75,7 @@
};
template <typename Graph>
- void checkIteratorExtendedGraph(Graph& graph) {
+ void checkIterableExtendedGraph(Graph& graph) {
typedef typename Graph::Node Node;
typedef typename Graph::NodeIt NodeIt;
@@ -149,9 +149,9 @@
}
- class IdMapExtendedGraph : public BaseGraph {
+ class IdMappableExtendedGraph : public BaseGraph {
- typedef IdMapExtendedGraph Graph;
+ typedef IdMappableExtendedGraph Graph;
typedef BaseGraph::Node Node;
typedef BaseGraph::Edge Edge;
@@ -173,7 +173,7 @@
};
template <typename Graph>
- void checkIdMapExtendedGraph(Graph& graph) {
+ void checkIdMappableExtendedGraph(Graph& graph) {
{
typename Graph::EdgeIdMap edge_map(graph);
// \todo checking read map concept.
@@ -189,10 +189,10 @@
}
- class MapExtendedGraph : public BaseGraph {
+ class MappableExtendedGraph : public BaseGraph {
public:
- typedef MapExtendedGraph Graph;
+ typedef MappableExtendedGraph Graph;
typedef BaseGraph::Node Node;
@@ -227,7 +227,7 @@
};
template <typename Graph>
- void checkMapExtendedGraph(Graph& graph) {
+ void checkMappableExtendedGraph(Graph& graph) {
{
typename Graph::template NodeMap<int> m(graph);
const Graph& cgraph = graph;
@@ -253,10 +253,10 @@
}
- class ExtendExtendedGraph : public BaseGraph {
+ class ExtendableExtendedGraph : public BaseGraph {
public:
- typedef ExtendExtendedGraph Graph;
+ typedef ExtendableExtendedGraph Graph;
typedef BaseGraph::Node Node;
typedef BaseGraph::Edge Edge;
@@ -272,17 +272,17 @@
};
template <typename Graph>
- void checkExtendExtendedGraph(Graph& graph) {
+ void checkExtendableExtendedGraph(Graph& graph) {
typename Graph::Node node_a, node_b;
node_a = graph.addNode();
typename Graph::Edge edge;
edge = graph.addEdge(node_a, node_b);
}
- class EraseExtendedGraph : public BaseGraph {
+ class ErasableExtendedGraph : public BaseGraph {
public:
- typedef EraseExtendedGraph Graph;
+ typedef ErasableExtendedGraph Graph;
typedef BaseGraph::Node Node;
typedef BaseGraph::Edge Edge;
@@ -293,17 +293,17 @@
};
template <typename Graph>
- void checkEraseExtendedGraph(Graph& graph) {
+ void checkErasableExtendedGraph(Graph& graph) {
typename Graph::Node node;
graph.erase(node);
typename Graph::Edge edge;
graph.erase(edge);
}
- class ClearExtendedGraph : public BaseGraph {
+ class ClearableExtendedGraph : public BaseGraph {
public:
- typedef ClearExtendedGraph Graph;
+ typedef ClearableExtendedGraph Graph;
typedef BaseGraph::Node Node;
typedef BaseGraph::Edge Edge;
@@ -313,7 +313,7 @@
};
template <typename Graph>
- void checkClearExtendedGraph(Graph& graph) {
+ void checkClearableExtendedGraph(Graph& graph) {
graph.clear();
}
Modified: hugo/branches/graph_factory/src/lemon/test_graph.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/test_graph.h (original)
+++ hugo/branches/graph_factory/src/lemon/test_graph.h Thu Oct 7 12:28:15 2004
@@ -3,12 +3,12 @@
#ifndef LEMON_TEST_GRAPH_H
#define LEMON_TEST_GRAPH_H
-#include <lemon/erase_graph_extension.h>
-#include <lemon/clear_graph_extension.h>
-#include <lemon/extend_graph_extension.h>
-#include <lemon/map_graph_extension.h>
-#include <lemon/id_map_graph_extension.h>
-#include <lemon/iterator_graph_extension.h>
+#include <lemon/erasable_graph_extender.h>
+#include <lemon/clearable_graph_extender.h>
+#include <lemon/extendable_graph_extender.h>
+#include <lemon/mappable_graph_extender.h>
+#include <lemon/idmappable_graph_extender.h>
+#include <lemon/iterable_graph_extender.h>
#include <lemon/vector_map.h>
@@ -260,12 +260,12 @@
};
- typedef EraseGraphExtension<
- ClearGraphExtension<
- ExtendGraphExtension<
- MapGraphExtension<
- IdMapGraphExtension<
- IteratorGraphExtension<
+ typedef ErasableGraphExtender<
+ ClearableGraphExtender<
+ ExtendableGraphExtender<
+ MappableGraphExtender<
+ IdMappableGraphExtender<
+ IterableGraphExtender<
TestGraphBase> >, VectorMap> > > > TestGraph;
}
Modified: hugo/branches/graph_factory/src/test/base_graph_test.cc
==============================================================================
--- hugo/branches/graph_factory/src/test/base_graph_test.cc (original)
+++ hugo/branches/graph_factory/src/test/base_graph_test.cc Thu Oct 7 12:28:15 2004
@@ -11,45 +11,45 @@
template void lemon::skeleton::checkBaseGraph
<skeleton::BaseGraph>(skeleton::BaseGraph &);
-template void lemon::skeleton::checkIterateBaseGraph
-<skeleton::IterateBaseGraph>(skeleton::IterateBaseGraph &);
+template void lemon::skeleton::checkIterableBaseGraph
+<skeleton::IterableBaseGraph>(skeleton::IterableBaseGraph &);
-template void lemon::skeleton::checkIdBaseGraph
-<skeleton::IdBaseGraph>(skeleton::IdBaseGraph &);
+template void lemon::skeleton::checkIdableBaseGraph
+<skeleton::IdableBaseGraph>(skeleton::IdableBaseGraph &);
-template void lemon::skeleton::checkMaxIdBaseGraph
-<skeleton::MaxIdBaseGraph>(skeleton::MaxIdBaseGraph &);
+template void lemon::skeleton::checkMaxIdableBaseGraph
+<skeleton::MaxIdableBaseGraph>(skeleton::MaxIdableBaseGraph &);
-template void lemon::skeleton::checkExtendBaseGraph
-<skeleton::ExtendBaseGraph>(skeleton::ExtendBaseGraph &);
+template void lemon::skeleton::checkExtendableBaseGraph
+<skeleton::ExtendableBaseGraph>(skeleton::ExtendableBaseGraph &);
-template void lemon::skeleton::checkClearBaseGraph
-<skeleton::ClearBaseGraph>(skeleton::ClearBaseGraph &);
+template void lemon::skeleton::checkClearableBaseGraph
+<skeleton::ClearableBaseGraph>(skeleton::ClearableBaseGraph &);
-template void lemon::skeleton::checkEraseBaseGraph
-<skeleton::EraseBaseGraph>(skeleton::EraseBaseGraph &);
+template void lemon::skeleton::checkErasableBaseGraph
+<skeleton::ErasableBaseGraph>(skeleton::ErasableBaseGraph &);
template void lemon::skeleton::checkBaseGraph
<TestGraphBase>(TestGraphBase &);
-template void lemon::skeleton::checkIterateBaseGraph
+template void lemon::skeleton::checkIterableBaseGraph
<TestGraphBase>(TestGraphBase &);
-template void lemon::skeleton::checkIdBaseGraph
+template void lemon::skeleton::checkIdableBaseGraph
<TestGraphBase>(TestGraphBase &);
-template void lemon::skeleton::checkMaxIdBaseGraph
+template void lemon::skeleton::checkMaxIdableBaseGraph
<TestGraphBase>(TestGraphBase &);
-template void lemon::skeleton::checkExtendBaseGraph
+template void lemon::skeleton::checkExtendableBaseGraph
<TestGraphBase>(TestGraphBase &);
-template void lemon::skeleton::checkClearBaseGraph
+template void lemon::skeleton::checkClearableBaseGraph
<TestGraphBase>(TestGraphBase &);
-template void lemon::skeleton::checkEraseBaseGraph
+template void lemon::skeleton::checkErasableBaseGraph
<TestGraphBase>(TestGraphBase &);
Modified: hugo/branches/graph_factory/src/test/extended_graph_test.cc
==============================================================================
--- hugo/branches/graph_factory/src/test/extended_graph_test.cc (original)
+++ hugo/branches/graph_factory/src/test/extended_graph_test.cc Thu Oct 7 12:28:15 2004
@@ -12,42 +12,42 @@
using namespace lemon;
-template void lemon::skeleton::checkIteratorExtendedGraph
-<skeleton::IteratorExtendedGraph>(skeleton::IteratorExtendedGraph &);
+template void lemon::skeleton::checkIterableExtendedGraph
+<skeleton::IterableExtendedGraph>(skeleton::IterableExtendedGraph &);
-template void lemon::skeleton::checkIdMapExtendedGraph
-<skeleton::IdMapExtendedGraph>(skeleton::IdMapExtendedGraph &);
+template void lemon::skeleton::checkIdMappableExtendedGraph
+<skeleton::IdMappableExtendedGraph>(skeleton::IdMappableExtendedGraph &);
-template void lemon::skeleton::checkMapExtendedGraph
-<skeleton::MapExtendedGraph>(skeleton::MapExtendedGraph &);
+template void lemon::skeleton::checkMappableExtendedGraph
+<skeleton::MappableExtendedGraph>(skeleton::MappableExtendedGraph &);
-template void lemon::skeleton::checkExtendExtendedGraph
-<skeleton::ExtendExtendedGraph>(skeleton::ExtendExtendedGraph &);
+template void lemon::skeleton::checkExtendableExtendedGraph
+<skeleton::ExtendableExtendedGraph>(skeleton::ExtendableExtendedGraph &);
-template void lemon::skeleton::checkEraseExtendedGraph
-<skeleton::EraseExtendedGraph>(skeleton::EraseExtendedGraph &);
+template void lemon::skeleton::checkErasableExtendedGraph
+<skeleton::ErasableExtendedGraph>(skeleton::ErasableExtendedGraph &);
-template void lemon::skeleton::checkClearExtendedGraph
-<skeleton::ClearExtendedGraph>(skeleton::ClearExtendedGraph &);
+template void lemon::skeleton::checkClearableExtendedGraph
+<skeleton::ClearableExtendedGraph>(skeleton::ClearableExtendedGraph &);
-template void lemon::skeleton::checkIteratorExtendedGraph
+template void lemon::skeleton::checkIterableExtendedGraph
<TestGraph>(TestGraph &);
-template void lemon::skeleton::checkIdMapExtendedGraph
+template void lemon::skeleton::checkIdMappableExtendedGraph
<TestGraph>(TestGraph &);
-template void lemon::skeleton::checkMapExtendedGraph
+template void lemon::skeleton::checkMappableExtendedGraph
<TestGraph>(TestGraph &);
-template void lemon::skeleton::checkExtendExtendedGraph
+template void lemon::skeleton::checkExtendableExtendedGraph
<TestGraph>(TestGraph &);
-template void lemon::skeleton::checkEraseExtendedGraph
+template void lemon::skeleton::checkErasableExtendedGraph
<TestGraph>(TestGraph &);
-template void lemon::skeleton::checkClearExtendedGraph
+template void lemon::skeleton::checkClearableExtendedGraph
<TestGraph>(TestGraph &);
More information about the Lemon-commits
mailing list