Merge branch 'bucket_sorter' of https://github.com/deinst/graph into develop

Fixed Conflicts:
	example/Jamfile.v2

example/Jamfile.v2

@@ -30,6 +30,7 @@ run boost_web_graph.cpp : $(TEST_DIR)/boost_web.dat ;
 exe boykov_kolmogorov-eg : boykov_kolmogorov-eg.cpp ;
 exe bron_kerbosch_clique_number : bron_kerbosch_clique_number.cpp ;
 exe bron_kerbosch_print_cliques : bron_kerbosch_print_cliques.cpp ;
+run bucket_sorter.cpp ;
 run canonical_ordering.cpp ;
 run city_visitor.cpp ;
 exe closeness_centrality : closeness_centrality.cpp ;
@@ -223,7 +224,3 @@ explicit girth ;
 # This one dereferences a null-iterator:
 #
 # run ordered_out_edges.cpp ;
-#
-# does not compile:
-#
-# run bucket_sorter.cpp ;

example/bucket_sorter.cpp

@@ -24,17 +24,6 @@
 #include <stdlib.h>
 #include <boost/pending/bucket_sorter.hpp>
 
-template <class Integral>
-struct trivial_id {
-  std::size_t operator[](Integral i) {
-    return i;
-  }
-  std::size_t operator[](Integral i) const {
-    return i;
-  }
-};
-
-
 int main() {
   using namespace std;
   using boost::bucket_sorter;
@@ -45,10 +34,10 @@ int main() {
   for (std::size_t i=0; i<N; i++) {
     bucket[i] = rand() % N;
     cout.width(6);
-    cout << "Number " << i << " has its bucket "  << bucket[i] << endl;
+    cout << "Number " << i << " is in bucket "  << bucket[i] << endl;
   }
 
-  typedef trivial_id<int> ID;
+  typedef boost::identity_property_map ID;
   typedef bucket_sorter<std::size_t, int,
     vector<std::size_t>::iterator, ID> BS;
   BS my_bucket_sorter(N, N, bucket.begin());
@@ -68,7 +57,7 @@ int main() {
       } while ( ! my_bucket_sorter[j].empty() );
       cout << endl;
     } else {
-      cout << " has no number associated with." << endl;
+      cout << " has no number associated with it." << endl;
     }
   }
 
@@ -78,7 +67,7 @@ int main() {
   my_bucket_sorter.remove(5);
   my_bucket_sorter.remove(7);
 
-  cout << "Afer remove number 5 and 7, check correctness again." << endl;
+  cout << "After removing numbers 5 and 7, check correctness again." << endl;
 
   for (j=0; j<N; j++) {
     cout << "The bucket " << j;
@@ -91,7 +80,7 @@ int main() {
       } while ( ! my_bucket_sorter[j].empty() );
       cout << endl;
     } else {
-      cout << " has no number associated with." << endl;
+      cout << " has no number associated with it." << endl;
     }
   }
 

include/boost/pending/bucket_sorter.hpp

@@ -19,12 +19,15 @@
 #include <vector>
 #include <cassert>
 #include <boost/limits.hpp>
+#include <boost/concept/assert.hpp>
+#include <boost/property_map/property_map.hpp>
 
 namespace boost {
 
   template <class BucketType, class ValueType, class Bucket,
             class ValueIndexMap>
   class bucket_sorter {
+    BOOST_CONCEPT_ASSERT(( ReadablePropertyMapConcept<ValueIndexMap, ValueType> ));
   public:
     typedef BucketType bucket_type;
     typedef ValueType value_type;