[Lemon-commits] [lemon_svn] deba: r2596 - in hugo/trunk: lemon lemon/bits lemon/concept test

Lemon SVN svn at lemon.cs.elte.hu
Mon Nov 6 20:53:48 CET 2006


Author: deba
Date: Wed Mar  1 14:19:28 2006
New Revision: 2596

Added:
   hugo/trunk/lemon/bits/invalid.h
      - copied, changed from r2592, /hugo/trunk/lemon/invalid.h
   hugo/trunk/lemon/bits/traits.h
      - copied, changed from r2592, /hugo/trunk/lemon/traits.h
   hugo/trunk/lemon/bits/utility.h
      - copied, changed from r2592, /hugo/trunk/lemon/utility.h
Removed:
   hugo/trunk/lemon/invalid.h
   hugo/trunk/lemon/traits.h
   hugo/trunk/lemon/utility.h
Modified:
   hugo/trunk/lemon/Makefile.am
   hugo/trunk/lemon/base.cc
   hugo/trunk/lemon/bellman_ford.h
   hugo/trunk/lemon/bfs.h
   hugo/trunk/lemon/bits/graph_extender.h
   hugo/trunk/lemon/bits/map_extender.h
   hugo/trunk/lemon/bits/static_map.h
   hugo/trunk/lemon/bits/vector_map.h
   hugo/trunk/lemon/color.h
   hugo/trunk/lemon/concept/bpugraph.h
   hugo/trunk/lemon/concept/graph.h
   hugo/trunk/lemon/concept/graph_component.h
   hugo/trunk/lemon/concept/heap.h
   hugo/trunk/lemon/concept/maps.h
   hugo/trunk/lemon/concept/matrix_maps.h
   hugo/trunk/lemon/concept/path.h
   hugo/trunk/lemon/concept/ugraph.h
   hugo/trunk/lemon/dag_shortest_path.h
   hugo/trunk/lemon/dfs.h
   hugo/trunk/lemon/dijkstra.h
   hugo/trunk/lemon/dimacs.h
   hugo/trunk/lemon/euler.h
   hugo/trunk/lemon/floyd_warshall.h
   hugo/trunk/lemon/fredman_tarjan.h
   hugo/trunk/lemon/full_graph.h
   hugo/trunk/lemon/graph_adaptor.h
   hugo/trunk/lemon/graph_to_eps.h
   hugo/trunk/lemon/graph_utils.h
   hugo/trunk/lemon/grid_ugraph.h
   hugo/trunk/lemon/hypercube_graph.h
   hugo/trunk/lemon/iterable_maps.h
   hugo/trunk/lemon/johnson.h
   hugo/trunk/lemon/kruskal.h
   hugo/trunk/lemon/lemon_reader.h
   hugo/trunk/lemon/lemon_writer.h
   hugo/trunk/lemon/lp_base.h
   hugo/trunk/lemon/map_iterator.h
   hugo/trunk/lemon/maps.h
   hugo/trunk/lemon/matrix_maps.h
   hugo/trunk/lemon/max_matching.h
   hugo/trunk/lemon/min_cut.h
   hugo/trunk/lemon/path.h
   hugo/trunk/lemon/preflow.h
   hugo/trunk/lemon/prim.h
   hugo/trunk/lemon/smart_graph.h
   hugo/trunk/lemon/ugraph_adaptor.h
   hugo/trunk/lemon/unionfind.h
   hugo/trunk/lemon/xy.h
   hugo/trunk/test/max_matching_test.cc
   hugo/trunk/test/test_tools.h

Log:
utility, invalid and traits moved to bits



Modified: hugo/trunk/lemon/Makefile.am
==============================================================================
--- hugo/trunk/lemon/Makefile.am	(original)
+++ hugo/trunk/lemon/Makefile.am	Wed Mar  1 14:19:28 2006
@@ -45,7 +45,6 @@
 	graph_utils.h \
 	graph_to_eps.h \
 	hypercube_graph.h \
-	invalid.h \
 	iterable_maps.h \
 	johnson.h \
 	kruskal.h \
@@ -74,12 +73,10 @@
 	sub_graph.h \
 	time_measure.h \
 	topology.h \
-	traits.h \
 	ugraph_adaptor.h \
 	unionfind.h \
 	xy.h \
 	concept_check.h \
-	utility.h \
 	lemon_reader.h \
 	lemon_writer.h \
 	graph_reader.h \
