Changeset 987:87f7c54892df in lemon-0.x for src/work/athos

Timestamp:

11/13/04 18:07:10 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Naming changes:

• ValueType? -> Value
• KeyType? -> Key
• ReferenceType? ->Reference
• PointerType? -> Pointer

Location:

src/work/athos

Files:

• mincostflow.h (modified) (2 diffs)
• old/minlengthpaths.h (modified) (2 diffs)
• union_find.h (modified) (4 diffs)

src/work/athos/mincostflow.h

@@ -44 +44 @@
   class MinCostFlow {
 
-    typedef typename CostMap::ValueType Cost;
-
-
-    typedef typename SupplyDemandMap::ValueType SupplyDemand;
+    typedef typename CostMap::Value Cost;
+
+
+    typedef typename SupplyDemandMap::Value SupplyDemand;
     
     typedef typename Graph::Node Node;
@@ -69 +69 @@
       const NodeMap &pot;
     public :
-      typedef typename CostMap::KeyType KeyType;
-      typedef typename CostMap::ValueType ValueType;
+      typedef typename CostMap::Key Key;
+      typedef typename CostMap::Value Value;
         
-      ValueType operator[](typename ResGraph::Edge e) const {     
+      Value operator[](typename ResGraph::Edge e) const {     
         if (res_graph.forward(e))
           return  ol[e]-(pot[res_graph.target(e)]-pot[res_graph.source(e)]);   

src/work/athos/old/minlengthpaths.h

@@ -31 +31 @@
   class MinLengthPaths {
 
-    typedef typename LengthMap::ValueType Length;
+    typedef typename LengthMap::Value Length;
     
     typedef typename Graph::Node Node;
@@ -50 +50 @@
       const NodeMap &pot;
     public :
-      typedef typename LengthMap::KeyType KeyType;
-      typedef typename LengthMap::ValueType ValueType;
-        
-      ValueType operator[](typename ResGraphType::Edge e) const {     
+      typedef typename LengthMap::Key Key;
+      typedef typename LengthMap::Value Value;
+        
+      Value operator[](typename ResGraphType::Edge e) const {     
         //if ( (1-2*rev[e])*ol[e]-(pot[G.target(e)]-pot[G.source(e)] ) <0 ){
         //  std::cout<<"Negative length!!"<<std::endl;

src/work/athos/union_find.h

@@ -16 +16 @@
 namespace lemon {
   
-  template <typename KeyType, typename KeyIntMap>
+  template <typename Key, typename KeyIntMap>
     class UnionFind {
     KeyIntMap& pointmap;
@@ -35 +35 @@
     
     //Give a component of one point to the structure
-    int addPoint(KeyType u){
+    int addPoint(Key u){
       int _index = container.size();
       VectorElementType buf(_index,1);
@@ -44 +44 @@
     
     //Finds the big boss of u
-    int find(KeyType u){
+    int find(Key u){
       if (pointmap.get(u)==-1){
         int whoami = addPoint(u);
@@ -62 +62 @@
 
     //Finds u and v in the structures and merges the comopnents, if not equal
-    bool findAndMerge(KeyType u,KeyType v){
+    bool findAndMerge(Key u,Key v){
       int bu = find(u);
       int bv = find(v);