Subject: [Boost-commit] svn:boost r86382 - in trunk/boost/property_map: . parallel
From: jewillco_at_[hidden]
Date: 2013-10-21 14:43:32
Author: jewillco
Date: 2013-10-21 14:43:32 EDT (Mon, 21 Oct 2013)
New Revision: 86382
URL: http://svn.boost.org/trac/boost/changeset/86382
Log:
Moved parallel vector_property_map into its own file
Added:
trunk/boost/property_map/parallel/vector_property_map.hpp
- copied, changed from r86380, trunk/boost/property_map/vector_property_map.hpp
Text files modified:
trunk/boost/property_map/parallel/vector_property_map.hpp | 87 +-------------------------------------
trunk/boost/property_map/vector_property_map.hpp | 90 ---------------------------------------
2 files changed, 5 insertions(+), 172 deletions(-)
Copied and modified: trunk/boost/property_map/parallel/vector_property_map.hpp (from r86380, trunk/boost/property_map/vector_property_map.hpp)
==============================================================================
--- trunk/boost/property_map/vector_property_map.hpp Mon Oct 21 08:26:30 2013 (r86380, copy source)
+++ trunk/boost/property_map/parallel/vector_property_map.hpp 2013-10-21 14:43:32 EDT (Mon, 21 Oct 2013) (r86382)
@@ -7,92 +7,12 @@
// documentation.
//
-#ifndef VECTOR_PROPERTY_MAP_HPP_VP_2003_03_04
-#define VECTOR_PROPERTY_MAP_HPP_VP_2003_03_04
+#ifndef BOOST_PROPERTY_MAP_PARALLEL_VECTOR_PROPERTY_MAP_HPP_VP_2003_03_04
+#define BOOST_PROPERTY_MAP_PARALLEL_VECTOR_PROPERTY_MAP_HPP_VP_2003_03_04
#include <boost/property_map/property_map.hpp>
#include <boost/shared_ptr.hpp>
#include <vector>
-
-namespace boost {
- template<typename T, typename IndexMap = identity_property_map>
- class vector_property_map
- : public boost::put_get_helper<
- typename std::iterator_traits<
- typename std::vector<T>::iterator >::reference,
- vector_property_map<T, IndexMap> >
- {
- public:
- typedef typename property_traits<IndexMap>::key_type key_type;
- typedef T value_type;
- typedef typename std::iterator_traits<
- typename std::vector<T>::iterator >::reference reference;
- typedef boost::lvalue_property_map_tag category;
-
- vector_property_map(const IndexMap& index = IndexMap())
- : store(new std::vector<T>()), index(index)
- {}
-
- vector_property_map(unsigned initial_size,
- const IndexMap& index = IndexMap())
- : store(new std::vector<T>(initial_size)), index(index)
- {}
-
- typename std::vector<T>::iterator storage_begin()
- {
- return store->begin();
- }
-
- typename std::vector<T>::iterator storage_end()
- {
- return store->end();
- }
-
- typename std::vector<T>::const_iterator storage_begin() const
- {
- return store->begin();
- }
-
- typename std::vector<T>::const_iterator storage_end() const
- {
- return store->end();
- }
-
- IndexMap& get_index_map() { return index; }
- const IndexMap& get_index_map() const { return index; }
-
- public:
- // Copy ctor absent, default semantics is OK.
- // Assignment operator absent, default semantics is OK.
- // CONSIDER: not sure that assignment to 'index' is correct.
-
- reference operator[](const key_type& v) const {
- typename property_traits<IndexMap>::value_type i = get(index, v);
- if (static_cast<unsigned>(i) >= store->size()) {
- store->resize(i + 1, T());
- }
- return (*store)[i];
- }
- private:
- // Conceptually, we have a vector of infinite size. For practical
- // purposes, we start with an empty vector and grow it as needed.
- // Note that we cannot store pointer to vector here -- we cannot
- // store pointer to data, because if copy of property map resizes
- // the vector, the pointer to data will be invalidated.
- // I wonder if class 'pmap_ref' is simply needed.
- shared_ptr< std::vector<T> > store;
- IndexMap index;
- };
-
- template<typename T, typename IndexMap>
- vector_property_map<T, IndexMap>
- make_vector_property_map(IndexMap index)
- {
- return vector_property_map<T, IndexMap>(index);
- }
-}
-
-#ifdef BOOST_GRAPH_USE_MPI
#include <boost/property_map/parallel/distributed_property_map.hpp>
#include <boost/property_map/parallel/local_property_map.hpp>
@@ -180,6 +100,5 @@
};
}
-#endif // BOOST_GRAPH_USE_MPI
-#endif
+#endif // BOOST_PROPERTY_MAP_PARALLEL_VECTOR_PROPERTY_MAP_HPP_VP_2003_03_04
Modified: trunk/boost/property_map/vector_property_map.hpp
==============================================================================
--- trunk/boost/property_map/vector_property_map.hpp Mon Oct 21 14:29:04 2013 (r86381)
+++ trunk/boost/property_map/vector_property_map.hpp 2013-10-21 14:43:32 EDT (Mon, 21 Oct 2013) (r86382)
@@ -93,93 +93,7 @@
}
#ifdef BOOST_GRAPH_USE_MPI
-#include <boost/property_map/parallel/distributed_property_map.hpp>
-#include <boost/property_map/parallel/local_property_map.hpp>
-
-namespace boost {
-
-/** Distributed vector property map.
- *
- * This specialization of @ref vector_property_map builds a
- * distributed vector property map given the local index maps
- * generated by distributed graph types that automatically have index
- * properties.
- *
- * This specialization is useful when creating external distributed
- * property maps via the same syntax used to create external
- * sequential property maps.
- */
-template<typename T, typename ProcessGroup, typename GlobalMap,
- typename StorageMap>
-class vector_property_map<T,
- local_property_map<ProcessGroup, GlobalMap,
- StorageMap> >
- : public parallel::distributed_property_map<
- ProcessGroup, GlobalMap, vector_property_map<T, StorageMap> >
-{
- typedef vector_property_map<T, StorageMap> local_iterator_map;
-
- typedef parallel::distributed_property_map<ProcessGroup, GlobalMap,
- local_iterator_map> inherited;
-
- typedef local_property_map<ProcessGroup, GlobalMap, StorageMap> index_map_type;
-
-public:
- vector_property_map(const index_map_type& index = index_map_type())
- : inherited(index.process_group(), index.global(),
- local_iterator_map(index.base())) { }
-
- vector_property_map(unsigned inital_size,
- const index_map_type& index = index_map_type())
- : inherited(index.process_group(), index.global(),
- local_iterator_map(inital_size, index.base())) { }
-};
-
-/** Distributed vector property map.
- *
- * This specialization of @ref vector_property_map builds a
- * distributed vector property map given the local index maps
- * generated by distributed graph types that automatically have index
- * properties.
- *
- * This specialization is useful when creating external distributed
- * property maps via the same syntax used to create external
- * sequential property maps.
- */
-template<typename T, typename ProcessGroup, typename GlobalMap,
- typename StorageMap>
-class vector_property_map<
- T,
- parallel::distributed_property_map<
- ProcessGroup,
- GlobalMap,
- StorageMap
- >
- >
- : public parallel::distributed_property_map<
- ProcessGroup, GlobalMap, vector_property_map<T, StorageMap> >
-{
- typedef vector_property_map<T, StorageMap> local_iterator_map;
-
- typedef parallel::distributed_property_map<ProcessGroup, GlobalMap,
- local_iterator_map> inherited;
-
- typedef parallel::distributed_property_map<ProcessGroup, GlobalMap,
- StorageMap>
- index_map_type;
-
-public:
- vector_property_map(const index_map_type& index = index_map_type())
- : inherited(index.process_group(), index.global(),
- local_iterator_map(index.base())) { }
-
- vector_property_map(unsigned inital_size,
- const index_map_type& index = index_map_type())
- : inherited(index.process_group(), index.global(),
- local_iterator_map(inital_size, index.base())) { }
-};
-
-}
-#endif // BOOST_GRAPH_USE_MPI
+#include <boost/property_map/parallel/vector_property_map.hpp>
+#endif
#endif