@@ -94,8 +91,11 @@
 	bits/graph_extender.h \
 	bits/graph_adaptor_extender.h \
 	bits/edge_set_extender.h \
+	bits/invalid.h \
 	bits/item_reader.h \
 	bits/item_writer.h \
+	bits/traits.h \
+	bits/utility.h \
 	concept/bpugraph.h \
 	concept/graph.h \
 	concept/graph_component.h \

Modified: hugo/trunk/lemon/base.cc
==============================================================================
--- hugo/trunk/lemon/base.cc	(original)
+++ hugo/trunk/lemon/base.cc	Wed Mar  1 14:19:28 2006
@@ -20,7 +20,7 @@
 ///\brief Some basic non inline function and static global data.
 
 #include<lemon/tolerance.h>
-#include<lemon/invalid.h>
+#include<lemon/bits/invalid.h>
 namespace lemon {
 
   float Tolerance<float>::def_epsilon = 1e-4;

Modified: hugo/trunk/lemon/bellman_ford.h
==============================================================================
--- hugo/trunk/lemon/bellman_ford.h	(original)
+++ hugo/trunk/lemon/bellman_ford.h	Wed Mar  1 14:19:28 2006
@@ -25,7 +25,7 @@
 ///
 
 #include <lemon/list_graph.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 #include <lemon/maps.h>
 

Modified: hugo/trunk/lemon/bfs.h
==============================================================================
--- hugo/trunk/lemon/bfs.h	(original)
+++ hugo/trunk/lemon/bfs.h	Wed Mar  1 14:19:28 2006
@@ -25,7 +25,7 @@
 
 #include <lemon/list_graph.h>
 #include <lemon/graph_utils.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 #include <lemon/maps.h>
 

Modified: hugo/trunk/lemon/bits/graph_extender.h
==============================================================================
--- hugo/trunk/lemon/bits/graph_extender.h	(original)
+++ hugo/trunk/lemon/bits/graph_extender.h	Wed Mar  1 14:19:28 2006
@@ -19,7 +19,7 @@
 #ifndef LEMON_GRAPH_EXTENDER_H
 #define LEMON_GRAPH_EXTENDER_H
 
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 
 #include <lemon/bits/default_map.h>

Copied: hugo/trunk/lemon/bits/invalid.h (from r2592, /hugo/trunk/lemon/invalid.h)
==============================================================================
--- /hugo/trunk/lemon/invalid.h	(original)
+++ hugo/trunk/lemon/bits/invalid.h	Wed Mar  1 14:19:28 2006
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef LEMON_INVALID_H
-#define LEMON_INVALID_H
+#ifndef LEMON_BITS_INVALID_H
+#define LEMON_BITS_INVALID_H
 
 ///\file
 ///\brief Definition of INVALID.

Modified: hugo/trunk/lemon/bits/map_extender.h
==============================================================================
--- hugo/trunk/lemon/bits/map_extender.h	(original)
+++ hugo/trunk/lemon/bits/map_extender.h	Wed Mar  1 14:19:28 2006
@@ -21,7 +21,7 @@
 
 #include <iterator>
 
-#include <lemon/traits.h>
+#include <lemon/bits/traits.h>
 
 ///\file
 ///\brief Extenders for iterable maps.

Modified: hugo/trunk/lemon/bits/static_map.h
==============================================================================
--- hugo/trunk/lemon/bits/static_map.h	(original)
+++ hugo/trunk/lemon/bits/static_map.h	Wed Mar  1 14:19:28 2006
@@ -22,7 +22,7 @@
 #include <algorithm>
 #include <iostream>
 
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 #include <lemon/bits/map_extender.h>
 #include <lemon/bits/alteration_notifier.h>
 #include <lemon/error.h>

Copied: hugo/trunk/lemon/bits/traits.h (from r2592, /hugo/trunk/lemon/traits.h)
==============================================================================
--- /hugo/trunk/lemon/traits.h	(original)
+++ hugo/trunk/lemon/bits/traits.h	Wed Mar  1 14:19:28 2006
@@ -16,10 +16,10 @@
  *
  */
 
-#ifndef LEMON_TRAITS_H
-#define LEMON_TRAITS_H
+#ifndef LEMON_BITS_TRAITS_H
+#define LEMON_BITS_TRAITS_H
 
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 
 ///\file
 ///\brief Traits for graphs and maps

Copied: hugo/trunk/lemon/bits/utility.h (from r2592, /hugo/trunk/lemon/utility.h)
==============================================================================
--- /hugo/trunk/lemon/utility.h	(original)
+++ hugo/trunk/lemon/bits/utility.h	Wed Mar  1 14:19:28 2006
@@ -32,8 +32,8 @@
 //             Andrew Lumsdaine (lums at osl.iu.edu)
 
 
-#ifndef LEMON_UTILITY_H
-#define LEMON_UTILITY_H
+#ifndef LEMON_BITS_UTILITY_H
+#define LEMON_BITS_UTILITY_H
 
 ///\file
 ///\brief Miscellaneous basic utilities

Modified: hugo/trunk/lemon/bits/vector_map.h
==============================================================================
--- hugo/trunk/lemon/bits/vector_map.h	(original)
+++ hugo/trunk/lemon/bits/vector_map.h	Wed Mar  1 14:19:28 2006
@@ -22,7 +22,7 @@
 #include <vector>
 #include <algorithm>
 
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 #include <lemon/bits/map_extender.h>
 #include <lemon/bits/alteration_notifier.h>
 #include <lemon/concept_check.h>

Modified: hugo/trunk/lemon/color.h
==============================================================================
--- hugo/trunk/lemon/color.h	(original)
+++ hugo/trunk/lemon/color.h	Wed Mar  1 14:19:28 2006
@@ -30,7 +30,7 @@
 #include <ctime>
 #include <cmath>
 
-#include<lemon/invalid.h>
+#include<lemon/bits/invalid.h>
 #include<lemon/xy.h>
 #include<lemon/maps.h>
 #include<lemon/bezier.h>

Modified: hugo/trunk/lemon/concept/bpugraph.h
==============================================================================
--- hugo/trunk/lemon/concept/bpugraph.h	(original)
+++ hugo/trunk/lemon/concept/bpugraph.h	Wed Mar  1 14:19:28 2006
@@ -29,7 +29,7 @@
 #include <lemon/concept/graph.h>
 #include <lemon/concept/ugraph.h>
 
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 
 namespace lemon {
   namespace concept {

Modified: hugo/trunk/lemon/concept/graph.h
==============================================================================
--- hugo/trunk/lemon/concept/graph.h	(original)
+++ hugo/trunk/lemon/concept/graph.h	Wed Mar  1 14:19:28 2006
@@ -23,8 +23,8 @@
 ///\file
 ///\brief Declaration of Graph.
 
-#include <lemon/invalid.h>
-#include <lemon/utility.h>
+#include <lemon/bits/invalid.h>
+#include <lemon/bits/utility.h>
 #include <lemon/concept/maps.h>
 #include <lemon/concept_check.h>
 #include <lemon/concept/graph_component.h>

Modified: hugo/trunk/lemon/concept/graph_component.h
==============================================================================
--- hugo/trunk/lemon/concept/graph_component.h	(original)
+++ hugo/trunk/lemon/concept/graph_component.h	Wed Mar  1 14:19:28 2006
@@ -24,7 +24,7 @@
 #ifndef LEMON_CONCEPT_GRAPH_COMPONENT_H
 #define LEMON_CONCEPT_GRAPH_COMPONENT_H
 
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/concept/maps.h>
 
 #include <lemon/bits/alteration_notifier.h>

Modified: hugo/trunk/lemon/concept/heap.h
==============================================================================
--- hugo/trunk/lemon/concept/heap.h	(original)
+++ hugo/trunk/lemon/concept/heap.h	Wed Mar  1 14:19:28 2006
@@ -24,7 +24,7 @@
 #ifndef LEMON_CONCEPT_HEAP_H
 #define LEMON_CONCEPT_HEAP_H
 
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 
 namespace lemon {
   namespace concept {

Modified: hugo/trunk/lemon/concept/maps.h
==============================================================================
--- hugo/trunk/lemon/concept/maps.h	(original)
+++ hugo/trunk/lemon/concept/maps.h	Wed Mar  1 14:19:28 2006
@@ -19,7 +19,7 @@
 #ifndef LEMON_CONCEPT_MAPS_H
 #define LEMON_CONCEPT_MAPS_H
 
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 #include <lemon/concept_check.h>
 
 ///\ingroup concept

Modified: hugo/trunk/lemon/concept/matrix_maps.h
==============================================================================
--- hugo/trunk/lemon/concept/matrix_maps.h	(original)
+++ hugo/trunk/lemon/concept/matrix_maps.h	Wed Mar  1 14:19:28 2006
@@ -19,7 +19,7 @@
 #ifndef LEMON_CONCEPT_MATRIX_MAPS_H
 #define LEMON_CONCEPT_MATRIX_MAPS_H
 
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 #include <lemon/concept_check.h>
 
 ///\ingroup concept

Modified: hugo/trunk/lemon/concept/path.h
==============================================================================
--- hugo/trunk/lemon/concept/path.h	(original)
+++ hugo/trunk/lemon/concept/path.h	Wed Mar  1 14:19:28 2006
@@ -25,7 +25,7 @@
 #ifndef LEMON_CONCEPT_PATH_H
 #define LEMON_CONCEPT_PATH_H
 
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/concept_check.h>
 
 namespace lemon {

Modified: hugo/trunk/lemon/concept/ugraph.h
==============================================================================
--- hugo/trunk/lemon/concept/ugraph.h	(original)
+++ hugo/trunk/lemon/concept/ugraph.h	Wed Mar  1 14:19:28 2006
@@ -26,7 +26,7 @@
 
 #include <lemon/concept/graph_component.h>
 #include <lemon/concept/graph.h>
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 
 namespace lemon {
   namespace concept {

Modified: hugo/trunk/lemon/dag_shortest_path.h
==============================================================================
--- hugo/trunk/lemon/dag_shortest_path.h	(original)
+++ hugo/trunk/lemon/dag_shortest_path.h	Wed Mar  1 14:19:28 2006
@@ -25,7 +25,7 @@
 ///
 
 #include <lemon/list_graph.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 #include <lemon/maps.h>
 #include <lemon/topology.h>

Modified: hugo/trunk/lemon/dfs.h
==============================================================================
--- hugo/trunk/lemon/dfs.h	(original)
+++ hugo/trunk/lemon/dfs.h	Wed Mar  1 14:19:28 2006
@@ -25,7 +25,7 @@
 
 #include <lemon/list_graph.h>
 #include <lemon/graph_utils.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 #include <lemon/maps.h>
 

Modified: hugo/trunk/lemon/dijkstra.h
==============================================================================
--- hugo/trunk/lemon/dijkstra.h	(original)
+++ hugo/trunk/lemon/dijkstra.h	Wed Mar  1 14:19:28 2006
@@ -27,7 +27,7 @@
 
 #include <lemon/list_graph.h>
 #include <lemon/bin_heap.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 #include <lemon/maps.h>
 

Modified: hugo/trunk/lemon/dimacs.h
==============================================================================
--- hugo/trunk/lemon/dimacs.h	(original)
+++ hugo/trunk/lemon/dimacs.h	Wed Mar  1 14:19:28 2006
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 #include <lemon/maps.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 
 /// \ingroup dimacs_group
 /// \file

Modified: hugo/trunk/lemon/euler.h
==============================================================================
--- hugo/trunk/lemon/euler.h	(original)
+++ hugo/trunk/lemon/euler.h	Wed Mar  1 14:19:28 2006
@@ -16,7 +16,7 @@
  *
  */
 
-#include<lemon/invalid.h>
+#include<lemon/bits/invalid.h>
 #include<lemon/topology.h>
 #include <list>
 

Modified: hugo/trunk/lemon/floyd_warshall.h
==============================================================================
--- hugo/trunk/lemon/floyd_warshall.h	(original)
+++ hugo/trunk/lemon/floyd_warshall.h	Wed Mar  1 14:19:28 2006
@@ -26,7 +26,7 @@
 
 #include <lemon/list_graph.h>
 #include <lemon/graph_utils.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 #include <lemon/matrix_maps.h>
 #include <lemon/maps.h>

Modified: hugo/trunk/lemon/fredman_tarjan.h
==============================================================================
--- hugo/trunk/lemon/fredman_tarjan.h	(original)
+++ hugo/trunk/lemon/fredman_tarjan.h	Wed Mar  1 14:19:28 2006
@@ -30,10 +30,10 @@
 #include <lemon/smart_graph.h>
 #include <lemon/fib_heap.h>
 #include <lemon/radix_sort.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 #include <lemon/maps.h>
-#include <lemon/traits.h>
+#include <lemon/bits/traits.h>
 #include <lemon/graph_utils.h>
 
 #include <lemon/concept/ugraph.h>

Modified: hugo/trunk/lemon/full_graph.h
==============================================================================
--- hugo/trunk/lemon/full_graph.h	(original)
+++ hugo/trunk/lemon/full_graph.h	Wed Mar  1 14:19:28 2006
@@ -25,8 +25,8 @@
 #include <lemon/bits/graph_extender.h>
 
 
-#include <lemon/invalid.h>
-#include <lemon/utility.h>
+#include <lemon/bits/invalid.h>
+#include <lemon/bits/utility.h>
 
 
 ///\ingroup graphs

Modified: hugo/trunk/lemon/graph_adaptor.h
==============================================================================
--- hugo/trunk/lemon/graph_adaptor.h	(original)
+++ hugo/trunk/lemon/graph_adaptor.h	Wed Mar  1 14:19:28 2006
@@ -27,7 +27,7 @@
 ///
 ///\author Marton Makai
 
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/maps.h>
 
 #include <lemon/bits/graph_adaptor_extender.h>

Modified: hugo/trunk/lemon/graph_to_eps.h
==============================================================================
--- hugo/trunk/lemon/graph_to_eps.h	(original)
+++ hugo/trunk/lemon/graph_to_eps.h	Wed Mar  1 14:19:28 2006
@@ -30,7 +30,7 @@
 #include <ctime>
 #include <cmath>
 
-#include<lemon/invalid.h>
+#include<lemon/bits/invalid.h>
 #include<lemon/xy.h>
 #include<lemon/maps.h>
 #include<lemon/color.h>

Modified: hugo/trunk/lemon/graph_utils.h
==============================================================================
--- hugo/trunk/lemon/graph_utils.h	(original)
+++ hugo/trunk/lemon/graph_utils.h	Wed Mar  1 14:19:28 2006
@@ -24,10 +24,10 @@
 #include <map>
 #include <cmath>
 
-#include <lemon/invalid.h>
-#include <lemon/utility.h>
+#include <lemon/bits/invalid.h>
+#include <lemon/bits/utility.h>
 #include <lemon/maps.h>
-#include <lemon/traits.h>
+#include <lemon/bits/traits.h>
 
 #include <lemon/bits/alteration_notifier.h>
 #include <lemon/bits/default_map.h>

Modified: hugo/trunk/lemon/grid_ugraph.h
==============================================================================
--- hugo/trunk/lemon/grid_ugraph.h	(original)
+++ hugo/trunk/lemon/grid_ugraph.h	Wed Mar  1 14:19:28 2006
@@ -20,8 +20,8 @@
 #define GRID_UGRAPH_H
 
 #include <iostream>
-#include <lemon/invalid.h>
-#include <lemon/utility.h>
+#include <lemon/bits/invalid.h>
+#include <lemon/bits/utility.h>
 
 #include <lemon/bits/graph_extender.h>
 

Modified: hugo/trunk/lemon/hypercube_graph.h
==============================================================================
--- hugo/trunk/lemon/hypercube_graph.h	(original)
+++ hugo/trunk/lemon/hypercube_graph.h	Wed Mar  1 14:19:28 2006
@@ -21,8 +21,8 @@
 
 #include <iostream>
 #include <vector>
-#include <lemon/invalid.h>
-#include <lemon/utility.h>
+#include <lemon/bits/invalid.h>
+#include <lemon/bits/utility.h>
 #include <lemon/error.h>
 
 #include <lemon/bits/graph_extender.h>

Modified: hugo/trunk/lemon/iterable_maps.h
==============================================================================
--- hugo/trunk/lemon/iterable_maps.h	(original)
+++ hugo/trunk/lemon/iterable_maps.h	Wed Mar  1 14:19:28 2006
@@ -16,8 +16,8 @@
  *
  */
 
-#include <lemon/traits.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/traits.h>
+#include <lemon/bits/invalid.h>
 
 #include <lemon/bits/default_map.h>
 

Modified: hugo/trunk/lemon/johnson.h
==============================================================================
--- hugo/trunk/lemon/johnson.h	(original)
+++ hugo/trunk/lemon/johnson.h	Wed Mar  1 14:19:28 2006
@@ -28,7 +28,7 @@
 #include <lemon/graph_utils.h>
 #include <lemon/dijkstra.h>
 #include <lemon/bellman_ford.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 #include <lemon/maps.h>
 #include <lemon/matrix_maps.h>

Modified: hugo/trunk/lemon/kruskal.h
==============================================================================
--- hugo/trunk/lemon/kruskal.h	(original)
+++ hugo/trunk/lemon/kruskal.h	Wed Mar  1 14:19:28 2006
@@ -22,8 +22,8 @@
 #include <algorithm>
 #include <vector>
 #include <lemon/unionfind.h>
-#include <lemon/utility.h>
-#include <lemon/traits.h>
+#include <lemon/bits/utility.h>
+#include <lemon/bits/traits.h>
 
 /**
 @defgroup spantree Minimum Cost Spanning Tree Algorithms

Modified: hugo/trunk/lemon/lemon_reader.h
==============================================================================
--- hugo/trunk/lemon/lemon_reader.h	(original)
+++ hugo/trunk/lemon/lemon_reader.h	Wed Mar  1 14:19:28 2006
@@ -35,7 +35,7 @@
 
 #include <lemon/error.h>
 #include <lemon/graph_utils.h>
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 #include <lemon/bits/item_reader.h>
 
 #include <lemon/xy.h>

Modified: hugo/trunk/lemon/lemon_writer.h
==============================================================================
--- hugo/trunk/lemon/lemon_writer.h	(original)
+++ hugo/trunk/lemon/lemon_writer.h	Wed Mar  1 14:19:28 2006
@@ -32,10 +32,10 @@
 #include <memory>
 
 #include <lemon/error.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/graph_utils.h>
 #include <lemon/bits/item_writer.h>
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 #include <lemon/maps.h>
 #include <lemon/xy.h>
 

Modified: hugo/trunk/lemon/lp_base.h
==============================================================================
--- hugo/trunk/lemon/lp_base.h	(original)
+++ hugo/trunk/lemon/lp_base.h	Wed Mar  1 14:19:28 2006
@@ -24,9 +24,9 @@
 #include<limits>
 #include<cmath>
 
-#include<lemon/utility.h>
+#include<lemon/bits/utility.h>
 #include<lemon/error.h>
-#include<lemon/invalid.h>
+#include<lemon/bits/invalid.h>
 
 ///\file
 ///\brief The interface of the LP solver interface.

Modified: hugo/trunk/lemon/map_iterator.h
==============================================================================
--- hugo/trunk/lemon/map_iterator.h	(original)
+++ hugo/trunk/lemon/map_iterator.h	Wed Mar  1 14:19:28 2006
@@ -19,8 +19,8 @@
 #ifndef LEMON_MAP_ITERATOR_H
 #define LEMON_MAP_ITERATOR_H
 
-#include <lemon/traits.h>
-#include <lemon/utility.h>
+#include <lemon/bits/traits.h>
+#include <lemon/bits/utility.h>
 
 /// \ingroup gutils
 /// \file

Modified: hugo/trunk/lemon/maps.h
==============================================================================
--- hugo/trunk/lemon/maps.h	(original)
+++ hugo/trunk/lemon/maps.h	Wed Mar  1 14:19:28 2006
@@ -21,8 +21,8 @@
 
 #include <iterator>
 
-#include <lemon/utility.h>
-#include <lemon/traits.h>
+#include <lemon/bits/utility.h>
+#include <lemon/bits/traits.h>
 
 ///\file
 ///\ingroup maps

Modified: hugo/trunk/lemon/matrix_maps.h
==============================================================================
--- hugo/trunk/lemon/matrix_maps.h	(original)
+++ hugo/trunk/lemon/matrix_maps.h	Wed Mar  1 14:19:28 2006
@@ -21,7 +21,7 @@
 
 
 #include <vector>
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 #include <lemon/maps.h>
 
 

Modified: hugo/trunk/lemon/max_matching.h
==============================================================================
--- hugo/trunk/lemon/max_matching.h	(original)
+++ hugo/trunk/lemon/max_matching.h	Wed Mar  1 14:19:28 2006
@@ -20,7 +20,7 @@
 #define LEMON_MAX_MATCHING_H
 
 #include <queue>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/unionfind.h>
 #include <lemon/graph_utils.h>
 

Modified: hugo/trunk/lemon/min_cut.h
==============================================================================
--- hugo/trunk/lemon/min_cut.h	(original)
+++ hugo/trunk/lemon/min_cut.h	Wed Mar  1 14:19:28 2006
@@ -26,7 +26,7 @@
 #include <lemon/bin_heap.h>
 #include <lemon/linear_heap.h>
 
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 #include <lemon/maps.h>
 

Modified: hugo/trunk/lemon/path.h
==============================================================================
--- hugo/trunk/lemon/path.h	(original)
+++ hugo/trunk/lemon/path.h	Wed Mar  1 14:19:28 2006
@@ -45,7 +45,7 @@
 #include <vector>
 #include <algorithm>
 
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 
 namespace lemon {
 

Modified: hugo/trunk/lemon/preflow.h
==============================================================================
--- hugo/trunk/lemon/preflow.h	(original)
+++ hugo/trunk/lemon/preflow.h	Wed Mar  1 14:19:28 2006
@@ -23,7 +23,7 @@
 #include <queue>
 
 #include <lemon/error.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/tolerance.h>
 #include <lemon/maps.h>
 #include <lemon/graph_utils.h>

Modified: hugo/trunk/lemon/prim.h
==============================================================================
--- hugo/trunk/lemon/prim.h	(original)
+++ hugo/trunk/lemon/prim.h	Wed Mar  1 14:19:28 2006
@@ -25,10 +25,10 @@
 
 #include <lemon/list_graph.h>
 #include <lemon/bin_heap.h>
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/error.h>
 #include <lemon/maps.h>
-#include <lemon/traits.h>
+#include <lemon/bits/traits.h>
 
 #include <lemon/concept/ugraph.h>
 

Modified: hugo/trunk/lemon/smart_graph.h
==============================================================================
--- hugo/trunk/lemon/smart_graph.h	(original)
+++ hugo/trunk/lemon/smart_graph.h	Wed Mar  1 14:19:28 2006
@@ -25,11 +25,11 @@
 
 #include <vector>
 
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 
 #include <lemon/bits/graph_extender.h>
 
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 #include <lemon/error.h>
 
 #include <lemon/bits/graph_extender.h>

Modified: hugo/trunk/lemon/ugraph_adaptor.h
==============================================================================
--- hugo/trunk/lemon/ugraph_adaptor.h	(original)
+++ hugo/trunk/lemon/ugraph_adaptor.h	Wed Mar  1 14:19:28 2006
@@ -27,12 +27,12 @@
 ///
 ///\author Balazs Dezso
 
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 #include <lemon/maps.h>
 
 #include <lemon/bits/graph_adaptor_extender.h>
 
-#include <lemon/traits.h>
+#include <lemon/bits/traits.h>
 
 #include <iostream>
 

Modified: hugo/trunk/lemon/unionfind.h
==============================================================================
--- hugo/trunk/lemon/unionfind.h	(original)
+++ hugo/trunk/lemon/unionfind.h	Wed Mar  1 14:19:28 2006
@@ -29,7 +29,7 @@
 #include <utility>
 #include <algorithm>
 
-#include <lemon/invalid.h>
+#include <lemon/bits/invalid.h>
 
 namespace lemon {
 

Modified: hugo/trunk/lemon/xy.h
==============================================================================
--- hugo/trunk/lemon/xy.h	(original)
+++ hugo/trunk/lemon/xy.h	Wed Mar  1 14:19:28 2006
@@ -20,7 +20,7 @@
 #define LEMON_XY_H
 
 #include <iostream>
-#include <lemon/utility.h>
+#include <lemon/bits/utility.h>
 
 ///\ingroup misc
 ///\file

Modified: hugo/trunk/test/max_matching_test.cc
==============================================================================
--- hugo/trunk/test/max_matching_test.cc	(original)
+++ hugo/trunk/test/max_matching_test.cc	Wed Mar  1 14:19:28 2006
@@ -23,7 +23,6 @@
 #include <cstdlib>
 
 #include "test_tools.h"
-#include <lemon/invalid.h>
 #include <lemon/list_graph.h>
 #include <lemon/max_matching.h>
 

Modified: hugo/trunk/test/test_tools.h
==============================================================================
--- hugo/trunk/test/test_tools.h	(original)
+++ hugo/trunk/test/test_tools.h	Wed Mar  1 14:19:28 2006
@@ -25,8 +25,8 @@
 #include <cstdlib>
 #include <ctime>
 
-#include <lemon/invalid.h>
 #include <lemon/concept_check.h>
+#include <lemon/concept/graph.h>
 
 using namespace lemon;
 



More information about the Lemon-commits mailing list