[Lemon-commits] [lemon_svn] alpar: r2357 - hugo/trunk/lemon

[Lemon SVN]

Author: alpar
Date: Thu Nov 17 11:14:55 2005
New Revision: 2357

Modified:
   hugo/trunk/lemon/Makefile.am
   hugo/trunk/lemon/graph_utils.h
   hugo/trunk/lemon/time_measure.h

Log:
Several bugfices.

Modified: hugo/trunk/lemon/Makefile.am
==============================================================================
--- hugo/trunk/lemon/Makefile.am	(original)
+++ hugo/trunk/lemon/Makefile.am	Thu Nov 17 11:14:55 2005
@@ -69,7 +69,6 @@
 	graph_reader.h \
 	graph_writer.h \
 	bits/alteration_notifier.h \
-	bits/map_iterator.h \
 	bits/array_map.h \
 	bits/default_map.h \
 	bits/extended_pair.h \

Modified: hugo/trunk/lemon/graph_utils.h
==============================================================================
--- hugo/trunk/lemon/graph_utils.h	(original)
+++ hugo/trunk/lemon/graph_utils.h	Thu Nov 17 11:14:55 2005
@@ -59,13 +59,13 @@
     typedef Graph::   Edge      Edge;			\
     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
 
@@ -85,10 +85,10 @@
   GRAPH_TYPEDEFS(Graph)						\
     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;
   
 
 

Modified: hugo/trunk/lemon/time_measure.h
==============================================================================
--- hugo/trunk/lemon/time_measure.h	(original)
+++ hugo/trunk/lemon/time_measure.h	Thu Nov 17 11:14:55 2005
@@ -378,7 +378,7 @@
     TimeStamp full;
     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) {
 	if(num) *num=total;