Changeset 1811:597ce92fae73 in lemon-0.x

Timestamp:

11/17/05 11:14:55 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Several bugfices.

Location:

lemon

Files:

• Makefile.am (modified) (1 diff)
• graph_utils.h (modified) (2 diffs)
• time_measure.h (modified) (1 diff)

lemon/Makefile.am

@@ -70 +70 @@
         graph_writer.h \
         bits/alteration_notifier.h \
-        bits/map_iterator.h \
         bits/array_map.h \
         bits/default_map.h \

lemon/graph_utils.h

@@ -60 +60 @@
     typedef Graph::   EdgeIt    EdgeIt;                 \
     typedef Graph:: InEdgeIt  InEdgeIt;                 \
-    typedef Graph::OutEdgeIt OutEdgeIt;                 \
-    typedef Graph::NodeMap<bool> BoolNodeMap;           \
-    typedef Graph::NodeMap<int> IntNodeMap;             \
-    typedef Graph::NodeMap<double> DoubleNodeMap;       \
-    typedef Graph::EdgeMap<bool> BoolEdgeMap;           \
-    typedef Graph::EdgeMap<int> IntEdgeMap;             \
-    typedef Graph::EdgeMap<double> DoubleEdgeMap;
+    typedef Graph::OutEdgeIt OutEdgeIt;                 
+//     typedef Graph::template NodeMap<bool> BoolNodeMap;              
+//     typedef Graph::template NodeMap<int> IntNodeMap;        
+//     typedef Graph::template NodeMap<double> DoubleNodeMap;  
+//     typedef Graph::template EdgeMap<bool> BoolEdgeMap;              
+//     typedef Graph::template EdgeMap<int> IntEdgeMap;        
+//     typedef Graph::template EdgeMap<double> DoubleEdgeMap;
   
   ///Creates convenience typedefs for the undirected graph types and iterators
@@ -86 +86 @@
     typedef Graph:: UndirEdge   UndirEdge;                      \
     typedef Graph:: UndirEdgeIt UndirEdgeIt;                    \
-    typedef Graph:: IncEdgeIt   IncEdgeIt;                      \
-    typedef Graph::UndirEdgeMap<bool> BoolUndirEdgeMap;         \
-    typedef Graph::UndirEdgeMap<int> IntUndirEdgeMap;           \
-    typedef Graph::UndirEdgeMap<double> DoubleUndirEdgeMap;
+    typedef Graph:: IncEdgeIt   IncEdgeIt;                     
+//     typedef Graph::template UndirEdgeMap<bool> BoolUndirEdgeMap;      
+//     typedef Graph::template UndirEdgeMap<int> IntUndirEdgeMap;
+//     typedef Graph::template UndirEdgeMap<double> DoubleUndirEdgeMap;
   
 

lemon/time_measure.h

@@ -379 +379 @@
     int total=0;
     for(int tn=1;tn < 1<<24; tn*=2) {
-      for(;total<tn;total++) const_cast<F &>(f)();
+      for(;total<tn;total++) f();
       full=t;
       if(full.realTime()>min_time) {