Subject: [Boost-commit] svn:boost r59113 - in sandbox/numeric_bindings/libs/numeric/bindings: lapack/test tools tools/templates
From: rutger_at_[hidden]
Date: 2010-01-18 03:43:55
Author: rutger
Date: 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
New Revision: 59113
URL: http://svn.boost.org/trac/boost/changeset/59113
Log:
rename of value<T> to value_type<T> (tools/lapack regressions part)
Text files modified:
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp | 4 ++--
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelsd.cpp | 8 ++++----
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelss.cpp | 8 ++++----
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp | 12 ++++++------
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevx.cpp | 12 ++++++------
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/utils.h | 10 +++++-----
sandbox/numeric_bindings/libs/numeric/bindings/tools/bindings.py | 2 +-
sandbox/numeric_bindings/libs/numeric/bindings/tools/blas_generator.py | 8 ++++----
sandbox/numeric_bindings/libs/numeric/bindings/tools/lapack_generator.py | 6 +++---
sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py | 2 --
sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.hpp | 4 ++--
sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp | 6 +++---
12 files changed, 40 insertions(+), 42 deletions(-)
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gees.cpp 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -9,7 +9,7 @@
#include "../../blas/test/random.hpp"
#include <boost/numeric/bindings/begin.hpp>
-#include <boost/numeric/bindings/value.hpp>
+#include <boost/numeric/bindings/value_type.hpp>
#include <boost/numeric/bindings/remove_imaginary.hpp>
#include <boost/numeric/bindings/ublas/matrix.hpp>
#include <boost/numeric/bindings/ublas/vector.hpp>
@@ -34,7 +34,7 @@
static inline integer_t gees( const char jobvs, const char sort,
logical_t* select, MatrixA& a, integer_t& sdim, VectorW& w,
MatrixVS& vs, Workspace work ) {
- typedef typename bindings::value< MatrixA >::type value_type;
+ typedef typename bindings::value_type< MatrixA >::type value_type;
bindings::detail::array<value_type> wr(bindings::size(w));
bindings::detail::array<value_type> wi(bindings::size(w));
integer_t info = lapack::gees( jobvs, sort, select, a, sdim, wr, wi, vs, work );
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelsd.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelsd.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelsd.cpp 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -236,7 +236,7 @@
template <typename StreamType, typename MatType, typename VecType>
int test_square_gelsd(StreamType& oss)
{
- typedef typename bindings::value<MatType>::type val_t;
+ typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
integer_t rank;
@@ -297,7 +297,7 @@
template <typename StreamType, typename MatType, typename VecType>
int test_under_gelsd(StreamType& oss)
{
- typedef typename bindings::value<MatType>::type val_t;
+ typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
integer_t rank;
@@ -358,7 +358,7 @@
template <typename StreamType, typename MatType, typename VecType>
int test_over_gelsd(StreamType& oss)
{
- typedef typename bindings::value<MatType>::type val_t;
+ typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
integer_t rank;
@@ -419,7 +419,7 @@
template <typename StreamType, typename MatType, typename VecType>
int test_multiple_gelsd(StreamType& oss)
{
- typedef typename bindings::value<MatType>::type val_t;
+ typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
integer_t rank;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelss.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelss.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_gelss.cpp 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -220,7 +220,7 @@
template <typename StreamType, typename MatType, typename VecType>
int test_square_gelss(StreamType& oss)
{
- typedef typename bindings::value<MatType>::type val_t;
+ typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
integer_t rank;
@@ -281,7 +281,7 @@
template <typename StreamType, typename MatType, typename VecType>
int test_under_gelss(StreamType& oss)
{
- typedef typename bindings::value<MatType>::type val_t;
+ typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
integer_t rank;
@@ -342,7 +342,7 @@
template <typename StreamType, typename MatType, typename VecType>
int test_over_gelss(StreamType& oss)
{
- typedef typename bindings::value<MatType>::type val_t;
+ typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
integer_t rank;
@@ -403,7 +403,7 @@
template <typename StreamType, typename MatType, typename VecType>
int test_multiple_gelss(StreamType& oss)
{
- typedef typename bindings::value<MatType>::type val_t;
+ typedef typename bindings::value_type<MatType>::type val_t;
typedef typename bindings::remove_imaginary<val_t>::type real_t;
const real_t rcond = -1; // use machine precision
integer_t rank;
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hbevx.cpp 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -34,11 +34,11 @@
typename MatrixZ, typename VectorIFAIL, typename Workspace >
static inline std::ptrdiff_t hbevx(
const char jobz, const char range, MatrixAB& ab, MatrixQ& q,
- const typename bindings::remove_imaginary< typename bindings::value<
+ const typename bindings::remove_imaginary< typename bindings::value_type<
MatrixAB >::type >::type vl, const typename bindings::remove_imaginary<
- typename bindings::value< MatrixAB >::type >::type vu,
+ typename bindings::value_type< MatrixAB >::type >::type vu,
const fortran_int_t il, const fortran_int_t iu,
- const typename bindings::remove_imaginary< typename bindings::value<
+ const typename bindings::remove_imaginary< typename bindings::value_type<
MatrixAB >::type >::type abstol, fortran_int_t& m, VectorW& w,
MatrixZ& z, VectorIFAIL& ifail, Workspace work ) {
return lapack::sbevx( jobz, range, ab, q, vl, vu,
@@ -51,11 +51,11 @@
typename MatrixZ, typename VectorIFAIL, typename Workspace >
static inline std::ptrdiff_t hbevx(
const char jobz, const char range, MatrixAB& ab, MatrixQ& q,
- const typename bindings::remove_imaginary< typename bindings::value<
+ const typename bindings::remove_imaginary< typename bindings::value_type<
MatrixAB >::type >::type vl, const typename bindings::remove_imaginary<
- typename bindings::value< MatrixAB >::type >::type vu,
+ typename bindings::value_type< MatrixAB >::type >::type vu,
const fortran_int_t il, const fortran_int_t iu,
- const typename bindings::remove_imaginary< typename bindings::value<
+ const typename bindings::remove_imaginary< typename bindings::value_type<
MatrixAB >::type >::type abstol, fortran_int_t& m, VectorW& w,
MatrixZ& z, VectorIFAIL& ifail, Workspace work ) {
return lapack::hbevx( jobz, range, ab, q, vl, vu,
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevx.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevx.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_heevx.cpp 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -32,11 +32,11 @@
template< typename MatrixA, typename VectorW, typename MatrixZ,
typename VectorIFAIL, typename Workspace >
static inline std::ptrdiff_t heevx( const char jobz, const char range,
- MatrixA& a, const typename bindings::remove_imaginary< typename bindings::value<
+ MatrixA& a, const typename bindings::remove_imaginary< typename bindings::value_type<
MatrixA >::type >::type vl, const typename bindings::remove_imaginary<
- typename bindings::value< MatrixA >::type >::type vu,
+ typename bindings::value_type< MatrixA >::type >::type vu,
const fortran_int_t il, const fortran_int_t iu,
- const typename bindings::remove_imaginary< typename bindings::value<
+ const typename bindings::remove_imaginary< typename bindings::value_type<
MatrixA >::type >::type abstol, fortran_int_t& m, VectorW& w,
MatrixZ& z, VectorIFAIL& ifail, Workspace work ) {
return lapack::syevx( jobz,
@@ -49,11 +49,11 @@
template< typename MatrixA, typename VectorW, typename MatrixZ,
typename VectorIFAIL, typename Workspace >
static inline std::ptrdiff_t heevx( const char jobz, const char range,
- MatrixA& a, const typename bindings::remove_imaginary< typename bindings::value<
+ MatrixA& a, const typename bindings::remove_imaginary< typename bindings::value_type<
MatrixA >::type >::type vl, const typename bindings::remove_imaginary<
- typename bindings::value< MatrixA >::type >::type vu,
+ typename bindings::value_type< MatrixA >::type >::type vu,
const fortran_int_t il, const fortran_int_t iu,
- const typename bindings::remove_imaginary< typename bindings::value<
+ const typename bindings::remove_imaginary< typename bindings::value_type<
MatrixA >::type >::type abstol, fortran_int_t& m, VectorW& w,
MatrixZ& z, VectorIFAIL& ifail, Workspace work ) {
return lapack::heevx( jobz,
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/utils.h
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/utils.h (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/utils.h 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -6,7 +6,7 @@
#include <iostream>
#include <boost/numeric/bindings/size.hpp>
#include <boost/numeric/bindings/begin.hpp>
-#include <boost/numeric/bindings/value.hpp>
+#include <boost/numeric/bindings/value_type.hpp>
///////////////////////////////
@@ -16,7 +16,7 @@
template <typename V>
struct vct_access_traits {
typedef typename
- boost::numeric::bindings::value<V>::type val_t;
+ boost::numeric::bindings::value_type<V>::type val_t;
typedef val_t& ref_t;
static ref_t elem (V& v, size_t i) { return v[i]; }
};
@@ -24,7 +24,7 @@
template <typename V>
struct vct_access_traits<V const> {
typedef typename
- boost::numeric::bindings::value<V>::type val_t;
+ boost::numeric::bindings::value_type<V>::type val_t;
typedef val_t ref_t;
static ref_t elem (V const& v, size_t i) { return v[i]; }
};
@@ -112,7 +112,7 @@
template <typename M>
struct matr_access_traits<M const> {
typedef typename
- boost::numeric::bindings::value<M>::type val_t;
+ boost::numeric::bindings::value_type<M>::type val_t;
typedef val_t ref_t;
static ref_t elem (M const& m, size_t i, size_t j) { return m (i, j); }
};
@@ -188,7 +188,7 @@
std::cout << ch << " data:\n";
using namespace boost::numeric::bindings;
std::copy( begin_value( m ), end_value( m ), std::ostream_iterator
- < typename value< const M >::type >( std::cout, " " ) );
+ < typename value_type< const M >::type >( std::cout, " " ) );
std::cout << std::endl;
}
Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/bindings.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/bindings.py (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/bindings.py 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -328,7 +328,7 @@
# Generate the call to the value_tye meta-func
#
def value_type( arg ):
- return 'typename value< ' + arg + ' >::type'
+ return 'typename bindings::value_type< ' + arg + ' >::type'
#
# Search replace stuff for handling exceptional cases through the
Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/blas_generator.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/blas_generator.py (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/blas_generator.py 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -56,7 +56,7 @@
#'#include <boost/numeric/bindings/traits/type_traits.hpp>',
'#include <boost/numeric/bindings/remove_imaginary.hpp>',
'#include <boost/numeric/bindings/is_mutable.hpp>',
- '#include <boost/numeric/bindings/value.hpp>',
+ '#include <boost/numeric/bindings/value_type.hpp>',
'#include <boost/numeric/bindings/stride.hpp>',
'#include <boost/numeric/bindings/size.hpp>',
'#include <boost/numeric/bindings/begin.hpp>',
@@ -275,8 +275,8 @@
arg_right = info_map[ subroutine ][ 'argument_map' ][ arg_B ][ 'code' ][ 'level_1_static_assert' ]
if arg_left != None and arg_right != None:
assert_line = 'BOOST_STATIC_ASSERT( (is_same< ' + \
- 'typename remove_const< typename value< ' + arg_left + ' >::type >::type, ' + \
- 'typename remove_const< typename value< ' + arg_right + ' >::type >::type' \
+ 'typename remove_const< typename bindings::value_type< ' + arg_left + ' >::type >::type, ' + \
+ 'typename remove_const< typename bindings::value_type< ' + arg_right + ' >::type >::type' \
' >::value) );'
if not has_comment:
#level1_static_assert_list += [ '// Here, we assert... ' ]
@@ -381,7 +381,7 @@
level2_template = level2_template.replace( ' $STATIC_ASSERTS\n', '' )
if first_typename == 'Value':
- level2_template = level2_template.replace( 'typename value< Value >::type', 'Value' )
+ level2_template = level2_template.replace( 'typename bindings::value_type< Value >::type', 'Value' )
level2_template = level2_template.replace( 'typename remove_imaginary< Value >::type', 'Value' )
level1_map[ value_type ] = bindings.proper_indent( level1_template )
Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/lapack_generator.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/lapack_generator.py (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/lapack_generator.py 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -58,7 +58,7 @@
filename = group_name.lower() + '.hpp'
includes = [ '#include <boost/assert.hpp>',
'#include <boost/numeric/bindings/remove_imaginary.hpp>',
- '#include <boost/numeric/bindings/value.hpp>',
+ '#include <boost/numeric/bindings/value_type.hpp>',
'#include <boost/numeric/bindings/begin.hpp>',
'#include <boost/numeric/bindings/size.hpp>',
#'#include <boost/numeric/bindings/tag.hpp>',
@@ -256,8 +256,8 @@
for arg_B in static_asserts[1:]:
print "Adding static assert for argA", arg_A, " argb", arg_B
assert_line = 'BOOST_STATIC_ASSERT( (boost::is_same< ' + \
- 'typename remove_const< typename value< ' + info_map[ subroutine ][ 'argument_map' ][ arg_A ][ 'code' ][ 'level_1_static_assert' ] + ' >::type >::type, ' + \
- 'typename remove_const< typename value< ' + info_map[ subroutine ][ 'argument_map' ][ arg_B ][ 'code' ][ 'level_1_static_assert' ] + ' >::type >::type' \
+ 'typename remove_const< typename bindings::value_type< ' + info_map[ subroutine ][ 'argument_map' ][ arg_A ][ 'code' ][ 'level_1_static_assert' ] + ' >::type >::type, ' + \
+ 'typename remove_const< typename bindings::value_type< ' + info_map[ subroutine ][ 'argument_map' ][ arg_B ][ 'code' ][ 'level_1_static_assert' ] + ' >::type >::type' \
' >::value) );'
level1_static_assert_list += [ assert_line ]
Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -340,10 +340,8 @@
if 'workspace' not in properties[ 'io' ]:
if properties[ 'type' ] == 'matrix' or properties[ 'type' ] == 'vector':
result = level1_typename( name, properties ).replace( "typename ", "" )
- #result = "typename value< " + level1_typename( name, properties ).replace( "typename ", "" ) + " >::type"
elif properties[ 'type' ] == 'scalar':
result = "TODO HOOK"
- #result = "typename value< " + level1_type( name, properties ) + " >::type"
return result
Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.hpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.hpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.hpp 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -142,8 +142,8 @@
$COMMENTS
//
template< $TYPES >
-inline typename $groupname_impl< typename value< $FIRST_TYPENAME >::type >::return_type
+inline typename $groupname_impl< typename bindings::value_type< $FIRST_TYPENAME >::type >::return_type
$groupname( $LEVEL2 ) {
- $RETURN_STATEMENT$groupname_impl< typename value< $FIRST_TYPENAME >::type >::invoke( $CALL_LEVEL1 );
+ $RETURN_STATEMENT$groupname_impl< typename bindings::value_type< $FIRST_TYPENAME >::type >::invoke( $CALL_LEVEL1 );
}
$TEMPLATE[end]
Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp 2010-01-18 03:43:53 EST (Mon, 18 Jan 2010)
@@ -216,7 +216,7 @@
template< $TYPES, typename Workspace >
inline typename boost::enable_if< detail::is_workspace< Workspace >, $INTEGER_TYPE >::type
$groupname( $LEVEL2, Workspace work ) {
- return $groupname_impl< typename value< $FIRST_TYPENAME >::type >::invoke( $CALL_LEVEL1, work );
+ return $groupname_impl< typename bindings::value_type< $FIRST_TYPENAME >::type >::invoke( $CALL_LEVEL1, work );
}
//
@@ -227,7 +227,7 @@
template< $TYPES >
inline typename boost::disable_if< detail::is_workspace< $LAST_TYPENAME >, $INTEGER_TYPE >::type
$groupname( $LEVEL2 ) {
- return $groupname_impl< typename value< $FIRST_TYPENAME >::type >::invoke( $CALL_LEVEL1, optimal_workspace() );
+ return $groupname_impl< typename bindings::value_type< $FIRST_TYPENAME >::type >::invoke( $CALL_LEVEL1, optimal_workspace() );
}
$TEMPLATE[setup_min_workspace]
bindings::detail::array< $WORKSPACE_TYPE > tmp_$NAME( min_size_$NAME( $CALL_MIN_SIZE ) );
@@ -270,6 +270,6 @@
//
template< $TYPES >
inline $INTEGER_TYPE $groupname( $LEVEL2 ) {
- return $groupname_impl< typename value< $FIRST_TYPENAME >::type >::invoke( $CALL_LEVEL1 );
+ return $groupname_impl< typename bindings::value_type< $FIRST_TYPENAME >::type >::invoke( $CALL_LEVEL1 );
}
$TEMPLATE[end]