mirror of
https://github.com/boostorg/multi_array.git
synced 2026-01-25 18:32:13 +00:00
Compare commits
1 Commits
boost-1.71
...
boost-1.53
| Author | SHA1 | Date | |
|---|---|---|---|
|
1e44b032ea |
234
.travis.yml
234
.travis.yml
@@ -1,234 +0,0 @@
|
||||
# Copyright 2018 Peter Dimov
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
|
||||
language: cpp
|
||||
|
||||
sudo: false
|
||||
|
||||
python: "2.7"
|
||||
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
- develop
|
||||
|
||||
env:
|
||||
matrix:
|
||||
- BOGUS_JOB=true
|
||||
|
||||
matrix:
|
||||
|
||||
exclude:
|
||||
- env: BOGUS_JOB=true
|
||||
|
||||
include:
|
||||
- os: linux
|
||||
compiler: g++
|
||||
env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11
|
||||
|
||||
- os: linux
|
||||
compiler: g++-4.4
|
||||
env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- g++-4.4
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: g++-4.6
|
||||
env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- g++-4.6
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: g++-4.7
|
||||
env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- g++-4.7
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: g++-4.8
|
||||
env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- g++-4.8
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: g++-4.9
|
||||
env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- g++-4.9
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: g++-5
|
||||
env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14,1z
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- g++-5
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: g++-6
|
||||
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- g++-6
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
dist: trusty
|
||||
compiler: g++-7
|
||||
env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- g++-7
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: g++-8
|
||||
env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- g++-8
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: clang++
|
||||
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
|
||||
|
||||
- os: linux
|
||||
compiler: clang++-3.5
|
||||
env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- clang-3.5
|
||||
- libstdc++-4.9-dev
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: clang++-3.6
|
||||
env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- clang-3.6
|
||||
- libstdc++-4.9-dev
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: clang++-3.8
|
||||
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- clang-3.8
|
||||
- libstdc++-4.9-dev
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: clang++-3.9
|
||||
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- clang-3.9
|
||||
- libstdc++-4.9-dev
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
|
||||
- os: linux
|
||||
compiler: clang++-4.0
|
||||
env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- clang-4.0
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-4.0
|
||||
|
||||
- os: linux
|
||||
compiler: clang++-5.0
|
||||
env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- clang-5.0
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-5.0
|
||||
|
||||
- os: linux
|
||||
compiler: clang++-6.0
|
||||
env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- clang-6.0
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-6.0
|
||||
|
||||
- os: linux
|
||||
compiler: clang++-libc++
|
||||
env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libc++-dev
|
||||
|
||||
- os: osx
|
||||
compiler: clang++
|
||||
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
|
||||
|
||||
install:
|
||||
- BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
|
||||
- cd ..
|
||||
- git clone -b $BOOST_BRANCH https://github.com/boostorg/boost.git boost
|
||||
- cd boost
|
||||
- git submodule update --init tools/build
|
||||
- git submodule update --init libs/config
|
||||
- git submodule update --init tools/boostdep
|
||||
- mkdir -p libs/multi_array
|
||||
- cp -r $TRAVIS_BUILD_DIR/* libs/multi_array
|
||||
- python tools/boostdep/depinst/depinst.py multi_array
|
||||
- ./bootstrap.sh
|
||||
- ./b2 headers
|
||||
|
||||
script:
|
||||
- |-
|
||||
echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
|
||||
- ./b2 -j 3 libs/multi_array/test toolset=$TOOLSET cxxstd=$CXXSTD
|
||||
|
||||
notifications:
|
||||
email:
|
||||
on_success: always
|
||||
56
appveyor.yml
56
appveyor.yml
@@ -1,56 +0,0 @@
|
||||
# Copyright 2018 Peter Dimov
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
|
||||
version: 1.0.{build}-{branch}
|
||||
|
||||
shallow_clone: true
|
||||
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
- develop
|
||||
|
||||
environment:
|
||||
matrix:
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
|
||||
TOOLSET: msvc-9.0
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
|
||||
TOOLSET: msvc-10.0
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
|
||||
TOOLSET: msvc-11.0
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
|
||||
TOOLSET: msvc-12.0
|
||||
ADDRMD: 32,64
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
|
||||
TOOLSET: msvc-14.0
|
||||
ADDRMD: 32,64
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
TOOLSET: msvc-14.1
|
||||
ADDRMD: 32,64
|
||||
STANDARD: 14,17
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
TOOLSET: clang-win
|
||||
ADDRMD: 32,64
|
||||
STANDARD: 14,17
|
||||
|
||||
|
||||
install:
|
||||
- set BOOST_BRANCH=develop
|
||||
- if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master
|
||||
- cd ..
|
||||
- git clone -b %BOOST_BRANCH% https://github.com/boostorg/boost.git boost
|
||||
- cd boost
|
||||
- git submodule update --init tools/build
|
||||
- git submodule update --init libs/config
|
||||
- git submodule update --init tools/boostdep
|
||||
- xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\multi_array\
|
||||
- python tools/boostdep/depinst/depinst.py multi_array
|
||||
- cmd /c bootstrap
|
||||
- b2 headers
|
||||
|
||||
build: off
|
||||
|
||||
test_script:
|
||||
- PATH=%ADDPATH%%PATH%
|
||||
- if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
|
||||
- b2 -j 3 libs/multi_array/test toolset=%TOOLSET% %CXXSTD%
|
||||
@@ -1,15 +0,0 @@
|
||||
# Copyright (c) 2016 Rene Rivera
|
||||
#
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
# (See accompanying file LICENSE_1_0.txt or copy at
|
||||
# http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
###############################################################################
|
||||
alias boostdoc
|
||||
: xml/bbref.xml
|
||||
:
|
||||
:
|
||||
: ;
|
||||
explicit boostdoc ;
|
||||
alias boostrelease ;
|
||||
explicit boostrelease ;
|
||||
@@ -50,7 +50,7 @@ iterator categories.
|
||||
<td><tt>*i</tt> is convertible to <tt>T</tt></td></tr>
|
||||
<tr>
|
||||
<td>Forward Iterator</td>
|
||||
<td><tt>*i</tt> is <tt>T&</tt> (or <tt>const T&</tt> once <a href="http://www.open-std.org/JTC1/SC22/WG21/docs/lwg-active.html#200">issue
|
||||
<td><tt>*i</tt> is <tt>T&</tt> (or <tt>const T&</tt> once <a href="http://anubis.dkuug.dk/JTC1/SC22/WG21/docs/lwg-active.html#200">issue
|
||||
200</a> is resolved)</td></tr>
|
||||
<tr>
|
||||
<td>Random Access Iterator</td>
|
||||
@@ -61,7 +61,7 @@ iterator categories.
|
||||
<p>Because of the mixing of iterator traversal and dereference return type, many
|
||||
useful iterators can not be appropriately categorized. For example,
|
||||
<tt>vector<bool>::iterator</tt> is almost a random access iterator, but
|
||||
the return type is not <tt>bool&</tt> (see <a href="http://www.open-std.org/JTC1/SC22/WG21/docs/lwg-active.html#96">issue
|
||||
the return type is not <tt>bool&</tt> (see <a href="http://anubis.dkuug.dk/JTC1/SC22/WG21/docs/lwg-active.html#96">issue
|
||||
96</a> and Herb Sutter's paper J16/99-0008 = WG21 N1185). Therefore, the
|
||||
iterators only meet the requirements of input iterator and output iterator. This
|
||||
is so nonintuitive that at least one implementation erroneously assigns
|
||||
@@ -74,7 +74,7 @@ integers when incremented and dereferenced (see <a href="http://www.boost.org/li
|
||||
There are two ways to implement this iterator, 1) make the <tt>reference</tt>
|
||||
type be a true reference (a reference to an integer data member of the counting
|
||||
iterator) or 2) make the <tt>reference</tt> type be the same as the
|
||||
<tt>value_type</tt>. Option 1) runs into the problems discussed in <a href="http://www.open-std.org/JTC1/SC22/WG21/docs/lwg-active.html#198">Issue
|
||||
<tt>value_type</tt>. Option 1) runs into the problems discussed in <a href="http://anubis.dkuug.dk/JTC1/SC22/WG21/docs/lwg-active.html#198">Issue
|
||||
198</a>, the reference will not be valid after the iterator is destroyed. Option
|
||||
2) is therefore a better choice, but then we have a counting iterator that
|
||||
cannot be a random access iterator.
|
||||
@@ -651,8 +651,8 @@ Iterator</a>.
|
||||
</h3>The Forward Iterator is an iterator that can be incremented. Also, it is
|
||||
permissible to make multiple passes through the iterator's range.
|
||||
<h3>Refinement of</h3><a href="http://www.boost.org/libs/utility/CopyConstructible.html">Copy
|
||||
Constructible</a>, <a href="http://www.boost.org/libs/utility/Assignable.html">Assignable</a>, <a href="https://www.boost.org/sgi/stl/DefaultConstructible.html">Default
|
||||
Constructible</a>, and <a href="https://www.boost.org/sgi/stl/EqualityComparable.html">Equality
|
||||
Constructible</a>, <a href="http://www.boost.org/libs/utility/Assignable.html">Assignable</a>, <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html">Default
|
||||
Constructible</a>, and <a href="http://www.sgi.com/tech/stl/EqualityComparable.html">Equality
|
||||
Comparable</a>
|
||||
<h3>Associated types</h3>
|
||||
<table border="1">
|
||||
@@ -725,7 +725,7 @@ Traversal Iterator</a>
|
||||
Iterator </h3>An iterator that provides constant-time methods for moving forward
|
||||
and backward in arbitrary-sized steps.
|
||||
<h3>Refinement of</h3><a href="#concept_BidirectionalTraversalIterator">Bidirectional
|
||||
Traversal Iterator</a> and <a href="https://www.boost.org/sgi/stl/LessThanComparable.html">Less Than
|
||||
Traversal Iterator</a> and <a href="http://www.sgi.com/tech/stl/LessThanComparable.html">Less Than
|
||||
Comparable</a> where <tt><</tt> is a total ordering
|
||||
<h3>Associated types</h3>
|
||||
<table border="1">
|
||||
|
||||
@@ -353,21 +353,21 @@ This expression generates a view of the array determined by the
|
||||
used to construct <code class="literal">indices</code>.
|
||||
</td></tr><tr><td><code class="literal">a == b</code></td><td>bool</td><td>This performs a lexicographical comparison of the
|
||||
values of <code class="literal">a</code> and <code class="literal">b</code>. The element
|
||||
type must model <a class="ulink" href="https://www.boost.org/sgi/stl/EqualityComparable.html" target="_top">EqualityComparable</a> for this
|
||||
type must model <a class="ulink" href="http://www.sgi.com/tech/stl/EqualityComparable.html" target="_top">EqualityComparable</a> for this
|
||||
expression to be valid.</td></tr><tr><td><code class="literal">a < b</code></td><td>bool</td><td>This performs a lexicographical comparison of the
|
||||
values of <code class="literal">a</code> and <code class="literal">b</code>. The element
|
||||
type must model <a class="ulink" href="https://www.boost.org/sgi/stl/LessThanComparable.html" target="_top">LessThanComparable</a> for this
|
||||
type must model <a class="ulink" href="http://www.sgi.com/tech/stl/LessThanComparable.html" target="_top">LessThanComparable</a> for this
|
||||
expression to be valid.</td></tr><tr><td><code class="literal">a <= b</code></td><td>bool</td><td>This performs a lexicographical comparison of the
|
||||
values of <code class="literal">a</code> and <code class="literal">b</code>. The element
|
||||
type must model <a class="ulink" href="https://www.boost.org/sgi/stl/EqualityComparable.html" target="_top">EqualityComparable</a> and
|
||||
<a class="ulink" href="https://www.boost.org/sgi/stl/LessThanComparable.html" target="_top">LessThanComparable</a> for this
|
||||
type must model <a class="ulink" href="http://www.sgi.com/tech/stl/EqualityComparable.html" target="_top">EqualityComparable</a> and
|
||||
<a class="ulink" href="http://www.sgi.com/tech/stl/LessThanComparable.html" target="_top">LessThanComparable</a> for this
|
||||
expression to be valid.</td></tr><tr><td><code class="literal">a > b</code></td><td>bool</td><td>This performs a lexicographical comparison of the
|
||||
values of <code class="literal">a</code> and <code class="literal">b</code>. The element
|
||||
type must model <a class="ulink" href="https://www.boost.org/sgi/stl/EqualityComparable.html" target="_top">EqualityComparable</a> and
|
||||
<a class="ulink" href="https://www.boost.org/sgi/stl/LessThanComparable.html" target="_top">LessThanComparable</a> for this
|
||||
type must model <a class="ulink" href="http://www.sgi.com/tech/stl/EqualityComparable.html" target="_top">EqualityComparable</a> and
|
||||
<a class="ulink" href="http://www.sgi.com/tech/stl/LessThanComparable.html" target="_top">LessThanComparable</a> for this
|
||||
expression to be valid.</td></tr><tr><td><code class="literal">a >= b</code></td><td>bool</td><td>This performs a lexicographical comparison of the
|
||||
values of <code class="literal">a</code> and <code class="literal">b</code>. The element
|
||||
type must model <a class="ulink" href="https://www.boost.org/sgi/stl/LessThanComparable.html" target="_top">LessThanComparable</a> for this
|
||||
type must model <a class="ulink" href="http://www.sgi.com/tech/stl/LessThanComparable.html" target="_top">LessThanComparable</a> for this
|
||||
expression to be valid.</td></tr></tbody></table></div></div><br class="table-break"></div><div class="sect2" title="Complexity guarantees"><div class="titlepage"><div><div><h3 class="title"><a name="idp18588736"></a>Complexity guarantees</h3></div></div></div><code class="literal">begin()</code> and <code class="literal">end()</code> execute in amortized
|
||||
constant time.
|
||||
<code class="literal">size()</code> executes in at most linear time in the
|
||||
@@ -589,7 +589,7 @@ using a replaceable allocator.
|
||||
</p><p title="Model Of."><b>Model Of. </b>
|
||||
<a class="link" href="#MultiArray" title="MultiArray Concept">MultiArray</a>,
|
||||
<a class="ulink" href="../../../libs/utility/CopyConstructible.html" target="_top">CopyConstructible</a>. Depending on the element type,
|
||||
it may also model <a class="ulink" href="https://www.boost.org/sgi/stl/EqualityComparable.html" target="_top">EqualityComparable</a> and <a class="ulink" href="https://www.boost.org/sgi/stl/LessThanComparable.html" target="_top">LessThanComparable</a>.
|
||||
it may also model <a class="ulink" href="http://www.sgi.com/tech/stl/EqualityComparable.html" target="_top">EqualityComparable</a> and <a class="ulink" href="http://www.sgi.com/tech/stl/LessThanComparable.html" target="_top">LessThanComparable</a>.
|
||||
</p><p title="Synopsis"><b>Synopsis. </b></p><pre class="programlisting">
|
||||
|
||||
namespace boost {
|
||||
@@ -818,7 +818,7 @@ of the constructors.
|
||||
<a class="link" href="#MultiArray" title="MultiArray Concept">MultiArray</a>,
|
||||
<a class="ulink" href="../../../libs/utility/CopyConstructible.html" target="_top">CopyConstructible</a>.
|
||||
and depending on the element type, it may also model
|
||||
<a class="ulink" href="https://www.boost.org/sgi/stl/EqualityComparable.html" target="_top">EqualityComparable</a> and <a class="ulink" href="https://www.boost.org/sgi/stl/LessThanComparable.html" target="_top">LessThanComparable</a>.
|
||||
<a class="ulink" href="http://www.sgi.com/tech/stl/EqualityComparable.html" target="_top">EqualityComparable</a> and <a class="ulink" href="http://www.sgi.com/tech/stl/LessThanComparable.html" target="_top">LessThanComparable</a>.
|
||||
Detailed descriptions are provided here only for operations that are
|
||||
not described in the <code class="literal">multi_array</code> reference.
|
||||
</p><p title="Synopsis"><b>Synopsis. </b></p><pre class="programlisting">
|
||||
@@ -978,7 +978,7 @@ of the constructors.
|
||||
<a class="link" href="#MultiArray" title="MultiArray Concept">MultiArray</a>,
|
||||
<a class="ulink" href="../../../libs/utility/CopyConstructible.html" target="_top">CopyConstructible</a>.
|
||||
and depending on the element type, it may also model
|
||||
<a class="ulink" href="https://www.boost.org/sgi/stl/EqualityComparable.html" target="_top">EqualityComparable</a> and <a class="ulink" href="https://www.boost.org/sgi/stl/LessThanComparable.html" target="_top">LessThanComparable</a>.
|
||||
<a class="ulink" href="http://www.sgi.com/tech/stl/EqualityComparable.html" target="_top">EqualityComparable</a> and <a class="ulink" href="http://www.sgi.com/tech/stl/LessThanComparable.html" target="_top">LessThanComparable</a>.
|
||||
|
||||
Detailed descriptions are provided here only for operations that are
|
||||
not described in the <code class="literal">multi_array</code> reference.
|
||||
|
||||
@@ -179,13 +179,6 @@ by library users.
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><a href="../test/allocators.cpp">libs/multi_array/test/allocators.cpp</a></td>
|
||||
<td>
|
||||
Test support for custom allocators.
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><a href="../test/generative_tests.hpp">libs/multi_array/test/generative_tests.hpp</a></td>
|
||||
<td>
|
||||
|
||||
@@ -612,7 +612,7 @@ cases can be found <a href="./test_cases.html">here</a>.
|
||||
<h2>Related Work</h2>
|
||||
|
||||
<a href="../../array/index.html">boost::array</a>
|
||||
and <a href="https://www.boost.org/sgi/stl/Vector.html">std::vector</a> are
|
||||
and <a href="http://www.sgi.com/tech/stl/Vector.html">std::vector</a> are
|
||||
one-dimensional containers of user data. Both manage their own
|
||||
memory. <tt>std::valarray</tt> is a low-level
|
||||
C++ Standard Library component
|
||||
@@ -661,11 +661,6 @@ arrays, as <tt>boost::array</tt> does for C one-dimensional arrays.
|
||||
<li><a href="mailto:bdawes@acm.org">Beman Dawes</a>
|
||||
helped immensely with porting the library to Microsoft Windows
|
||||
compilers.
|
||||
|
||||
<li><a href="mailto:glenjofe@gmail.com">Glen Fernandes</a>
|
||||
implemented support for the C++11 allocator model, including
|
||||
support for stateful allocators, minimal allocators, and
|
||||
optimized storage for stateless allocators.
|
||||
</ul>
|
||||
|
||||
<hr>
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
# Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
|
||||
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
# (See accompanying file LICENSE_1_0.txt or copy at
|
||||
# http://www.boost.org/LICENSE_1_0.txt)
|
||||
project multi_array/doc ;
|
||||
import boostbook : boostbook ;
|
||||
|
||||
path-constant here : . ;
|
||||
|
||||
boostbook multi_array-doc
|
||||
:
|
||||
bbref.xml
|
||||
:
|
||||
<xsl:param>boost.root=../../../../..
|
||||
<format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
|
||||
<format>pdf:<xsl:param>img.src.path=$(here)/../
|
||||
;
|
||||
|
||||
@@ -567,7 +567,7 @@ This expression generates a view of the array determined by the
|
||||
<entry>bool</entry>
|
||||
<entry>This performs a lexicographical comparison of the
|
||||
values of <literal>a</literal> and <literal>b</literal>. The element
|
||||
type must model <ulink url="https://www.boost.org/sgi/stl/EqualityComparable.html">EqualityComparable</ulink> for this
|
||||
type must model <ulink url="http://www.sgi.com/tech/stl/EqualityComparable.html">EqualityComparable</ulink> for this
|
||||
expression to be valid.</entry>
|
||||
</row>
|
||||
<row>
|
||||
@@ -575,7 +575,7 @@ expression to be valid.</entry>
|
||||
<entry>bool</entry>
|
||||
<entry>This performs a lexicographical comparison of the
|
||||
values of <literal>a</literal> and <literal>b</literal>. The element
|
||||
type must model <ulink url="https://www.boost.org/sgi/stl/LessThanComparable.html">LessThanComparable</ulink> for this
|
||||
type must model <ulink url="http://www.sgi.com/tech/stl/LessThanComparable.html">LessThanComparable</ulink> for this
|
||||
expression to be valid.</entry>
|
||||
</row>
|
||||
<row>
|
||||
@@ -583,8 +583,8 @@ expression to be valid.</entry>
|
||||
<entry>bool</entry>
|
||||
<entry>This performs a lexicographical comparison of the
|
||||
values of <literal>a</literal> and <literal>b</literal>. The element
|
||||
type must model <ulink url="https://www.boost.org/sgi/stl/EqualityComparable.html">EqualityComparable</ulink> and
|
||||
<ulink url="https://www.boost.org/sgi/stl/LessThanComparable.html">LessThanComparable</ulink> for this
|
||||
type must model <ulink url="http://www.sgi.com/tech/stl/EqualityComparable.html">EqualityComparable</ulink> and
|
||||
<ulink url="http://www.sgi.com/tech/stl/LessThanComparable.html">LessThanComparable</ulink> for this
|
||||
expression to be valid.</entry>
|
||||
</row>
|
||||
<row>
|
||||
@@ -592,8 +592,8 @@ expression to be valid.</entry>
|
||||
<entry>bool</entry>
|
||||
<entry>This performs a lexicographical comparison of the
|
||||
values of <literal>a</literal> and <literal>b</literal>. The element
|
||||
type must model <ulink url="https://www.boost.org/sgi/stl/EqualityComparable.html">EqualityComparable</ulink> and
|
||||
<ulink url="https://www.boost.org/sgi/stl/LessThanComparable.html">LessThanComparable</ulink> for this
|
||||
type must model <ulink url="http://www.sgi.com/tech/stl/EqualityComparable.html">EqualityComparable</ulink> and
|
||||
<ulink url="http://www.sgi.com/tech/stl/LessThanComparable.html">LessThanComparable</ulink> for this
|
||||
expression to be valid.</entry>
|
||||
</row>
|
||||
<row>
|
||||
@@ -601,7 +601,7 @@ expression to be valid.</entry>
|
||||
<entry>bool</entry>
|
||||
<entry>This performs a lexicographical comparison of the
|
||||
values of <literal>a</literal> and <literal>b</literal>. The element
|
||||
type must model <ulink url="https://www.boost.org/sgi/stl/LessThanComparable.html">LessThanComparable</ulink> for this
|
||||
type must model <ulink url="http://www.sgi.com/tech/stl/LessThanComparable.html">LessThanComparable</ulink> for this
|
||||
expression to be valid.</entry>
|
||||
</row>
|
||||
</tbody>
|
||||
|
||||
@@ -1,806 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
|
||||
"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd" [
|
||||
<!ENTITY concepts SYSTEM "MultiArray.xml">
|
||||
<!ENTITY multi_array SYSTEM "multi_array.xml">
|
||||
<!ENTITY multi_array_ref SYSTEM "multi_array_ref.xml">
|
||||
<!ENTITY const_multi_array_ref SYSTEM "const_multi_array_ref.xml">
|
||||
]>
|
||||
<library name="MultiArray" dirname="multi_array" id="multi_array"
|
||||
xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||
last-revision="$Date$">
|
||||
<libraryinfo>
|
||||
<author>
|
||||
<firstname>Ronald</firstname>
|
||||
<surname>Garcia</surname>
|
||||
<affiliation>
|
||||
<orgname>Indiana University</orgname>
|
||||
<orgdiv>Open Systems Lab</orgdiv>
|
||||
</affiliation>
|
||||
</author>
|
||||
<orgname>BOOST</orgname>
|
||||
<copyright>
|
||||
<year>2002</year>
|
||||
<holder>The Trustees of Indiana University</holder>
|
||||
</copyright>
|
||||
<librarypurpose>Multidimensional containers and adaptors for
|
||||
arrays of contiguous data</librarypurpose>
|
||||
<librarycategory name="category:math"/>
|
||||
<librarycategory name="category:containers"/>
|
||||
</libraryinfo>
|
||||
|
||||
<title>Boost.MultiArray Reference Manual</title>
|
||||
|
||||
|
||||
<para>Boost.MultiArray is composed of several components.
|
||||
The MultiArray concept defines a generic interface to multidimensional
|
||||
containers.
|
||||
<literal>multi_array</literal> is a general purpose container class
|
||||
that models MultiArray. <literal>multi_array_ref</literal>
|
||||
and <literal>const_multi_array_ref</literal> are adapter
|
||||
classes. Using them,
|
||||
you can manipulate any block of contiguous data as though it were a
|
||||
<literal>multi_array</literal>.
|
||||
<literal>const_multi_array_ref</literal> differs from
|
||||
<literal>multi_array_ref</literal> in that its elements cannot
|
||||
be modified through its interface. Finally, several auxiliary classes are used
|
||||
to create and specialize arrays and some global objects are defined as
|
||||
part of the library interface.</para>
|
||||
|
||||
<sect1 id="synopsis">
|
||||
<title>Library Synopsis</title>
|
||||
<para>To use Boost.MultiArray, you must include the header
|
||||
<filename>boost/multi_array.hpp</filename> in your source. This file
|
||||
brings the following declarations into scope:</para>
|
||||
<programlisting>
|
||||
<![CDATA[namespace boost {
|
||||
|
||||
namespace multi_array_types {
|
||||
typedef *unspecified* index;
|
||||
typedef *unspecified* size_type;
|
||||
typedef *unspecified* difference_type;
|
||||
typedef *unspecified* index_range;
|
||||
typedef *unspecified* extent_range;
|
||||
typedef *unspecified* index_gen;
|
||||
typedef *unspecified* extent_gen;
|
||||
}
|
||||
|
||||
template <typename ValueType,
|
||||
std::size_t NumDims,
|
||||
typename Allocator = std::allocator<ValueType> >
|
||||
class multi_array;
|
||||
|
||||
template <typename ValueType,
|
||||
std::size_t NumDims>
|
||||
class multi_array_ref;
|
||||
|
||||
template <typename ValueType,
|
||||
std::size_t NumDims>
|
||||
class const_multi_array_ref;
|
||||
|
||||
multi_array_types::extent_gen extents;
|
||||
multi_array_types::index_gen indices;
|
||||
|
||||
template <typename Array, int N> class subarray_gen;
|
||||
template <typename Array, int N> class const_subarray_gen;
|
||||
template <typename Array, int N> class array_view_gen;
|
||||
template <typename Array, int N> class const_array_view_gen;
|
||||
|
||||
class c_storage_order;
|
||||
class fortran_storage_order;
|
||||
template <std::size_t NumDims> class general_storage_order;
|
||||
|
||||
}]]>
|
||||
</programlisting>
|
||||
</sect1>
|
||||
|
||||
&concepts;
|
||||
|
||||
<sect1 id="array_types">
|
||||
<title>Array Components</title>
|
||||
<para>
|
||||
Boost.MultiArray defines an array class,
|
||||
<literal>multi_array</literal>, and two adapter classes,
|
||||
<literal>multi_array_ref</literal> and
|
||||
<literal>const_multi_array_ref</literal>. The three classes model
|
||||
MultiArray and so they share a lot of functionality.
|
||||
<literal>multi_array_ref</literal> differs from
|
||||
<literal>multi_array</literal> in that the
|
||||
<literal>multi_array</literal> manages its own memory, while
|
||||
<literal>multi_array_ref</literal> is passed a block of memory that it
|
||||
expects to be externally managed.
|
||||
<literal>const_multi_array_ref</literal> differs from
|
||||
<literal>multi_array_ref</literal> in that the underlying elements it
|
||||
adapts cannot be modified through its interface, though some array
|
||||
properties, including the array shape and index bases, can be altered.
|
||||
Functionality the classes have in common is described
|
||||
below.
|
||||
</para>
|
||||
|
||||
<formalpara>
|
||||
<title>Note: Preconditions, Effects, and Implementation</title>
|
||||
<para>
|
||||
Throughout the following sections, small pieces of C++ code are
|
||||
used to specify constraints such as preconditions, effects, and
|
||||
postconditions. These do not necessarily describe the underlying
|
||||
implementation of array components; rather, they describe the
|
||||
expected input to and
|
||||
behavior of the specified operations. Failure to meet
|
||||
preconditions results in undefined behavior. Not all effects
|
||||
(i.e. copy constructors, etc.) must be mimicked exactly. The code
|
||||
snippets for effects intend to capture the essence of the described
|
||||
operation.
|
||||
</para>
|
||||
</formalpara>
|
||||
|
||||
<formalpara>
|
||||
<title>Queries</title>
|
||||
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><programlisting>element* data();
|
||||
const element* data() const;</programlisting></term>
|
||||
<listitem>
|
||||
<para>This returns a pointer to the beginning of the
|
||||
contiguous block that contains the array's data. If all dimensions of
|
||||
the array are 0-indexed and stored in ascending order, this is
|
||||
equivalent to <literal>origin()</literal>. Note that
|
||||
<literal>const_multi_array_ref</literal> only provides the const
|
||||
version of this function.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><programlisting>element* origin();
|
||||
const element* origin() const;</programlisting></term>
|
||||
<listitem>
|
||||
<para>This returns the origin element of the
|
||||
<literal>multi_array</literal>. Note that
|
||||
<literal>const_multi_array_ref</literal> only provides the const
|
||||
version of this function. (Required by MultiArray)
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><function>const index* index_bases();</function></term>
|
||||
<listitem>
|
||||
<para>This returns the index bases for the
|
||||
<literal>multi_array</literal>. (Required by MultiArray)
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><function>const index* strides();</function></term>
|
||||
<listitem>
|
||||
<para>This returns the strides for the
|
||||
<literal>multi_array</literal>. (Required by MultiArray)
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><function>const size_type* shape();</function></term>
|
||||
<listitem>
|
||||
<para>This returns the shape of the
|
||||
<literal>multi_array</literal>. (Required by MultiArray)
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
|
||||
</formalpara>
|
||||
|
||||
<formalpara>
|
||||
<title>Comparators</title>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><programlisting><![CDATA[
|
||||
bool operator==(const *array-type*& rhs);
|
||||
bool operator!=(const *array-type*& rhs);
|
||||
bool operator<(const *array-type*& rhs);
|
||||
bool operator>(const *array-type*& rhs);
|
||||
bool operator>=(const *array-type*& rhs);
|
||||
bool operator<=(const *array-type*& rhs);]]></programlisting></term>
|
||||
|
||||
<listitem>
|
||||
<para>Each comparator executes a lexicographical compare over
|
||||
the value types of the two arrays.
|
||||
(Required by MultiArray)
|
||||
</para>
|
||||
<formalpara>
|
||||
<title>Preconditions</title>
|
||||
<para><literal>element</literal> must support the
|
||||
comparator corresponding to that called on
|
||||
<literal>multi_array</literal>.</para>
|
||||
</formalpara>
|
||||
|
||||
<formalpara>
|
||||
<title>Complexity</title>
|
||||
<para>O(<literal>num_elements()</literal>).</para>
|
||||
</formalpara>
|
||||
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
</variablelist>
|
||||
</formalpara>
|
||||
|
||||
<formalpara>
|
||||
<title>Modifiers</title>
|
||||
|
||||
<variablelist>
|
||||
|
||||
<varlistentry>
|
||||
<term>
|
||||
<programlisting>
|
||||
<![CDATA[
|
||||
template <typename SizeList>
|
||||
void reshape(const SizeList& sizes)
|
||||
]]>
|
||||
</programlisting>
|
||||
</term>
|
||||
|
||||
<listitem>
|
||||
<para>This changes the shape of the <literal>multi_array</literal>. The
|
||||
number of elements and the index bases remain the same, but the number
|
||||
of values at each level of the nested container hierarchy may
|
||||
change.</para>
|
||||
|
||||
<formalpara><title><literal>SizeList</literal> Requirements</title>
|
||||
<para><literal>SizeList</literal> must model
|
||||
<ulink url="../../utility/Collection.html">Collection</ulink>.</para>
|
||||
</formalpara>
|
||||
|
||||
<formalpara><title>Preconditions</title>
|
||||
<para>
|
||||
<programlisting>
|
||||
<![CDATA[std::accumulate(sizes.begin(),sizes.end(),size_type(1),std::times<size_type>()) == this->num_elements();
|
||||
sizes.size() == NumDims;]]>
|
||||
</programlisting></para>
|
||||
</formalpara>
|
||||
|
||||
|
||||
<formalpara><title>Postconditions</title>
|
||||
<para>
|
||||
<literal>std::equal(sizes.begin(),sizes.end(),this->shape) == true;</literal>
|
||||
</para>
|
||||
</formalpara>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>
|
||||
<programlisting>
|
||||
<![CDATA[
|
||||
template <typename BaseList>
|
||||
void reindex(const BaseList& values);
|
||||
]]>
|
||||
</programlisting>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>This changes the index bases of the <literal>multi_array</literal> to
|
||||
correspond to the the values in <literal>values</literal>.</para>
|
||||
|
||||
<formalpara>
|
||||
<title><literal>BaseList</literal> Requirements</title>
|
||||
<para><literal>BaseList</literal> must model
|
||||
<ulink url="../../utility/Collection.html">Collection</ulink>.</para>
|
||||
</formalpara>
|
||||
|
||||
<formalpara>
|
||||
<title>Preconditions</title>
|
||||
<para><literal>values.size() == NumDims;</literal></para>
|
||||
</formalpara>
|
||||
|
||||
|
||||
<formalpara>
|
||||
<title>Postconditions</title>
|
||||
<para><literal>std::equal(values.begin(),values.end(),this->index_bases());
|
||||
</literal></para>
|
||||
</formalpara>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>
|
||||
<programlisting>
|
||||
<![CDATA[
|
||||
void reindex(index value);
|
||||
]]>
|
||||
</programlisting>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>This changes the index bases of all dimensions of the
|
||||
<literal>multi_array</literal> to <literal>value</literal>.</para>
|
||||
|
||||
<formalpara>
|
||||
<title>Postconditions</title>
|
||||
<para>
|
||||
<programlisting>
|
||||
<![CDATA[
|
||||
std::count_if(this->index_bases(),this->index_bases()+this->num_dimensions(),
|
||||
std::bind_2nd(std::equal_to<index>(),value)) ==
|
||||
this->num_dimensions();
|
||||
]]>
|
||||
</programlisting>
|
||||
</para>
|
||||
</formalpara>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
</variablelist>
|
||||
</formalpara>
|
||||
|
||||
&multi_array;
|
||||
&multi_array_ref;
|
||||
&const_multi_array_ref;
|
||||
|
||||
</sect1>
|
||||
|
||||
|
||||
<sect1 id="auxiliary">
|
||||
<title>Auxiliary Components</title>
|
||||
|
||||
<sect2 id="multi_array_types">
|
||||
<title><literal>multi_array_types</literal></title>
|
||||
|
||||
<programlisting>
|
||||
<![CDATA[namespace multi_array_types {
|
||||
typedef *unspecified* index;
|
||||
typedef *unspecified* size_type;
|
||||
typedef *unspecified* difference_type;
|
||||
typedef *unspecified* index_range;
|
||||
typedef *unspecified* extent_range;
|
||||
typedef *unspecified* index_gen;
|
||||
typedef *unspecified* extent_gen;
|
||||
}]]>
|
||||
</programlisting>
|
||||
|
||||
<para>Namespace <literal>multi_array_types</literal> defines types
|
||||
associated with <literal>multi_array</literal>,
|
||||
<literal>multi_array_ref</literal>, and
|
||||
<literal>const_multi_array_ref</literal> that are not
|
||||
dependent upon template parameters. These types find common use with
|
||||
all Boost.Multiarray components. They are defined
|
||||
in a namespace from which they can be accessed conveniently.
|
||||
With the exception of <literal>extent_gen</literal> and
|
||||
<literal>extent_range</literal>, these types fulfill the roles of the
|
||||
same name required by MultiArray and are described in its
|
||||
concept definition. <literal>extent_gen</literal> and
|
||||
<literal>extent_range</literal> are described below.
|
||||
</para>
|
||||
</sect2>
|
||||
|
||||
|
||||
<sect2 id="extent_range">
|
||||
<title><classname>extent_range</classname></title>
|
||||
|
||||
<para><classname>extent_range</classname> objects define half open
|
||||
intervals. They provide shape and index base information to
|
||||
<literal>multi_array</literal>, <literal>multi_array_ref</literal>,
|
||||
and <literal>const_multi_array_ref</literal> constructors.
|
||||
<classname>extent_range</classname>s are passed in
|
||||
aggregate to an array constructor (see
|
||||
<classname>extent_gen</classname> for more details).
|
||||
</para>
|
||||
|
||||
<formalpara>
|
||||
<title>Synopsis</title>
|
||||
<programlisting><![CDATA[
|
||||
class extent_range {
|
||||
public:
|
||||
typedef multi_array_types::index index;
|
||||
typedef multi_array_types::size_type size_type;
|
||||
|
||||
// Structors
|
||||
extent_range(index start, index finish);
|
||||
extent_range(index finish);
|
||||
~extent_range();
|
||||
|
||||
// Queries
|
||||
index start();
|
||||
index finish();
|
||||
size_type size();
|
||||
};]]></programlisting>
|
||||
</formalpara>
|
||||
|
||||
<formalpara>
|
||||
<title>Model Of</title>
|
||||
<para>DefaultConstructible,CopyConstructible</para>
|
||||
</formalpara>
|
||||
|
||||
<formalpara><title>Methods and Types</title>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><function>extent_range(index start, index finish)</function></term>
|
||||
<listitem>
|
||||
<para> This constructor defines the half open interval
|
||||
<literal>[start,finish)</literal>. The expression
|
||||
<literal>finish</literal> must be greater than <literal>start</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry><term><function>extent_range(index finish)</function></term>
|
||||
<listitem>
|
||||
<para>This constructor defines the half open interval
|
||||
<literal>[0,finish)</literal>. The value of <literal>finish</literal>
|
||||
must be positive.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry><term><function>index start()</function></term>
|
||||
<listitem>
|
||||
<para>This function returns the first index represented by the range</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry><term><function>index finish()</function></term>
|
||||
<listitem>
|
||||
<para>This function returns the upper boundary value of the half-open
|
||||
interval. Note that the range does not include this value.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><function>size_type size()</function></term>
|
||||
<listitem>
|
||||
<para>This function returns the size of the specified range. It is
|
||||
equivalent to <literal>finish()-start()</literal>.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
</variablelist>
|
||||
</formalpara>
|
||||
</sect2>
|
||||
|
||||
<sect2 id="extent_gen">
|
||||
<title><classname>extent_gen</classname></title>
|
||||
<para>The <classname>extent_gen</classname> class defines an
|
||||
interface for aggregating array shape and indexing information to be
|
||||
passed to a <literal>multi_array</literal>,
|
||||
<literal>multi_array_ref</literal>, or <literal>const_multi_array_ref</literal>
|
||||
constructor. Its interface mimics
|
||||
the syntax used to declare built-in array types
|
||||
in C++. For example, while a 3-dimensional array of
|
||||
<classname>int</classname> values in C++ would be
|
||||
declared as:
|
||||
<programlisting>int A[3][4][5],</programlisting>
|
||||
a similar <classname>multi_array</classname> would be declared:
|
||||
<programlisting>multi_array<int,3> A(extents[3][4][5]).</programlisting>
|
||||
</para>
|
||||
|
||||
<formalpara><title>Synopsis</title>
|
||||
<programlisting>< const;
|
||||
gen_type<NumRanges+1>::type operator[](index idx) const;
|
||||
};
|
||||
|
||||
typedef *implementation_defined*<0> extent_gen;
|
||||
]]></programlisting>
|
||||
</formalpara>
|
||||
|
||||
<formalpara><title>Methods and Types</title>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><function>template gen_type<Ranges>::type</function></term>
|
||||
<listitem>
|
||||
<para>This type generator is used to specify the result of
|
||||
<literal>Ranges</literal> chained calls to
|
||||
<literal>extent_gen::operator[].</literal> The types
|
||||
<classname>extent_gen</classname> and
|
||||
<classname>gen_type<0>::type</classname> are the same.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><function>gen_type<NumRanges+1>::type
|
||||
operator[](const extent_range& a_range) const;</function></term>
|
||||
<listitem>
|
||||
<para>This function returns a new object containing all previous
|
||||
<classname>extent_range</classname> objects in addition to
|
||||
<literal>a_range.</literal> <classname>extent_range</classname>
|
||||
objects are aggregated by chained calls to
|
||||
<function>operator[]</function>.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><function>gen_type<NumRanges+1>::type
|
||||
operator[](index idx) const;</function></term>
|
||||
<listitem>
|
||||
<para>This function returns a new object containing all previous
|
||||
<classname>extent_range</classname> objects in addition to
|
||||
<literal>extent_range(0,idx).</literal> This function gives the array
|
||||
constructors a similar syntax to traditional C multidimensional array
|
||||
declaration.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
</variablelist>
|
||||
</formalpara>
|
||||
</sect2>
|
||||
|
||||
<sect2>
|
||||
<title>Global Objects</title>
|
||||
<para>For syntactic convenience, Boost.MultiArray defines two
|
||||
global objects as part of its
|
||||
interface. These objects play the role of object generators;
|
||||
expressions involving them create other objects of interest.
|
||||
</para>
|
||||
|
||||
<para> Under some circumstances, the two global objects may be
|
||||
considered excessive overhead. Their construction can be prevented by
|
||||
defining the preprocessor symbol
|
||||
<literal>BOOST_MULTI_ARRAY_NO_GENERATORS</literal> before including
|
||||
<filename>boost/multi_array.hpp.</filename></para>
|
||||
|
||||
<sect3 id="extents">
|
||||
<title><literal>extents</literal></title>
|
||||
|
||||
<programlisting>
|
||||
<![CDATA[namespace boost {
|
||||
multi_array_base::extent_gen extents;
|
||||
}]]>
|
||||
</programlisting>
|
||||
|
||||
<para>Boost.MultiArray's array classes use the
|
||||
<literal>extents</literal> global object to specify
|
||||
array shape during their construction.
|
||||
For example,
|
||||
a 3 by 3 by 3 <classname>multi_array</classname> is constructed as follows:
|
||||
<programlisting>multi_array<int,3> A(extents[3][3][3]);</programlisting>
|
||||
The same array could also be created by explicitly declaring an <literal>extent_gen</literal>
|
||||
object locally,, but the global object makes this declaration unnecessary.
|
||||
</para>
|
||||
</sect3>
|
||||
|
||||
<sect3 id="indices">
|
||||
<title><literal>indices</literal></title>
|
||||
|
||||
<programlisting>
|
||||
<![CDATA[namespace boost {
|
||||
multi_array_base::index_gen indices;
|
||||
}]]>
|
||||
</programlisting>
|
||||
|
||||
<para>The MultiArray concept specifies an
|
||||
<literal>index_gen</literal> associated type that is used to
|
||||
create views.
|
||||
<literal>indices</literal> is a global object that serves the role of
|
||||
<literal>index_gen</literal> for all array components provided by this
|
||||
library and their associated subarrays and views.
|
||||
</para>
|
||||
<para>For example, using the <literal>indices</literal> object,
|
||||
a view of an array <literal>A</literal> is constructed as follows:
|
||||
<programlisting>
|
||||
A[indices[index_range(0,5)][2][index_range(2,4)]];
|
||||
</programlisting>
|
||||
</para>
|
||||
</sect3>
|
||||
</sect2>
|
||||
|
||||
<sect2 id="generators">
|
||||
<title>View and SubArray Generators</title>
|
||||
<para>
|
||||
Boost.MultiArray provides traits classes, <literal>subarray_gen</literal>,
|
||||
<literal>const_subarray_gen</literal>,
|
||||
<literal>array_view_gen</literal>,
|
||||
and <literal>const_array_view_gen</literal>, for naming of
|
||||
array associated types within function templates.
|
||||
In general this is no more convenient to use than the nested
|
||||
type generators, but the library author found that some C++ compilers do not
|
||||
properly handle templates nested within function template parameter types.
|
||||
These generators constitute a workaround for this deficit.
|
||||
The following code snippet illustrates
|
||||
the correspondence between the <literal>array_view_gen</literal>
|
||||
traits class and the <literal>array_view</literal> type associated to
|
||||
an array:
|
||||
|
||||
<programlisting>
|
||||
template <typename Array>
|
||||
void my_function() {
|
||||
typedef typename Array::template array_view<3>::type view1_t;
|
||||
typedef typename boost::array_view_gen<Array,3>::type view2_t;
|
||||
// ...
|
||||
}
|
||||
</programlisting>
|
||||
|
||||
In the above example, <literal>view1_t</literal> and
|
||||
<literal>view2_t</literal> have the same type.
|
||||
</para>
|
||||
</sect2>
|
||||
|
||||
|
||||
<sect2 id="memory_layout">
|
||||
<title>Memory Layout Specifiers</title>
|
||||
<para>
|
||||
While a multidimensional array represents a hierarchy of containers of
|
||||
elements, at some point the elements must be laid out in
|
||||
memory. As a result, a single multidimensional array
|
||||
can be represented in memory more than one way.
|
||||
</para>
|
||||
|
||||
<para>For example, consider the two dimensional array shown below in
|
||||
matrix notation:
|
||||
|
||||
<graphic fileref="matrix.gif"/>
|
||||
|
||||
Here is how the above array is expressed in C++:
|
||||
<programlisting>
|
||||
int a[3][4] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
|
||||
</programlisting>
|
||||
This is an example of row-major storage, where elements of each row
|
||||
are stored contiguously.
|
||||
|
||||
While C++ transparently handles accessing elements of an array, you
|
||||
can also manage the array and its indexing manually. One way that
|
||||
this may be expressed in memory is as follows:
|
||||
<programlisting>
|
||||
int a[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
|
||||
int s[] = { 4, 1 };
|
||||
</programlisting>
|
||||
|
||||
With the latter declaration of <literal>a</literal> and
|
||||
strides <literal>s</literal>, element <literal>a(i,j)</literal>
|
||||
of the array can be
|
||||
accessed using the expression
|
||||
<programlisting>*a+i*s[0]+j*s[1]</programlisting>.
|
||||
</para>
|
||||
|
||||
<para>The same two dimensional array could be laid out by column as follows:
|
||||
|
||||
<programlisting>
|
||||
int a[] = { 0, 4, 8, 1, 5, 9, 2, 6, 10, 3, 7, 11 };
|
||||
int s[] = { 3, 1 };
|
||||
</programlisting>
|
||||
Notice that the strides here are different. As a result,
|
||||
The expression given above to access values will work with this pair
|
||||
of data and strides as well.
|
||||
</para>
|
||||
|
||||
<para>In addition to dimension order, it is also possible to
|
||||
store any dimension in descending order. For example, returning to the
|
||||
first example, the first dimension of the example array, the
|
||||
rows, could be stored in
|
||||
reverse, resulting in the following:
|
||||
|
||||
<programlisting>
|
||||
int data[] = { 8, 9, 10, 11, 4, 5, 6, 7, 0, 1, 2, 3 };
|
||||
int *a = data + 8;
|
||||
int s[] = { -4, 1 };
|
||||
</programlisting>
|
||||
|
||||
Note that in this example <literal>a</literal> must be explicitly set
|
||||
to the origin. In the previous examples, the
|
||||
first element stored in memory was the origin; here this is no longer
|
||||
the case.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
Alternatively, the second dimension, or the columns, could be reversed
|
||||
and the rows stored in ascending order:
|
||||
|
||||
<programlisting>
|
||||
int data[] = { 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8 };
|
||||
int *a = data + 3;
|
||||
int s[] = { 4, -1 };
|
||||
</programlisting>
|
||||
</para>
|
||||
|
||||
<para>
|
||||
Finally, both dimensions could be stored in descending order:
|
||||
|
||||
<programlisting>
|
||||
int data[] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0};
|
||||
int *a = data + 11;
|
||||
int s[] = { -4, -1 };
|
||||
</programlisting>
|
||||
<literal>
|
||||
</literal>
|
||||
</para>
|
||||
|
||||
<para>
|
||||
All of the above arrays are equivalent. The expression
|
||||
given above for <literal>a(i,j)</literal> will yield the same value
|
||||
regardless of the memory layout.
|
||||
|
||||
Boost.MultiArray arrays can be created with customized storage
|
||||
parameters as described above. Thus, existing data can be adapted
|
||||
(with <literal>multi_array_ref</literal> or
|
||||
<literal>const_multi_array_ref</literal>) as suited to the array
|
||||
abstraction. A common usage of this feature would be to wrap arrays
|
||||
that must interoperate with Fortran routines so they can be
|
||||
manipulated naturally at both the C++ and Fortran levels. The
|
||||
following sections describe the Boost.MultiArray components used to
|
||||
specify memory layout.
|
||||
</para>
|
||||
|
||||
<sect3 id="c_storage_order">
|
||||
<title><literal>c_storage_order</literal></title>
|
||||
<programlisting>
|
||||
<![CDATA[class c_storage_order {
|
||||
c_storage_order();
|
||||
};]]>
|
||||
</programlisting>
|
||||
|
||||
<para><literal>c_storage_order</literal> is used to specify that an
|
||||
array should store its elements using the same layout as that used by
|
||||
primitive C++ multidimensional arrays, that is, from last dimension
|
||||
to first. This is the default storage order for the arrays provided by
|
||||
this library.</para>
|
||||
</sect3>
|
||||
|
||||
<sect3 id="fortran_storage_order">
|
||||
<title><literal>fortran_storage_order</literal></title>
|
||||
<programlisting>
|
||||
<![CDATA[class fortran_storage_order {
|
||||
fortran_storage_order();
|
||||
};]]>
|
||||
</programlisting>
|
||||
|
||||
<para><literal>fortran_storage_order</literal> is used to specify that
|
||||
an array should store its elements using the same memory layout as a
|
||||
Fortran multidimensional array would, that is, from first dimension to
|
||||
last.</para>
|
||||
</sect3>
|
||||
|
||||
<sect3 id="general_storage_order">
|
||||
<title><literal>general_storage_order</literal></title>
|
||||
<programlisting>
|
||||
<![CDATA[template <std::size_t NumDims>
|
||||
class general_storage_order {
|
||||
|
||||
template <typename OrderingIter, typename AscendingIter>
|
||||
general_storage_order(OrderingIter ordering, AscendingIter ascending);
|
||||
};]]>
|
||||
</programlisting>
|
||||
|
||||
<para><literal>general_storage_order</literal> allows the user to
|
||||
specify an arbitrary memory layout for the contents of an array. The
|
||||
constructed object is passed to the array constructor in order to
|
||||
specify storage order.</para>
|
||||
|
||||
<para>
|
||||
<literal>OrderingIter</literal> and <literal>AscendingIter</literal>
|
||||
must model the <literal>InputIterator</literal> concept. Both
|
||||
iterators must refer to a range of <literal>NumDims</literal>
|
||||
elements. <literal>AscendingIter</literal> points to objects
|
||||
convertible to <literal>bool</literal>. A value of
|
||||
<literal>true</literal> means that a dimension is stored in ascending
|
||||
order while <literal>false</literal> means that a dimension is stored
|
||||
in descending order. <literal>OrderingIter</literal> specifies the
|
||||
order in which dimensions are stored.
|
||||
</para>
|
||||
|
||||
</sect3>
|
||||
</sect2>
|
||||
|
||||
<sect2 id="range_checking">
|
||||
<title>Range Checking</title>
|
||||
<para>
|
||||
By default, the array access methods <literal>operator()</literal> and
|
||||
<literal>operator[]</literal> perform range
|
||||
checking. If a supplied index is out of the range defined for an
|
||||
array, an assertion will abort the program. To disable range
|
||||
checking (for performance reasons in production releases), define
|
||||
the <literal>BOOST_DISABLE_ASSERTS</literal> preprocessor macro prior to
|
||||
including multi_array.hpp in an application.
|
||||
</para>
|
||||
|
||||
</sect2>
|
||||
</sect1>
|
||||
|
||||
|
||||
</library>
|
||||
@@ -17,7 +17,7 @@ of the constructors.
|
||||
<link linkend="MultiArray">MultiArray</link>,
|
||||
<ulink url="../../../libs/utility/CopyConstructible.html">CopyConstructible</ulink>.
|
||||
and depending on the element type, it may also model
|
||||
<ulink url="https://www.boost.org/sgi/stl/EqualityComparable.html">EqualityComparable</ulink> and <ulink url="https://www.boost.org/sgi/stl/LessThanComparable.html">LessThanComparable</ulink>.
|
||||
<ulink url="http://www.sgi.com/tech/stl/EqualityComparable.html">EqualityComparable</ulink> and <ulink url="http://www.sgi.com/tech/stl/LessThanComparable.html">LessThanComparable</ulink>.
|
||||
|
||||
Detailed descriptions are provided here only for operations that are
|
||||
not described in the <literal>multi_array</literal> reference.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<sect2 id="multi_array_class">
|
||||
<sect2 id="multi_array">
|
||||
<title><literal>multi_array</literal></title>
|
||||
|
||||
<para>
|
||||
@@ -18,7 +18,7 @@ using a replaceable allocator.
|
||||
<para>
|
||||
<link linkend="MultiArray">MultiArray</link>,
|
||||
<ulink url="../../../libs/utility/CopyConstructible.html">CopyConstructible</ulink>. Depending on the element type,
|
||||
it may also model <ulink url="https://www.boost.org/sgi/stl/EqualityComparable.html">EqualityComparable</ulink> and <ulink url="https://www.boost.org/sgi/stl/LessThanComparable.html">LessThanComparable</ulink>.
|
||||
it may also model <ulink url="http://www.sgi.com/tech/stl/EqualityComparable.html">EqualityComparable</ulink> and <ulink url="http://www.sgi.com/tech/stl/LessThanComparable.html">LessThanComparable</ulink>.
|
||||
</para>
|
||||
</formalpara>
|
||||
|
||||
@@ -51,7 +51,7 @@ public:
|
||||
typedef multi_array_types::extent_gen extent_gen;
|
||||
typedef multi_array_types::extent_range extent_range;
|
||||
typedef *unspecified* storage_order_type;
|
||||
|
||||
|
||||
|
||||
// template typedefs
|
||||
template <std::size_t Dims> struct subarray;
|
||||
@@ -60,12 +60,9 @@ public:
|
||||
template <std::size_t Dims> struct const_array_view;
|
||||
|
||||
|
||||
static const std::size_t dimensionality = NumDims;
|
||||
|
||||
|
||||
// constructors and destructors
|
||||
|
||||
multi_array(const Allocator& alloc = Allocator());
|
||||
multi_array();
|
||||
|
||||
template <typename ExtentList>
|
||||
explicit multi_array(const ExtentList& sizes,
|
||||
@@ -75,19 +72,13 @@ public:
|
||||
const storage_order_type& store = c_storage_order(),
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const multi_array& x);
|
||||
multi_array(const const_multi_array_ref<ValueType,NumDims>& x,
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const const_subarray<NumDims>::type& x,
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const const_array_view<NumDims>::type& x,
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const const_multi_array_ref<ValueType,NumDims>& x);
|
||||
multi_array(const const_subarray<NumDims>::type& x);
|
||||
multi_array(const const_array_view<NumDims>::type& x);
|
||||
|
||||
multi_array(const multi_array_ref<ValueType,NumDims>& x,
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const subarray<NumDims>::type& x,
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const array_view<NumDims>::type& x,
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const multi_array_ref<ValueType,NumDims>& x);
|
||||
multi_array(const subarray<NumDims>::type& x);
|
||||
multi_array(const array_view<NumDims>::type& x);
|
||||
|
||||
~multi_array();
|
||||
|
||||
@@ -213,18 +204,12 @@ elements.
|
||||
<varlistentry>
|
||||
<term><programlisting>
|
||||
<![CDATA[multi_array(const multi_array& x);
|
||||
multi_array(const const_multi_array_ref<ValueType,NumDims>& x,
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const const_subarray<NumDims>::type& x,
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const const_array_view<NumDims>::type& x,
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const multi_array_ref<ValueType,NumDims>& x,
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const subarray<NumDims>::type& x,
|
||||
const Allocator& alloc = Allocator());
|
||||
multi_array(const array_view<NumDims>::type& x,
|
||||
const Allocator& alloc = Allocator());]]>
|
||||
multi_array(const const_multi_array_ref<ValueType,NumDims>& x);
|
||||
multi_array(const const_subarray<NumDims>::type& x);
|
||||
multi_array(const const_array_view<NumDims>::type& x);
|
||||
multi_array(const multi_array_ref<ValueType,NumDims>& x);
|
||||
multi_array(const subarray<NumDims>::type& x);
|
||||
multi_array(const array_view<NumDims>::type& x);]]>
|
||||
</programlisting></term>
|
||||
<listitem>
|
||||
<para>These constructors all constructs a <literal>multi_array</literal> and
|
||||
|
||||
@@ -17,7 +17,7 @@ of the constructors.
|
||||
<link linkend="MultiArray">MultiArray</link>,
|
||||
<ulink url="../../../libs/utility/CopyConstructible.html">CopyConstructible</ulink>.
|
||||
and depending on the element type, it may also model
|
||||
<ulink url="https://www.boost.org/sgi/stl/EqualityComparable.html">EqualityComparable</ulink> and <ulink url="https://www.boost.org/sgi/stl/LessThanComparable.html">LessThanComparable</ulink>.
|
||||
<ulink url="http://www.sgi.com/tech/stl/EqualityComparable.html">EqualityComparable</ulink> and <ulink url="http://www.sgi.com/tech/stl/LessThanComparable.html">LessThanComparable</ulink>.
|
||||
Detailed descriptions are provided here only for operations that are
|
||||
not described in the <literal>multi_array</literal> reference.
|
||||
</para>
|
||||
@@ -59,10 +59,7 @@ public:
|
||||
template <std::size_t Dims> struct const_array_view;
|
||||
|
||||
|
||||
static const std::size_t dimensionality = NumDims;
|
||||
|
||||
|
||||
// constructors and destructors
|
||||
// structors
|
||||
|
||||
template <typename ExtentList>
|
||||
explicit multi_array_ref(element* data, const ExtentList& sizes,
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
// Copyright 2002 The Trustees of Indiana University.
|
||||
|
||||
// Copyright 2018 Glen Joseph Fernandes
|
||||
// (glenjofe@gmail.com)
|
||||
|
||||
// Use, modification and distribution is subject to the Boost Software
|
||||
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
@@ -21,11 +18,6 @@
|
||||
// declaration and definition
|
||||
//
|
||||
|
||||
#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wshadow"
|
||||
#endif
|
||||
|
||||
#include "boost/multi_array/base.hpp"
|
||||
#include "boost/multi_array/collection_concept.hpp"
|
||||
#include "boost/multi_array/copy_array.hpp"
|
||||
@@ -33,8 +25,6 @@
|
||||
#include "boost/multi_array/subarray.hpp"
|
||||
#include "boost/multi_array/multi_array_ref.hpp"
|
||||
#include "boost/multi_array/algorithm.hpp"
|
||||
#include "boost/core/alloc_construct.hpp"
|
||||
#include "boost/core/empty_value.hpp"
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/mpl/if.hpp"
|
||||
#include "boost/type_traits.hpp"
|
||||
@@ -119,10 +109,8 @@ struct disable_multi_array_impl<int>
|
||||
template<typename T, std::size_t NumDims,
|
||||
typename Allocator>
|
||||
class multi_array :
|
||||
public multi_array_ref<T,NumDims>,
|
||||
private boost::empty_value<Allocator>
|
||||
public multi_array_ref<T,NumDims>
|
||||
{
|
||||
typedef boost::empty_value<Allocator> alloc_base;
|
||||
typedef multi_array_ref<T,NumDims> super_type;
|
||||
public:
|
||||
typedef typename super_type::value_type value_type;
|
||||
@@ -149,25 +137,22 @@ public:
|
||||
typedef boost::detail::multi_array::multi_array_view<T,NDims> type;
|
||||
};
|
||||
|
||||
explicit multi_array(const Allocator& alloc = Allocator()) :
|
||||
explicit multi_array() :
|
||||
super_type((T*)initial_base_,c_storage_order(),
|
||||
/*index_bases=*/0, /*extents=*/0),
|
||||
alloc_base(boost::empty_init_t(),alloc) {
|
||||
/*index_bases=*/0, /*extents=*/0) {
|
||||
allocate_space();
|
||||
}
|
||||
|
||||
template <class ExtentList>
|
||||
explicit multi_array(
|
||||
ExtentList const& extents,
|
||||
const Allocator& alloc = Allocator()
|
||||
ExtentList const& extents
|
||||
#ifdef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
||||
, typename mpl::if_<
|
||||
detail::multi_array::is_multi_array_impl<ExtentList>,
|
||||
int&,int>::type* = 0
|
||||
#endif
|
||||
) :
|
||||
super_type((T*)initial_base_,extents),
|
||||
alloc_base(boost::empty_init_t(),alloc) {
|
||||
super_type((T*)initial_base_,extents) {
|
||||
boost::function_requires<
|
||||
detail::multi_array::CollectionConcept<ExtentList> >();
|
||||
allocate_space();
|
||||
@@ -177,8 +162,7 @@ public:
|
||||
template <class ExtentList>
|
||||
explicit multi_array(ExtentList const& extents,
|
||||
const general_storage_order<NumDims>& so) :
|
||||
super_type((T*)initial_base_,extents,so),
|
||||
alloc_base(boost::empty_init_t()) {
|
||||
super_type((T*)initial_base_,extents,so) {
|
||||
boost::function_requires<
|
||||
detail::multi_array::CollectionConcept<ExtentList> >();
|
||||
allocate_space();
|
||||
@@ -188,8 +172,7 @@ public:
|
||||
explicit multi_array(ExtentList const& extents,
|
||||
const general_storage_order<NumDims>& so,
|
||||
Allocator const& alloc) :
|
||||
super_type((T*)initial_base_,extents,so),
|
||||
alloc_base(boost::empty_init_t(),alloc) {
|
||||
super_type((T*)initial_base_,extents,so), allocator_(alloc) {
|
||||
boost::function_requires<
|
||||
detail::multi_array::CollectionConcept<ExtentList> >();
|
||||
allocate_space();
|
||||
@@ -197,10 +180,8 @@ public:
|
||||
|
||||
|
||||
explicit multi_array(const detail::multi_array
|
||||
::extent_gen<NumDims>& ranges,
|
||||
const Allocator& alloc = Allocator()) :
|
||||
super_type((T*)initial_base_,ranges),
|
||||
alloc_base(boost::empty_init_t(),alloc) {
|
||||
::extent_gen<NumDims>& ranges) :
|
||||
super_type((T*)initial_base_,ranges) {
|
||||
|
||||
allocate_space();
|
||||
}
|
||||
@@ -209,8 +190,7 @@ public:
|
||||
explicit multi_array(const detail::multi_array
|
||||
::extent_gen<NumDims>& ranges,
|
||||
const general_storage_order<NumDims>& so) :
|
||||
super_type((T*)initial_base_,ranges,so),
|
||||
alloc_base(boost::empty_init_t()) {
|
||||
super_type((T*)initial_base_,ranges,so) {
|
||||
|
||||
allocate_space();
|
||||
}
|
||||
@@ -220,15 +200,13 @@ public:
|
||||
::extent_gen<NumDims>& ranges,
|
||||
const general_storage_order<NumDims>& so,
|
||||
Allocator const& alloc) :
|
||||
super_type((T*)initial_base_,ranges,so),
|
||||
alloc_base(boost::empty_init_t(),alloc) {
|
||||
super_type((T*)initial_base_,ranges,so), allocator_(alloc) {
|
||||
|
||||
allocate_space();
|
||||
}
|
||||
|
||||
multi_array(const multi_array& rhs) :
|
||||
super_type(rhs),
|
||||
alloc_base(static_cast<const alloc_base&>(rhs)) {
|
||||
super_type(rhs), allocator_(rhs.allocator_) {
|
||||
allocate_space();
|
||||
boost::detail::multi_array::copy_n(rhs.base_,rhs.num_elements(),base_);
|
||||
}
|
||||
@@ -245,10 +223,8 @@ public:
|
||||
#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
||||
template <typename OPtr>
|
||||
multi_array(const const_multi_array_ref<T,NumDims,OPtr>& rhs,
|
||||
const general_storage_order<NumDims>& so = c_storage_order(),
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
const general_storage_order<NumDims>& so = c_storage_order())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
// Warning! storage order may change, hence the following copy technique.
|
||||
@@ -258,10 +234,8 @@ public:
|
||||
template <typename OPtr>
|
||||
multi_array(const detail::multi_array::
|
||||
const_sub_array<T,NumDims,OPtr>& rhs,
|
||||
const general_storage_order<NumDims>& so = c_storage_order(),
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
const general_storage_order<NumDims>& so = c_storage_order())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
std::copy(rhs.begin(),rhs.end(),this->begin());
|
||||
@@ -271,10 +245,8 @@ public:
|
||||
template <typename OPtr>
|
||||
multi_array(const detail::multi_array::
|
||||
const_multi_array_view<T,NumDims,OPtr>& rhs,
|
||||
const general_storage_order<NumDims>& so = c_storage_order(),
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
const general_storage_order<NumDims>& so = c_storage_order())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
std::copy(rhs.begin(),rhs.end(),this->begin());
|
||||
@@ -284,10 +256,8 @@ public:
|
||||
// More limited support for MSVC
|
||||
|
||||
|
||||
multi_array(const const_multi_array_ref<T,NumDims>& rhs,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
multi_array(const const_multi_array_ref<T,NumDims>& rhs)
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
// Warning! storage order may change, hence the following copy technique.
|
||||
@@ -295,10 +265,8 @@ public:
|
||||
}
|
||||
|
||||
multi_array(const const_multi_array_ref<T,NumDims>& rhs,
|
||||
const general_storage_order<NumDims>& so,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
const general_storage_order<NumDims>& so)
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
// Warning! storage order may change, hence the following copy technique.
|
||||
@@ -306,10 +274,8 @@ public:
|
||||
}
|
||||
|
||||
multi_array(const detail::multi_array::
|
||||
const_sub_array<T,NumDims>& rhs,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
const_sub_array<T,NumDims>& rhs)
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
std::copy(rhs.begin(),rhs.end(),this->begin());
|
||||
@@ -317,10 +283,8 @@ public:
|
||||
|
||||
multi_array(const detail::multi_array::
|
||||
const_sub_array<T,NumDims>& rhs,
|
||||
const general_storage_order<NumDims>& so,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
const general_storage_order<NumDims>& so)
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
std::copy(rhs.begin(),rhs.end(),this->begin());
|
||||
@@ -328,10 +292,8 @@ public:
|
||||
|
||||
|
||||
multi_array(const detail::multi_array::
|
||||
const_multi_array_view<T,NumDims>& rhs,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
const_multi_array_view<T,NumDims>& rhs)
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
std::copy(rhs.begin(),rhs.end(),this->begin());
|
||||
@@ -339,10 +301,8 @@ public:
|
||||
|
||||
multi_array(const detail::multi_array::
|
||||
const_multi_array_view<T,NumDims>& rhs,
|
||||
const general_storage_order<NumDims>& so,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
const general_storage_order<NumDims>& so)
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
std::copy(rhs.begin(),rhs.end(),this->begin());
|
||||
@@ -351,10 +311,8 @@ public:
|
||||
#endif // !BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
||||
|
||||
// Thes constructors are necessary because of more exact template matches.
|
||||
multi_array(const multi_array_ref<T,NumDims>& rhs,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
multi_array(const multi_array_ref<T,NumDims>& rhs)
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
// Warning! storage order may change, hence the following copy technique.
|
||||
@@ -362,10 +320,8 @@ public:
|
||||
}
|
||||
|
||||
multi_array(const multi_array_ref<T,NumDims>& rhs,
|
||||
const general_storage_order<NumDims>& so,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
const general_storage_order<NumDims>& so)
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
// Warning! storage order may change, hence the following copy technique.
|
||||
@@ -374,10 +330,8 @@ public:
|
||||
|
||||
|
||||
multi_array(const detail::multi_array::
|
||||
sub_array<T,NumDims>& rhs,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
sub_array<T,NumDims>& rhs)
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
std::copy(rhs.begin(),rhs.end(),this->begin());
|
||||
@@ -385,10 +339,8 @@ public:
|
||||
|
||||
multi_array(const detail::multi_array::
|
||||
sub_array<T,NumDims>& rhs,
|
||||
const general_storage_order<NumDims>& so,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
const general_storage_order<NumDims>& so)
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
std::copy(rhs.begin(),rhs.end(),this->begin());
|
||||
@@ -396,10 +348,8 @@ public:
|
||||
|
||||
|
||||
multi_array(const detail::multi_array::
|
||||
multi_array_view<T,NumDims>& rhs,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
multi_array_view<T,NumDims>& rhs)
|
||||
: super_type(0,c_storage_order(),rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
std::copy(rhs.begin(),rhs.end(),this->begin());
|
||||
@@ -407,10 +357,8 @@ public:
|
||||
|
||||
multi_array(const detail::multi_array::
|
||||
multi_array_view<T,NumDims>& rhs,
|
||||
const general_storage_order<NumDims>& so,
|
||||
const Allocator& alloc = Allocator())
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape()),
|
||||
alloc_base(boost::empty_init_t(),alloc)
|
||||
const general_storage_order<NumDims>& so)
|
||||
: super_type(0,so,rhs.index_bases(),rhs.shape())
|
||||
{
|
||||
allocate_space();
|
||||
std::copy(rhs.begin(),rhs.end(),this->begin());
|
||||
@@ -455,7 +403,7 @@ public:
|
||||
|
||||
|
||||
// build a multi_array with the specs given
|
||||
multi_array new_array(ranges,this->storage_order(),allocator());
|
||||
multi_array new_array(ranges,this->storage_order());
|
||||
|
||||
|
||||
// build a view of tmp with the minimum extents
|
||||
@@ -501,7 +449,6 @@ public:
|
||||
using std::swap;
|
||||
// Swap the internals of these arrays.
|
||||
swap(this->super_type::base_,new_array.super_type::base_);
|
||||
swap(this->allocator(),new_array.allocator());
|
||||
swap(this->storage_,new_array.storage_);
|
||||
swap(this->extent_list_,new_array.extent_list_);
|
||||
swap(this->stride_list_,new_array.stride_list_);
|
||||
@@ -509,6 +456,7 @@ public:
|
||||
swap(this->origin_offset_,new_array.origin_offset_);
|
||||
swap(this->directional_offset_,new_array.directional_offset_);
|
||||
swap(this->num_elements_,new_array.num_elements_);
|
||||
swap(this->allocator_,new_array.allocator_);
|
||||
swap(this->base_,new_array.base_);
|
||||
swap(this->allocated_elements_,new_array.allocated_elements_);
|
||||
|
||||
@@ -521,43 +469,26 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
friend inline bool operator==(const multi_array& a, const multi_array& b) {
|
||||
return a.base() == b.base();
|
||||
}
|
||||
|
||||
friend inline bool operator!=(const multi_array& a, const multi_array& b) {
|
||||
return !(a == b);
|
||||
}
|
||||
|
||||
const super_type& base() const {
|
||||
return *this;
|
||||
}
|
||||
|
||||
const Allocator& allocator() const {
|
||||
return alloc_base::get();
|
||||
}
|
||||
|
||||
Allocator& allocator() {
|
||||
return alloc_base::get();
|
||||
}
|
||||
|
||||
void allocate_space() {
|
||||
base_ = allocator().allocate(this->num_elements());
|
||||
typename Allocator::const_pointer no_hint=0;
|
||||
base_ = allocator_.allocate(this->num_elements(),no_hint);
|
||||
this->set_base_ptr(base_);
|
||||
allocated_elements_ = this->num_elements();
|
||||
boost::alloc_construct_n(allocator(),base_,allocated_elements_);
|
||||
std::uninitialized_fill_n(base_,allocated_elements_,T());
|
||||
}
|
||||
|
||||
void deallocate_space() {
|
||||
if(base_) {
|
||||
boost::alloc_destroy_n(allocator(),base_,allocated_elements_);
|
||||
allocator().deallocate(base_,allocated_elements_);
|
||||
for(T* i = base_; i != base_+allocated_elements_; ++i)
|
||||
allocator_.destroy(i);
|
||||
allocator_.deallocate(base_,allocated_elements_);
|
||||
}
|
||||
}
|
||||
|
||||
typedef boost::array<size_type,NumDims> size_list;
|
||||
typedef boost::array<index,NumDims> index_list;
|
||||
|
||||
Allocator allocator_;
|
||||
T* base_;
|
||||
size_type allocated_elements_;
|
||||
enum {initial_base_ = 0};
|
||||
@@ -565,8 +496,4 @@ private:
|
||||
|
||||
} // namespace boost
|
||||
|
||||
#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
|
||||
# pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
#endif // BOOST_MULTI_ARRAY_RG071801_HPP
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
// See http://www.boost.org/libs/multi_array for documentation.
|
||||
|
||||
|
||||
#include <iterator>
|
||||
#include "boost/iterator.hpp"
|
||||
|
||||
namespace boost {
|
||||
namespace detail {
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "boost/mpl/eval_if.hpp"
|
||||
#include "boost/mpl/if.hpp"
|
||||
#include "boost/mpl/size_t.hpp"
|
||||
#include "boost/mpl/aux_/msvc_eti_base.hpp"
|
||||
#include "boost/iterator/reverse_iterator.hpp"
|
||||
#include "boost/static_assert.hpp"
|
||||
#include "boost/type.hpp"
|
||||
@@ -64,7 +65,7 @@ namespace multi_array_types {
|
||||
// object creation in small-memory environments. Thus, the objects
|
||||
// can be left undefined by defining BOOST_MULTI_ARRAY_NO_GENERATORS
|
||||
// before loading multi_array.hpp.
|
||||
#ifndef BOOST_MULTI_ARRAY_NO_GENERATORS
|
||||
#if !BOOST_MULTI_ARRAY_NO_GENERATORS
|
||||
namespace {
|
||||
multi_array_types::extent_gen extents;
|
||||
multi_array_types::index_gen indices;
|
||||
@@ -209,11 +210,44 @@ struct value_accessor_generator {
|
||||
>::type type;
|
||||
};
|
||||
|
||||
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
|
||||
|
||||
struct eti_value_accessor
|
||||
{
|
||||
typedef int index;
|
||||
typedef int size_type;
|
||||
typedef int element;
|
||||
typedef int index_range;
|
||||
typedef int value_type;
|
||||
typedef int reference;
|
||||
typedef int const_reference;
|
||||
};
|
||||
|
||||
template <>
|
||||
struct value_accessor_generator<int,int>
|
||||
{
|
||||
typedef eti_value_accessor type;
|
||||
};
|
||||
|
||||
template <class T, class NumDims>
|
||||
struct associated_types
|
||||
: mpl::aux::msvc_eti_base<
|
||||
typename value_accessor_generator<T,NumDims>::type
|
||||
>::type
|
||||
{};
|
||||
|
||||
template <>
|
||||
struct associated_types<int,int> : eti_value_accessor {};
|
||||
|
||||
#else
|
||||
|
||||
template <class T, class NumDims>
|
||||
struct associated_types
|
||||
: value_accessor_generator<T,NumDims>::type
|
||||
{};
|
||||
|
||||
#endif
|
||||
|
||||
//
|
||||
// choose value accessor ends
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
@@ -238,7 +272,13 @@ struct mutable_iterator_tag
|
||||
template <typename T, std::size_t NumDims>
|
||||
class multi_array_impl_base
|
||||
:
|
||||
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
|
||||
public mpl::aux::msvc_eti_base<
|
||||
typename value_accessor_generator<T,mpl::size_t<NumDims> >::type
|
||||
>::type
|
||||
#else
|
||||
public value_accessor_generator<T,mpl::size_t<NumDims> >::type
|
||||
#endif
|
||||
{
|
||||
typedef associated_types<T,mpl::size_t<NumDims> > types;
|
||||
public:
|
||||
@@ -463,7 +503,6 @@ protected:
|
||||
index bound_adjustment = stride < 0 ? 1 : 0;
|
||||
BOOST_ASSERT(((index_bases[n] - bound_adjustment) <= finish) &&
|
||||
(finish <= (index_bases[n] + index(extents[n]) - bound_adjustment)));
|
||||
ignore_unused_variable_warning(bound_adjustment);
|
||||
#endif // BOOST_DISABLE_ASSERTS
|
||||
|
||||
|
||||
|
||||
@@ -39,6 +39,8 @@ namespace detail {
|
||||
|
||||
template <typename Array, typename IdxGen, typename Call_Type>
|
||||
static void call(Array& a, const IdxGen& idgen, Call_Type c) {
|
||||
typedef typename Array::index_range index_range;
|
||||
typedef typename Array::index index;
|
||||
idgen_helper<N-1>::call(a,idgen[c],c);
|
||||
}
|
||||
};
|
||||
@@ -48,6 +50,8 @@ namespace detail {
|
||||
|
||||
template <typename Array, typename IdxGen, typename Call_Type>
|
||||
static void call(Array& a, const IdxGen& idgen, Call_Type) {
|
||||
typedef typename Array::index_range index_range;
|
||||
typedef typename Array::index index;
|
||||
a[ idgen ];
|
||||
}
|
||||
};
|
||||
|
||||
@@ -107,12 +107,6 @@ namespace multi_array {
|
||||
|
||||
index stride() const { return stride_; }
|
||||
|
||||
size_type size(index idx) const
|
||||
{
|
||||
return (start_ == from_start() || finish_ == to_end())
|
||||
? idx : ((finish_ - start_) / stride_);
|
||||
}
|
||||
|
||||
void set_index_range(index start, index finish, index stride=1)
|
||||
{
|
||||
start_ = start;
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "boost/multi_array/base.hpp"
|
||||
#include "boost/iterator/iterator_facade.hpp"
|
||||
#include "boost/mpl/aux_/msvc_eti_base.hpp"
|
||||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
#include <iterator>
|
||||
@@ -58,9 +59,15 @@ class array_iterator
|
||||
, Reference
|
||||
>
|
||||
, private
|
||||
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
|
||||
mpl::aux::msvc_eti_base<typename
|
||||
#endif
|
||||
value_accessor_generator<T,NumDims>::type
|
||||
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
|
||||
>::type
|
||||
#endif
|
||||
{
|
||||
friend class ::boost::iterator_core_access;
|
||||
friend class iterator_core_access;
|
||||
typedef detail::multi_array::associated_types<T,NumDims> access_t;
|
||||
|
||||
typedef iterator_facade<
|
||||
|
||||
@@ -225,7 +225,11 @@ public:
|
||||
}
|
||||
|
||||
// see generate_array_view in base.hpp
|
||||
#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
|
||||
template <int NDims>
|
||||
#else
|
||||
template <int NumDims, int NDims> // else ICE
|
||||
#endif // BOOST_MSVC
|
||||
typename const_array_view<NDims>::type
|
||||
operator[](const detail::multi_array::
|
||||
index_gen<NumDims,NDims>& indices)
|
||||
@@ -525,7 +529,11 @@ public:
|
||||
|
||||
|
||||
// See note attached to generate_array_view in base.hpp
|
||||
#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
|
||||
template <int NDims>
|
||||
#else
|
||||
template <int NumDims, int NDims> // else ICE
|
||||
#endif // BOOST_MSVC
|
||||
typename array_view<NDims>::type
|
||||
operator[](const detail::multi_array::
|
||||
index_gen<NumDims,NDims>& indices) {
|
||||
@@ -583,7 +591,11 @@ public:
|
||||
}
|
||||
|
||||
// See note attached to generate_array_view in base.hpp
|
||||
#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
|
||||
template <int NDims>
|
||||
#else
|
||||
template <int NumDims, int NDims> // else ICE
|
||||
#endif // BOOST_MSVC
|
||||
typename const_array_view<NDims>::type
|
||||
operator[](const detail::multi_array::
|
||||
index_gen<NumDims,NDims>& indices)
|
||||
|
||||
@@ -87,7 +87,11 @@ public:
|
||||
}
|
||||
|
||||
// see generate_array_view in base.hpp
|
||||
#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
|
||||
template <int NDims>
|
||||
#else
|
||||
template <int NumDims, int NDims> // else ICE
|
||||
#endif // BOOST_MSVC
|
||||
typename const_array_view<NDims>::type
|
||||
operator[](const boost::detail::multi_array::
|
||||
index_gen<NumDims,NDims>& indices)
|
||||
@@ -263,7 +267,11 @@ public:
|
||||
}
|
||||
|
||||
// see generate_array_view in base.hpp
|
||||
#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
|
||||
template <int NDims>
|
||||
#else
|
||||
template <int NumDims, int NDims> // else ICE
|
||||
#endif // BOOST_MSVC
|
||||
typename array_view<NDims>::type
|
||||
operator[](const boost::detail::multi_array::
|
||||
index_gen<NumDims,NDims>& indices) {
|
||||
@@ -324,7 +332,11 @@ public:
|
||||
}
|
||||
|
||||
// see generate_array_view in base.hpp
|
||||
#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
|
||||
template <int NDims>
|
||||
#else
|
||||
template <int NumDims, int NDims> // else ICE
|
||||
#endif // BOOST_MSVC
|
||||
typename const_array_view<NDims>::type
|
||||
operator[](const boost::detail::multi_array::
|
||||
index_gen<NumDims,NDims>& indices)
|
||||
|
||||
@@ -135,7 +135,11 @@ public:
|
||||
}
|
||||
|
||||
// see generate_array_view in base.hpp
|
||||
#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
|
||||
template <int NDims>
|
||||
#else
|
||||
template <int NumDims, int NDims> // else ICE
|
||||
#endif // BOOST_MSVC
|
||||
typename const_array_view<NDims>::type
|
||||
operator[](const boost::detail::multi_array::
|
||||
index_gen<NumDims,NDims>& indices)
|
||||
@@ -342,7 +346,11 @@ public:
|
||||
|
||||
|
||||
// see generate_array_view in base.hpp
|
||||
#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
|
||||
template <int NDims>
|
||||
#else
|
||||
template <int NumDims, int NDims> // else ICE
|
||||
#endif // BOOST_MSVC
|
||||
typename array_view<NDims>::type
|
||||
operator[](const boost::detail::multi_array::
|
||||
index_gen<NumDims,NDims>& indices) {
|
||||
@@ -394,7 +402,11 @@ public:
|
||||
}
|
||||
|
||||
// see generate_array_view in base.hpp
|
||||
#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
|
||||
template <int NDims>
|
||||
#else
|
||||
template <int NumDims, int NDims> // else ICE
|
||||
#endif // BOOST_MSVC
|
||||
typename const_array_view<NDims>::type
|
||||
operator[](const boost::detail::multi_array::
|
||||
index_gen<NumDims,NDims>& indices)
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
{
|
||||
"key": "multi_array",
|
||||
"name": "Multi-Array",
|
||||
"authors": [
|
||||
"Ron Garcia"
|
||||
],
|
||||
"description": "Boost.MultiArray provides a generic N-dimensional array concept definition and common implementations of that interface.",
|
||||
"category": [
|
||||
"Containers",
|
||||
"Math"
|
||||
],
|
||||
"maintainers": [
|
||||
"Ronald Garcia <garcia -at- osl.iu.edu>"
|
||||
]
|
||||
}
|
||||
@@ -4,48 +4,48 @@
|
||||
# "as is" without express or implied warranty, and with no claim as
|
||||
# to its suitability for any purpose.
|
||||
|
||||
import testing ;
|
||||
|
||||
compile-fail fail_cbracket.cpp ;
|
||||
compile-fail fail_cdata.cpp ;
|
||||
compile-fail fail_citerator.cpp ;
|
||||
compile-fail fail_cparen.cpp ;
|
||||
compile-fail fail_criterator.cpp ;
|
||||
compile-fail fail_csubarray.cpp ;
|
||||
compile-fail fail_csubarray2.cpp ;
|
||||
compile-fail fail_csubarray3.cpp ;
|
||||
compile-fail fail_cview.cpp ;
|
||||
compile-fail fail_cview2.cpp ;
|
||||
compile-fail fail_cview3.cpp ;
|
||||
compile-fail fail_ref_cbracket.cpp ;
|
||||
compile-fail fail_ref_cdata.cpp ;
|
||||
compile-fail fail_ref_citerator.cpp ;
|
||||
compile-fail fail_ref_cparen.cpp ;
|
||||
compile-fail fail_ref_criterator.cpp ;
|
||||
compile-fail fail_ref_csubarray.cpp ;
|
||||
compile-fail fail_ref_csubarray2.cpp ;
|
||||
compile-fail fail_ref_csubarray3.cpp ;
|
||||
compile-fail fail_ref_cview.cpp ;
|
||||
compile-fail fail_ref_cview2.cpp ;
|
||||
compile-fail fail_ref_cview3.cpp ;
|
||||
test-suite multi_array
|
||||
:
|
||||
[ compile-fail fail_cbracket.cpp ]
|
||||
[ compile-fail fail_cdata.cpp ]
|
||||
[ compile-fail fail_citerator.cpp ]
|
||||
[ compile-fail fail_cparen.cpp ]
|
||||
[ compile-fail fail_criterator.cpp ]
|
||||
[ compile-fail fail_csubarray.cpp ]
|
||||
[ compile-fail fail_csubarray2.cpp ]
|
||||
[ compile-fail fail_csubarray3.cpp ]
|
||||
[ compile-fail fail_cview.cpp ]
|
||||
[ compile-fail fail_cview2.cpp ]
|
||||
[ compile-fail fail_cview3.cpp ]
|
||||
[ compile-fail fail_ref_cbracket.cpp ]
|
||||
[ compile-fail fail_ref_cdata.cpp ]
|
||||
[ compile-fail fail_ref_citerator.cpp ]
|
||||
[ compile-fail fail_ref_cparen.cpp ]
|
||||
[ compile-fail fail_ref_criterator.cpp ]
|
||||
[ compile-fail fail_ref_csubarray.cpp ]
|
||||
[ compile-fail fail_ref_csubarray2.cpp ]
|
||||
[ compile-fail fail_ref_csubarray3.cpp ]
|
||||
[ compile-fail fail_ref_cview.cpp ]
|
||||
[ compile-fail fail_ref_cview2.cpp ]
|
||||
[ compile-fail fail_ref_cview3.cpp ]
|
||||
|
||||
run constructors.cpp ;
|
||||
run access.cpp ;
|
||||
run compare.cpp ;
|
||||
run iterators.cpp ;
|
||||
run slice.cpp ;
|
||||
run assign.cpp ;
|
||||
run assign_to_array.cpp ;
|
||||
run index_bases.cpp ;
|
||||
run storage_order_convert.cpp ;
|
||||
run storage_order.cpp ;
|
||||
run reshape.cpp ;
|
||||
run range1.cpp ;
|
||||
run idxgen1.cpp ;
|
||||
run stl_interaction.cpp ;
|
||||
run resize.cpp ;
|
||||
run assert.cpp ;
|
||||
run reverse_view.cpp ;
|
||||
run allocators.cpp ;
|
||||
[ run constructors.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run access.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run compare.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run iterators.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run slice.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run assign.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run assign_to_array.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run index_bases.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run storage_order_convert.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run storage_order.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run reshape.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run range1.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run idxgen1.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run stl_interaction.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run resize.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run assert.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
[ run reverse_view.cpp ../../test/build//boost_test_exec_monitor ]
|
||||
|
||||
compile concept_checks.cpp ;
|
||||
[ compile concept_checks.cpp ]
|
||||
;
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
//
|
||||
|
||||
#include "generative_tests.hpp"
|
||||
#include <boost/static_assert.hpp>
|
||||
#include "boost/static_assert.hpp"
|
||||
|
||||
template <typename Array>
|
||||
void access(Array& A, const mutable_array_tag&) {
|
||||
@@ -42,8 +42,8 @@ void access(Array& A, const const_array_tag&) {
|
||||
for (index i = idx0; i != idx0+2; ++i)
|
||||
for (index j = idx1; j != idx1+3; ++j)
|
||||
for (index k = idx2; k != idx2+4; ++k) {
|
||||
BOOST_TEST(A[i][j][k] == cnum++);
|
||||
BOOST_TEST(CA[i][j][k] == A[i][j][k]);
|
||||
BOOST_CHECK(A[i][j][k] == cnum++);
|
||||
BOOST_CHECK(CA[i][j][k] == A[i][j][k]);
|
||||
}
|
||||
|
||||
// operator()
|
||||
@@ -52,12 +52,12 @@ void access(Array& A, const const_array_tag&) {
|
||||
for (index k2 = idx2; k2 != idx2+4; ++k2) {
|
||||
boost::array<index,ndims> indices;
|
||||
indices[0] = i2; indices[1] = j2; indices[2] = k2;
|
||||
BOOST_TEST(A(indices) == A[i2][j2][k2]);
|
||||
BOOST_TEST(CA(indices) == A(indices));
|
||||
BOOST_CHECK(A(indices) == A[i2][j2][k2]);
|
||||
BOOST_CHECK(CA(indices) == A(indices));
|
||||
}
|
||||
++tests_run;
|
||||
}
|
||||
|
||||
int main() {
|
||||
int test_main(int,char*[]) {
|
||||
return run_generative_tests();
|
||||
}
|
||||
|
||||
@@ -1,151 +0,0 @@
|
||||
// Copyright 2019 Glen Joseph Fernandes
|
||||
// (glenjofe@gmail.com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0.
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include <boost/multi_array.hpp>
|
||||
#include <algorithm>
|
||||
|
||||
template<class T>
|
||||
class creator {
|
||||
public:
|
||||
typedef T value_type;
|
||||
typedef T* pointer;
|
||||
typedef std::size_t size_type;
|
||||
typedef std::ptrdiff_t difference_type;
|
||||
|
||||
template<class U>
|
||||
struct rebind {
|
||||
typedef creator<U> other;
|
||||
};
|
||||
|
||||
creator(int state)
|
||||
: state_(state) { }
|
||||
|
||||
template<class U>
|
||||
creator(const creator<U>& other)
|
||||
: state_(other.state()) { }
|
||||
|
||||
T* allocate(std::size_t size) {
|
||||
return static_cast<T*>(::operator new(sizeof(T) * size));
|
||||
}
|
||||
|
||||
void deallocate(T* ptr, std::size_t) {
|
||||
::operator delete(ptr);
|
||||
}
|
||||
|
||||
int state() const {
|
||||
return state_;
|
||||
}
|
||||
|
||||
private:
|
||||
int state_;
|
||||
};
|
||||
|
||||
template<class T, class U>
|
||||
inline bool
|
||||
operator==(const creator<T>& a, const creator<U>& b)
|
||||
{
|
||||
return a.state() == b.state();
|
||||
}
|
||||
|
||||
template<class T, class U>
|
||||
inline bool
|
||||
operator!=(const creator<T>& a, const creator<U>& b)
|
||||
{
|
||||
return !(a == b);
|
||||
}
|
||||
|
||||
void test(const double&, std::size_t*, int*, unsigned)
|
||||
{
|
||||
}
|
||||
|
||||
template<class Array>
|
||||
void test(const Array& array, std::size_t* sizes, int* strides,
|
||||
unsigned elements)
|
||||
{
|
||||
BOOST_TEST(array.num_elements() == elements);
|
||||
BOOST_TEST(array.size() == *sizes);
|
||||
BOOST_TEST(std::equal(sizes, sizes + array.num_dimensions(), array.shape()));
|
||||
BOOST_TEST(std::equal(strides, strides + array.num_dimensions(),
|
||||
array.strides()));
|
||||
test(array[0], ++sizes, ++strides, elements / array.size());
|
||||
}
|
||||
|
||||
bool test(const double& a, const double& b)
|
||||
{
|
||||
return a == b;
|
||||
}
|
||||
|
||||
template<class A1, class A2>
|
||||
bool test(const A1& a1, const A2& a2)
|
||||
{
|
||||
typename A1::const_iterator i1 = a1.begin();
|
||||
typename A2::const_iterator i2 = a2.begin();
|
||||
for (; i1 != a1.end(); ++i1, ++i2) {
|
||||
if (!test(*i1, *i2)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
typedef boost::multi_array<double, 3, creator<double> > type;
|
||||
creator<double> state(1);
|
||||
{
|
||||
type array(state);
|
||||
}
|
||||
boost::array<type::size_type, 3> sizes = { { 3, 3, 3 } };
|
||||
type::size_type elements = 27;
|
||||
{
|
||||
int strides[] = { 9, 3, 1 };
|
||||
type array(sizes, state);
|
||||
test(array, &sizes[0], strides, elements);
|
||||
}
|
||||
{
|
||||
int strides[] = { 1, 3, 9 };
|
||||
type array(sizes, boost::fortran_storage_order(), state);
|
||||
test(array, &sizes[0], strides, elements);
|
||||
}
|
||||
{
|
||||
int strides[] = { 9, 3, 1 };
|
||||
type::extent_gen extents;
|
||||
type array(extents[3][3][3], state);
|
||||
test(array, &sizes[0], strides, elements);
|
||||
}
|
||||
{
|
||||
type array1(sizes, state);
|
||||
std::vector<double> values(elements, 4.5);
|
||||
array1.assign(values.begin(), values.end());
|
||||
type array2(array1);
|
||||
int strides[] = { 9, 3, 1 };
|
||||
test(array2, &sizes[0], strides, elements);
|
||||
BOOST_TEST(test(array1, array2));
|
||||
}
|
||||
{
|
||||
type array1(sizes, state);
|
||||
type array2(sizes, state);
|
||||
std::vector<double> values(elements, 4.5);
|
||||
array1.assign(values.begin(), values.end());
|
||||
array2 = array1;
|
||||
int strides[] = { 9, 3, 1 };
|
||||
test(array2, &sizes[0], strides, elements);
|
||||
BOOST_TEST(test(array1, array2));
|
||||
}
|
||||
{
|
||||
type array1(sizes, state);
|
||||
std::vector<double> values(elements, 4.5);
|
||||
array1.assign(values.begin(), values.end());
|
||||
typedef type::subarray<2>::type other;
|
||||
other array2 = array1[1];
|
||||
other::value_type value = array2[0];
|
||||
BOOST_TEST(test(array1[1][0], value));
|
||||
BOOST_TEST(test(array2[0], value));
|
||||
}
|
||||
return boost::report_errors();
|
||||
}
|
||||
@@ -15,10 +15,10 @@
|
||||
// with exceptions
|
||||
//
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#define BOOST_ENABLE_ASSERT_HANDLER
|
||||
#include <boost/multi_array.hpp> // includes assert.hpp
|
||||
#include "boost/multi_array.hpp" // includes assert.hpp
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace boost {
|
||||
using namespace boost;
|
||||
|
||||
int
|
||||
main() {
|
||||
test_main(int,char*[]) {
|
||||
|
||||
typedef multi_array<int,2> array_t;
|
||||
|
||||
@@ -55,5 +55,5 @@ main() {
|
||||
//...all good
|
||||
}
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
//
|
||||
//
|
||||
#include "generative_tests.hpp"
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/multi_array.hpp>
|
||||
#include <boost/cstdlib.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/multi_array.hpp"
|
||||
#include "boost/cstdlib.hpp"
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
|
||||
@@ -59,7 +59,7 @@ void access(Array& A, const mutable_array_tag&) {
|
||||
|
||||
A = filler;
|
||||
|
||||
BOOST_TEST(::equal(A,filler));
|
||||
BOOST_CHECK(::equal(A,filler));
|
||||
++tests_run;
|
||||
}
|
||||
|
||||
@@ -68,6 +68,6 @@ void access(Array&, const const_array_tag&) {
|
||||
}
|
||||
|
||||
|
||||
int main() {
|
||||
int test_main(int,char*[]) {
|
||||
return run_generative_tests();
|
||||
}
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
//
|
||||
//
|
||||
#include "generative_tests.hpp"
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/multi_array.hpp>
|
||||
#include <boost/cstdlib.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/multi_array.hpp"
|
||||
#include "boost/cstdlib.hpp"
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
|
||||
@@ -50,11 +50,11 @@ template <typename Array>
|
||||
void access(Array& A, const const_array_tag&) {
|
||||
typedef boost::multi_array<int,3> array3;
|
||||
array3 acopy(A);
|
||||
BOOST_TEST(::equal(acopy,A));
|
||||
BOOST_CHECK(::equal(acopy,A));
|
||||
++tests_run;
|
||||
}
|
||||
|
||||
|
||||
int main() {
|
||||
int test_main(int,char*[]) {
|
||||
return run_generative_tests();
|
||||
}
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
#include <list>
|
||||
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int, char*[])
|
||||
{
|
||||
typedef boost::multi_array<double, 3> array;
|
||||
typedef array::size_type size_type;
|
||||
@@ -34,9 +34,9 @@ main()
|
||||
std::vector<double> vals(num_elements, 4.5);
|
||||
A.assign(vals.begin(),vals.end());
|
||||
array B(A);
|
||||
BOOST_TEST(A == B);
|
||||
BOOST_TEST(B == A);
|
||||
BOOST_TEST(A[0] == B[0]);
|
||||
BOOST_CHECK(A == B);
|
||||
BOOST_CHECK(B == A);
|
||||
BOOST_CHECK(A[0] == B[0]);
|
||||
}
|
||||
// Assignment Operator
|
||||
{
|
||||
@@ -44,15 +44,15 @@ main()
|
||||
std::vector<double> vals(num_elements, 4.5);
|
||||
A.assign(vals.begin(),vals.end());
|
||||
B = A;
|
||||
BOOST_TEST(A == B);
|
||||
BOOST_TEST(B == A);
|
||||
BOOST_TEST(B[0] == A[0]);
|
||||
BOOST_CHECK(A == B);
|
||||
BOOST_CHECK(B == A);
|
||||
BOOST_CHECK(B[0] == A[0]);
|
||||
|
||||
typedef array::index_range range;
|
||||
array::index_gen indices;
|
||||
array::array_view<2>::type C = A[indices[2][range()][range()]];
|
||||
array::array_view<2>::type D = B[indices[2][range()][range()]];
|
||||
BOOST_TEST(C == D);
|
||||
BOOST_CHECK(C == D);
|
||||
}
|
||||
// Different Arrays
|
||||
{
|
||||
@@ -62,15 +62,15 @@ main()
|
||||
A.assign(valsA.begin(),valsA.end());
|
||||
B.assign(valsB.begin(),valsB.end());
|
||||
|
||||
BOOST_TEST(A != B);
|
||||
BOOST_TEST(B != A);
|
||||
BOOST_TEST(A[0] != B[0]);
|
||||
BOOST_CHECK(A != B);
|
||||
BOOST_CHECK(B != A);
|
||||
BOOST_CHECK(A[0] != B[0]);
|
||||
|
||||
typedef array::index_range range;
|
||||
array::index_gen indices;
|
||||
array::array_view<2>::type C = A[indices[2][range()][range()]];
|
||||
array::array_view<2>::type D = B[indices[2][range()][range()]];
|
||||
BOOST_TEST(C != D);
|
||||
BOOST_CHECK(C != D);
|
||||
}
|
||||
|
||||
// Comparisons galore!
|
||||
@@ -108,35 +108,35 @@ main()
|
||||
A.assign(valsA,valsA+num_elements);
|
||||
B.assign(valsB,valsB+num_elements);
|
||||
|
||||
BOOST_TEST(B < A);
|
||||
BOOST_TEST(A > B);
|
||||
BOOST_CHECK(B < A);
|
||||
BOOST_CHECK(A > B);
|
||||
|
||||
BOOST_TEST(B <= A);
|
||||
BOOST_TEST(A >= B);
|
||||
BOOST_CHECK(B <= A);
|
||||
BOOST_CHECK(A >= B);
|
||||
|
||||
BOOST_TEST(B[0] == A[0]);
|
||||
BOOST_TEST(B[2] < A[2]);
|
||||
BOOST_CHECK(B[0] == A[0]);
|
||||
BOOST_CHECK(B[2] < A[2]);
|
||||
|
||||
array C = A;
|
||||
|
||||
BOOST_TEST(C <= A);
|
||||
BOOST_TEST(C >= A);
|
||||
BOOST_CHECK(C <= A);
|
||||
BOOST_CHECK(C >= A);
|
||||
|
||||
BOOST_TEST(!(C < A));
|
||||
BOOST_TEST(!(C > A));
|
||||
BOOST_CHECK(!(C < A));
|
||||
BOOST_CHECK(!(C > A));
|
||||
|
||||
typedef array::index_range range;
|
||||
array::index_gen indices;
|
||||
array::array_view<2>::type D = A[indices[2][range()][range()]];
|
||||
array::array_view<2>::type E = B[indices[2][range()][range()]];
|
||||
|
||||
BOOST_TEST(E < D);
|
||||
BOOST_TEST(E <= D);
|
||||
BOOST_CHECK(E < D);
|
||||
BOOST_CHECK(E <= D);
|
||||
}
|
||||
|
||||
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
// make sure the types meet concept requirements
|
||||
//
|
||||
|
||||
#include <boost/concept_check.hpp>
|
||||
#include <boost/multi_array/concept_checks.hpp>
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/concept_check.hpp"
|
||||
#include "boost/multi_array/concept_checks.hpp"
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/cstdlib.hpp>
|
||||
#include "boost/cstdlib.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array<int,ndims> array;
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
//
|
||||
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
#include <algorithm>
|
||||
#include <list>
|
||||
|
||||
@@ -30,10 +30,10 @@ void check_shape(const Array& A,
|
||||
int* strides,
|
||||
unsigned int num_elements)
|
||||
{
|
||||
BOOST_TEST(A.num_elements() == num_elements);
|
||||
BOOST_TEST(A.size() == *sizes);
|
||||
BOOST_TEST(std::equal(sizes, sizes + A.num_dimensions(), A.shape()));
|
||||
BOOST_TEST(std::equal(strides, strides + A.num_dimensions(), A.strides()));
|
||||
BOOST_CHECK(A.num_elements() == num_elements);
|
||||
BOOST_CHECK(A.size() == *sizes);
|
||||
BOOST_CHECK(std::equal(sizes, sizes + A.num_dimensions(), A.shape()));
|
||||
BOOST_CHECK(std::equal(strides, strides + A.num_dimensions(), A.strides()));
|
||||
check_shape(A[0], ++sizes, ++strides, num_elements / A.size());
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ bool equal(const ArrayA& A, const ArrayB& B)
|
||||
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int, char*[])
|
||||
{
|
||||
typedef boost::multi_array<double, 3>::size_type size_type;
|
||||
boost::array<size_type,3> sizes = { { 3, 3, 3 } };
|
||||
@@ -132,20 +132,20 @@ main()
|
||||
A.assign(vals.begin(),vals.end());
|
||||
boost::multi_array<double, 3> B(A);
|
||||
check_shape(B, &sizes[0], strides, num_elements);
|
||||
BOOST_TEST(::equal(A, B));
|
||||
BOOST_CHECK(::equal(A, B));
|
||||
|
||||
double ptr[27];
|
||||
boost::multi_array_ref<double, 3> C(ptr,sizes);
|
||||
A.assign(vals.begin(),vals.end());
|
||||
boost::multi_array_ref<double, 3> D(C);
|
||||
check_shape(D, &sizes[0], strides, num_elements);
|
||||
BOOST_TEST(C.data() == D.data());
|
||||
BOOST_CHECK(C.data() == D.data());
|
||||
|
||||
const double* cptr = ptr;
|
||||
boost::const_multi_array_ref<double, 3> E(cptr,sizes);
|
||||
boost::const_multi_array_ref<double, 3> F(E);
|
||||
check_shape(F, &sizes[0], strides, num_elements);
|
||||
BOOST_TEST(E.data() == F.data());
|
||||
BOOST_CHECK(E.data() == F.data());
|
||||
}
|
||||
|
||||
|
||||
@@ -161,15 +161,15 @@ main()
|
||||
boost::const_multi_array_ref<double, 3> C(A);
|
||||
check_shape(B, &sizes[0], strides, num_elements);
|
||||
check_shape(C, &sizes[0], strides, num_elements);
|
||||
BOOST_TEST(B.data() == A.data());
|
||||
BOOST_TEST(C.data() == A.data());
|
||||
BOOST_CHECK(B.data() == A.data());
|
||||
BOOST_CHECK(C.data() == A.data());
|
||||
|
||||
double ptr[27];
|
||||
boost::multi_array_ref<double, 3> D(ptr,sizes);
|
||||
D.assign(vals.begin(),vals.end());
|
||||
boost::const_multi_array_ref<double, 3> E(D);
|
||||
check_shape(E, &sizes[0], strides, num_elements);
|
||||
BOOST_TEST(E.data() == D.data());
|
||||
BOOST_CHECK(E.data() == D.data());
|
||||
}
|
||||
|
||||
// Assignment Operator
|
||||
@@ -182,7 +182,7 @@ main()
|
||||
A.assign(vals.begin(),vals.end());
|
||||
B = A;
|
||||
check_shape(B, &sizes[0], strides, num_elements);
|
||||
BOOST_TEST(::equal(A, B));
|
||||
BOOST_CHECK(::equal(A, B));
|
||||
|
||||
double ptr1[27];
|
||||
double ptr2[27];
|
||||
@@ -190,7 +190,7 @@ main()
|
||||
C.assign(vals.begin(),vals.end());
|
||||
D = C;
|
||||
check_shape(D, &sizes[0], strides, num_elements);
|
||||
BOOST_TEST(::equal(C,D));
|
||||
BOOST_CHECK(::equal(C,D));
|
||||
}
|
||||
|
||||
|
||||
@@ -209,10 +209,10 @@ main()
|
||||
subarray::value_type C = B[0];
|
||||
|
||||
// should comparisons between the types work?
|
||||
BOOST_TEST(::equal(A[1][0],C));
|
||||
BOOST_TEST(::equal(B[0],C));
|
||||
BOOST_CHECK(::equal(A[1][0],C));
|
||||
BOOST_CHECK(::equal(B[0],C));
|
||||
}
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
//
|
||||
// Trying to diagnose problems under visual
|
||||
|
||||
#include <boost/config.hpp>
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/limits.hpp>
|
||||
#include "boost/config.hpp"
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/limits.hpp"
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// checking constness of const operator[].
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array<int,ndims> array;
|
||||
@@ -36,5 +36,5 @@ main()
|
||||
// FAIL! cannot assign to csma.
|
||||
csma[0][0][0] = 5;
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// Testing data() member function constness.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array<int,ndims> array;
|
||||
@@ -37,5 +37,5 @@ main()
|
||||
|
||||
// FAIL! data() returns a const int*
|
||||
*csma.data() = 0;
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
// const_iterator/iterator conversion test
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
|
||||
int main() {
|
||||
int test_main(int,char*[]) {
|
||||
typedef boost::multi_array<int,3> array;
|
||||
|
||||
typedef array::iterator iterator1;
|
||||
@@ -29,5 +29,5 @@ int main() {
|
||||
// ILLEGAL conversion from const_iterator to iterator
|
||||
iterator1 in = citerator1();
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// Testing const operator() constness.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array<int,ndims> array;
|
||||
@@ -40,5 +40,5 @@ main()
|
||||
// FAIL! Cannot assign to csma
|
||||
csma(indices) = 5;
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
// const_reverse_iterator/reverse_iterator conversion test
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
|
||||
int main() {
|
||||
int test_main(int,char*[]) {
|
||||
typedef boost::multi_array<int,3> array;
|
||||
|
||||
typedef array::reverse_iterator riterator1;
|
||||
@@ -29,5 +29,5 @@ int main() {
|
||||
// ILLEGAL conversion from const_reverse_iterator to reverse_iterator
|
||||
riterator1 in = criterator1();
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// Testing subarray and const_subarray assignment
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array<int,ndims> array;
|
||||
@@ -42,5 +42,5 @@ main()
|
||||
// FAIL! Preserve constness (no const_subarray -> subarray conversion).
|
||||
array::subarray<ndims-1>::type sba = csba;
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// Testing constness of subarray operations.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array<int,ndims> array;
|
||||
@@ -41,5 +41,5 @@ main()
|
||||
// FAIL! preserve constness.
|
||||
array::subarray<ndims-1>::type sba = sma_const[0];
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// Testing constness of subarray operations.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array<int,ndims> array;
|
||||
@@ -45,5 +45,5 @@ main()
|
||||
// FAIL! sba cannot be assigned to.
|
||||
sba[j][k] = num++;
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,15 +15,15 @@
|
||||
// ensure const_array_view doesn't allow element assignment.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/type.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/type.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array<int,ndims> array;
|
||||
@@ -54,7 +54,7 @@ main()
|
||||
// FAIL! const_array_view cannot be assigned to.
|
||||
csma2(elmt) = 5;
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
// ensure const_array_view cannot be converted to array_view
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#define BOOST_INCLUDE_MAIN
|
||||
#include <boost/test/test_tools.hpp>
|
||||
#include "boost/test/test_tools.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/type.hpp>
|
||||
#include <boost/cstdlib.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/type.hpp"
|
||||
#include "boost/cstdlib.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array<int,ndims> array;
|
||||
@@ -52,7 +52,7 @@ main()
|
||||
array::array_view<ndims>::type csma2 =
|
||||
csma[indices[range(0,2)][range(1,3)][range(0,4,2)]];
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -15,15 +15,15 @@
|
||||
// ensure const_array_ref doesn't allow assignment.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/type.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/type.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array<int,ndims> array;
|
||||
@@ -55,7 +55,7 @@ main()
|
||||
// FAIL! csma2 cannot be assigned to.
|
||||
csma2[i][j][k] = 0;
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// checking constness of const operator[].
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array_ref<int,ndims> array_ref;
|
||||
@@ -40,5 +40,5 @@ main()
|
||||
// FAIL! can't assign to const multi_array_ref.
|
||||
csma[0][0][0] = 5;
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// Testing data() member function constness.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array_ref<int,ndims> array_ref;
|
||||
@@ -36,5 +36,5 @@ main()
|
||||
|
||||
// FAIL! data() returns const int*.
|
||||
*csma.data() = 0;
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
// const_iterator/iterator conversion test
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
|
||||
int main() {
|
||||
int test_main(int,char*[]) {
|
||||
typedef boost::multi_array_ref<int,3> array_ref;
|
||||
|
||||
typedef array_ref::iterator iterator1;
|
||||
@@ -29,5 +29,5 @@ int main() {
|
||||
// FAIL! ILLEGAL conversion from const_iterator to iterator
|
||||
iterator1 in = citerator1();
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// Testing const operator() constness.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array_ref<int,ndims> array_ref;
|
||||
@@ -40,5 +40,5 @@ main()
|
||||
// FAIL! cannot assign to a const multi_array_ref
|
||||
csma(indices) = 5;
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
// const_reverse_iterator/reverse_iterator conversion test
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
|
||||
int main() {
|
||||
int test_main(int,char*[]) {
|
||||
typedef boost::multi_array_ref<int,3> array_ref;
|
||||
|
||||
typedef array_ref::reverse_iterator riterator1;
|
||||
@@ -29,5 +29,5 @@ int main() {
|
||||
// Fail! ILLEGAL conversion from const_reverse_iterator to reverse_iterator
|
||||
riterator1 in = criterator1();
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// Testing subarray and const_subarray assignment
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array_ref<int,ndims> array_ref;
|
||||
@@ -44,5 +44,5 @@ main()
|
||||
|
||||
array_ref::subarray<ndims-1>::type sba = csba; // FAIL! preserve constness.
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// Testing constness of subarray operations.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array_ref<int,ndims> array_ref;
|
||||
@@ -45,5 +45,5 @@ main()
|
||||
array_ref::subarray<ndims-1>::type sba = sma_const[0]; // FAIL!
|
||||
// preserve constness
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
// Testing constness of subarray operations.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array_ref<int,ndims> array_ref;
|
||||
@@ -48,5 +48,5 @@ main()
|
||||
for (array_ref::index k = 0; k != 4; ++k)
|
||||
sba[j][k] = num++; // FAIL! can't assign to const_subarray.
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,15 +15,15 @@
|
||||
// ensure const_array_view doesn't allow element assignment.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/type.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/type.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array_ref<int,ndims> array_ref;
|
||||
@@ -51,7 +51,7 @@ main()
|
||||
|
||||
csma2(elmt) = 5; // FAIL! csma is read only
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -15,15 +15,15 @@
|
||||
// ensure const_array_view cannot be converted to array_view
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/type.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/type.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array_ref<int,ndims> array_ref;
|
||||
@@ -52,7 +52,7 @@ main()
|
||||
for (array_ref::index k = 0; k != 2; ++k)
|
||||
csma2[i][j][k] = 0; // FAIL! csma2 is read only
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -15,15 +15,15 @@
|
||||
// ensure const_array_view doesn't allow assignment.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/type.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/type.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array_ref<int,ndims> array_ref;
|
||||
@@ -53,7 +53,7 @@ main()
|
||||
for (array_ref::index k = 0; k != 2; ++k)
|
||||
csma2[i][j][k] = 0; // FAIL! csma2 is read only.
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -45,9 +45,9 @@
|
||||
//
|
||||
// int test_main(int,char*[]) { return run_generative_tests(); }
|
||||
//
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/config.hpp> /* BOOST_NO_SFINAE */
|
||||
#include <algorithm>
|
||||
@@ -100,7 +100,7 @@ template <typename Array>
|
||||
void access(Array& A, const const_array_tag&);
|
||||
|
||||
template <typename StorageOrder3,typename StorageOrder4,typename Modifier>
|
||||
void run_configuration(const StorageOrder3& so3,
|
||||
int run_configuration(const StorageOrder3& so3,
|
||||
const StorageOrder4& so4,
|
||||
const Modifier& modifier) {
|
||||
// multi_array
|
||||
@@ -213,10 +213,11 @@ void run_configuration(const StorageOrder3& so3,
|
||||
access(C,const_array_tag());
|
||||
}
|
||||
}
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
template <typename ArrayModifier>
|
||||
void run_storage_tests(const ArrayModifier& modifier) {
|
||||
int run_storage_tests(const ArrayModifier& modifier) {
|
||||
run_configuration(boost::c_storage_order(),
|
||||
boost::c_storage_order(),modifier);
|
||||
run_configuration(boost::fortran_storage_order(),
|
||||
@@ -227,6 +228,8 @@ void run_storage_tests(const ArrayModifier& modifier) {
|
||||
run_configuration(boost::general_storage_order<3>(ordering,ascending),
|
||||
boost::general_storage_order<4>(ordering,ascending),
|
||||
modifier);
|
||||
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
struct null_modifier {
|
||||
@@ -276,7 +279,7 @@ int run_generative_tests() {
|
||||
run_storage_tests(reindex_modifier());
|
||||
run_storage_tests(reshape_modifier());
|
||||
std::cout << "Total Tests Run: " << tests_run << '\n';
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
#endif // GENERATIVE_TESTS_RG072001_HPP
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
// idxset1.cpp - testing the code for index_gen
|
||||
//
|
||||
|
||||
#include <boost/multi_array/index_gen.hpp>
|
||||
#include <boost/multi_array/index_range.hpp>
|
||||
#include <boost/multi_array/types.hpp>
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/multi_array/index_gen.hpp"
|
||||
#include "boost/multi_array/index_range.hpp"
|
||||
#include "boost/multi_array/types.hpp"
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
typedef boost::detail::multi_array::index index_type;
|
||||
typedef boost::detail::multi_array::size_type size_type;
|
||||
@@ -37,7 +37,7 @@ bool operator==(const range& lhs,const range& rhs) {
|
||||
}
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
|
||||
boost::detail::multi_array::index_gen<0,0> indices;
|
||||
@@ -62,20 +62,20 @@ main()
|
||||
{
|
||||
boost::detail::multi_array::index_gen<3,3> is1 =
|
||||
indices[range(0,1,2)][range(1,2,3)][range(2,3,4)];
|
||||
BOOST_TEST(is1.ranges_[0] == range(0,1,2));
|
||||
BOOST_TEST(is1.ranges_[1] == range(1,2,3));
|
||||
BOOST_TEST(is1.ranges_[2] == range(2,3,4));
|
||||
BOOST_CHECK(is1.ranges_[0] == range(0,1,2));
|
||||
BOOST_CHECK(is1.ranges_[1] == range(1,2,3));
|
||||
BOOST_CHECK(is1.ranges_[2] == range(2,3,4));
|
||||
}
|
||||
|
||||
{
|
||||
boost::detail::multi_array::index_gen<3,2> is2 =
|
||||
indices[range(0,1,2)][2][range(2,3,4)];
|
||||
BOOST_TEST(is2.ranges_[0] == range(0,1,2));
|
||||
BOOST_TEST(is2.ranges_[1] == range(2));
|
||||
BOOST_TEST(is2.ranges_[1].is_degenerate());
|
||||
BOOST_TEST(is2.ranges_[2] == range(2,3,4));
|
||||
BOOST_CHECK(is2.ranges_[0] == range(0,1,2));
|
||||
BOOST_CHECK(is2.ranges_[1] == range(2));
|
||||
BOOST_CHECK(is2.ranges_[1].is_degenerate());
|
||||
BOOST_CHECK(is2.ranges_[2] == range(2,3,4));
|
||||
}
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
|
||||
@@ -14,15 +14,15 @@
|
||||
// index_bases - test of the index_base modifying facilities.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
typedef boost::multi_array<double, 3> array;
|
||||
typedef boost::multi_array_ref<double, 3> array_ref;
|
||||
@@ -63,11 +63,11 @@ main()
|
||||
for (size_type a = 0; a < A.shape()[0]; ++a)
|
||||
for (size_type b = 0; b < A.shape()[1]; ++b)
|
||||
for (size_type c = 0; c < A.shape()[2]; ++c) {
|
||||
BOOST_TEST(A[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_TEST(C[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_TEST(D[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_CHECK(A[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_CHECK(C[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_CHECK(D[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
// Test that E does not inherit A's index_base
|
||||
BOOST_TEST(E[a][b][c] == B[a][b][c]);
|
||||
BOOST_CHECK(E[a][b][c] == B[a][b][c]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,10 +100,10 @@ main()
|
||||
for (size_type a = 0; a < A.shape()[0]; ++a)
|
||||
for (size_type b = 0; b < A.shape()[1]; ++b)
|
||||
for (size_type c = 0; c < A.shape()[2]; ++c) {
|
||||
BOOST_TEST(A[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_TEST(C[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_TEST(D[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_TEST(E[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_CHECK(A[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_CHECK(C[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_CHECK(D[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
BOOST_CHECK(E[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -142,12 +142,12 @@ main()
|
||||
for (size_type a = 0; a < A.shape()[0]; ++a)
|
||||
for (size_type b = 0; b < A.shape()[1]; ++b)
|
||||
for (size_type c = 0; c < A.shape()[2]; ++c) {
|
||||
BOOST_TEST(A[a+1][b+1][c+1] == B[a][b][c]);
|
||||
BOOST_TEST(C[a+1][b+1][c+1] == B[a][b][c]);
|
||||
BOOST_TEST(D[a+1][b+1][c+1] == B[a][b][c]);
|
||||
BOOST_TEST(E[a+1][b+1][c+1] == B[a][b][c]);
|
||||
BOOST_CHECK(A[a+1][b+1][c+1] == B[a][b][c]);
|
||||
BOOST_CHECK(C[a+1][b+1][c+1] == B[a][b][c]);
|
||||
BOOST_CHECK(D[a+1][b+1][c+1] == B[a][b][c]);
|
||||
BOOST_CHECK(E[a+1][b+1][c+1] == B[a][b][c]);
|
||||
}
|
||||
}
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
|
||||
#define MULTIARRAY_TEST_ASSIGN
|
||||
#include "generative_tests.hpp"
|
||||
#include <boost/concept_check.hpp> // for ignore_unused_variable_warning
|
||||
#include <boost/mpl/if.hpp>
|
||||
#include <boost/type_traits/is_same.hpp>
|
||||
#include "boost/concept_check.hpp" // for ignore_unused_variable_warning
|
||||
#include "boost/mpl/if.hpp"
|
||||
#include "boost/type_traits/is_same.hpp"
|
||||
|
||||
// iterator-test-specific code
|
||||
|
||||
@@ -107,8 +107,8 @@ void test_iterators(Array& A, const IterTraits&) {
|
||||
typedef typename IterTraits::iterator3 iterator;
|
||||
iterator i1 = A.begin();
|
||||
iterator i2 = A.end();
|
||||
BOOST_TEST(i1 < i2);
|
||||
BOOST_TEST((i2 - i1) == typename iterator::difference_type(2));
|
||||
BOOST_CHECK(i1 < i2);
|
||||
BOOST_CHECK((i2 - i1) == typename iterator::difference_type(2));
|
||||
}
|
||||
|
||||
// Standard Array Iteration
|
||||
@@ -121,7 +121,7 @@ void test_iterators(Array& A, const IterTraits&) {
|
||||
for (iterator3 i = A.begin(); i != A.end(); ++i)
|
||||
for(iterator2 ii = (*i).begin(); ii != (*i).end(); ++ii)
|
||||
for(iterator1 iii = (*ii).begin(); iii != (*ii).end(); ++iii)
|
||||
BOOST_TEST(*iii == vals++);
|
||||
BOOST_CHECK(*iii == vals++);
|
||||
}
|
||||
|
||||
// Using operator->() on iterators
|
||||
@@ -134,7 +134,7 @@ void test_iterators(Array& A, const IterTraits&) {
|
||||
for (iterator3 i = A.begin(); i != A.end(); ++i)
|
||||
for(iterator2 ii = i->begin(); ii != i->end(); ++ii)
|
||||
for(iterator1 iii = ii->begin(); iii != ii->end(); ++iii)
|
||||
BOOST_TEST(*iii == vals++);
|
||||
BOOST_CHECK(*iii == vals++);
|
||||
}
|
||||
|
||||
// Reverse Iterator Hierarchy Test
|
||||
@@ -148,7 +148,7 @@ void test_iterators(Array& A, const IterTraits&) {
|
||||
for(riterator2 ii = (*i).rbegin(); ii != (riterator2)(*i).rend(); ++ii)
|
||||
for(riterator1 iii = (*ii).rbegin(); iii != (riterator1)(*ii).rend();
|
||||
++iii)
|
||||
BOOST_TEST(*iii == check_iter_val--);
|
||||
BOOST_CHECK(*iii == check_iter_val--);
|
||||
}
|
||||
++tests_run;
|
||||
}
|
||||
@@ -182,7 +182,7 @@ void access(Array& A, const const_array_tag&) {
|
||||
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int, char*[])
|
||||
{
|
||||
return run_generative_tests();
|
||||
}
|
||||
|
||||
@@ -15,100 +15,91 @@
|
||||
//
|
||||
|
||||
|
||||
#include <boost/multi_array/index_range.hpp>
|
||||
#include "boost/multi_array/index_range.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include <cstddef>
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
typedef boost::detail::multi_array::index_range<int,std::size_t> range;
|
||||
|
||||
{
|
||||
// typical range creation and extraction
|
||||
range r1(-3,5);
|
||||
BOOST_TEST(r1.start() == -3);
|
||||
BOOST_TEST(r1.finish() == 5);
|
||||
BOOST_TEST(r1.stride() == 1);
|
||||
BOOST_TEST(r1.size(0) == 8);
|
||||
BOOST_TEST(!r1.is_degenerate());
|
||||
BOOST_TEST(r1.get_start(0) == -3);
|
||||
BOOST_TEST(r1.get_finish(100) == 5);
|
||||
BOOST_CHECK(r1.start() == -3);
|
||||
BOOST_CHECK(r1.finish() == 5);
|
||||
BOOST_CHECK(r1.stride() == 1);
|
||||
BOOST_CHECK(!r1.is_degenerate());
|
||||
BOOST_CHECK(r1.get_start(0) == -3);
|
||||
BOOST_CHECK(r1.get_finish(100) == 5);
|
||||
}
|
||||
|
||||
{
|
||||
range r2(-3,5,2);
|
||||
BOOST_TEST(r2.start() == -3);
|
||||
BOOST_TEST(r2.finish() == 5);
|
||||
BOOST_TEST(r2.stride() == 2);
|
||||
BOOST_TEST(r2.size(0) == 4);
|
||||
BOOST_TEST(!r2.is_degenerate());
|
||||
BOOST_CHECK(r2.start() == -3);
|
||||
BOOST_CHECK(r2.finish() == 5);
|
||||
BOOST_CHECK(r2.stride() == 2);
|
||||
BOOST_CHECK(!r2.is_degenerate());
|
||||
}
|
||||
|
||||
{
|
||||
// degenerate creation
|
||||
range r3(5);
|
||||
BOOST_TEST(r3.start() == 5);
|
||||
BOOST_TEST(r3.finish() == 6);
|
||||
BOOST_TEST(r3.stride() == 1);
|
||||
BOOST_TEST(r3.size(0) == 1);
|
||||
BOOST_TEST(r3.is_degenerate());
|
||||
BOOST_CHECK(r3.start() == 5);
|
||||
BOOST_CHECK(r3.finish() == 6);
|
||||
BOOST_CHECK(r3.stride() == 1);
|
||||
BOOST_CHECK(r3.is_degenerate());
|
||||
}
|
||||
|
||||
{
|
||||
// default range creation
|
||||
range r4;
|
||||
BOOST_TEST(r4.get_start(0) == 0);
|
||||
BOOST_TEST(r4.get_finish(100) == 100);
|
||||
BOOST_TEST(r4.stride() == 1);
|
||||
BOOST_TEST(r4.size(0) == 0);
|
||||
BOOST_CHECK(r4.get_start(0) == 0);
|
||||
BOOST_CHECK(r4.get_finish(100) == 100);
|
||||
BOOST_CHECK(r4.stride() == 1);
|
||||
}
|
||||
|
||||
{
|
||||
// create a range using the setter methods
|
||||
range r5 = range().stride(2).start(-3).finish(7);
|
||||
BOOST_TEST(r5.start() == -3);
|
||||
BOOST_TEST(r5.stride() == 2);
|
||||
BOOST_TEST(r5.finish() == 7);
|
||||
BOOST_TEST(r5.size(0) == 5);
|
||||
BOOST_CHECK(r5.start() == -3);
|
||||
BOOST_CHECK(r5.stride() == 2);
|
||||
BOOST_CHECK(r5.finish() == 7);
|
||||
}
|
||||
|
||||
// try out all the comparison operators
|
||||
{
|
||||
range r6 = -3 <= range().stride(2) < 7;
|
||||
BOOST_TEST(r6.start() == -3);
|
||||
BOOST_TEST(r6.stride() == 2);
|
||||
BOOST_TEST(r6.finish() == 7);
|
||||
BOOST_TEST(r6.size(0) == 5);
|
||||
BOOST_CHECK(r6.start() == -3);
|
||||
BOOST_CHECK(r6.stride() == 2);
|
||||
BOOST_CHECK(r6.finish() == 7);
|
||||
}
|
||||
|
||||
{
|
||||
range r7 = -3 < range() <= 7;
|
||||
BOOST_TEST(r7.start() == -2);
|
||||
BOOST_TEST(r7.stride() == 1);
|
||||
BOOST_TEST(r7.finish() == 8);
|
||||
BOOST_TEST(r7.size(0) == 10);
|
||||
BOOST_CHECK(r7.start() == -2);
|
||||
BOOST_CHECK(r7.stride() == 1);
|
||||
BOOST_CHECK(r7.finish() == 8);
|
||||
}
|
||||
|
||||
// arithmetic operators
|
||||
{
|
||||
range r8 = range(0,5) + 2;
|
||||
BOOST_TEST(r8.start() == 2);
|
||||
BOOST_TEST(r8.stride() == 1);
|
||||
BOOST_TEST(r8.finish() == 7);
|
||||
BOOST_TEST(r8.size(0) == 5);
|
||||
BOOST_CHECK(r8.start() == 2);
|
||||
BOOST_CHECK(r8.stride() == 1);
|
||||
BOOST_CHECK(r8.finish() == 7);
|
||||
}
|
||||
|
||||
{
|
||||
range r9 = range(0,5) - 2;
|
||||
BOOST_TEST(r9.start() == -2);
|
||||
BOOST_TEST(r9.stride() == 1);
|
||||
BOOST_TEST(r9.finish() == 3);
|
||||
BOOST_TEST(r9.size(0) == 5);
|
||||
BOOST_CHECK(r9.start() == -2);
|
||||
BOOST_CHECK(r9.stride() == 1);
|
||||
BOOST_CHECK(r9.finish() == 3);
|
||||
}
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -14,15 +14,15 @@
|
||||
// reshape.cpp - testing reshaping functionality
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/type.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/type.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
typedef boost::multi_array<int,ndims> array;
|
||||
@@ -52,9 +52,9 @@ main()
|
||||
for (array::index i = 0; i != 4; ++i)
|
||||
for (array::index j = 0; j != 3; ++j)
|
||||
for (array::index k = 0; k != 2; ++k) {
|
||||
BOOST_TEST(A[i][j][k] == *ptr);
|
||||
BOOST_TEST(B[i][j][k] == *ptr);
|
||||
BOOST_TEST(C[i][j][k] == *ptr++);
|
||||
BOOST_CHECK(A[i][j][k] == *ptr);
|
||||
BOOST_CHECK(B[i][j][k] == *ptr);
|
||||
BOOST_CHECK(C[i][j][k] == *ptr++);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,13 +80,13 @@ main()
|
||||
for (array::index i = 0; i != 4; ++i)
|
||||
for (array::index j = 1; j != 4; ++j)
|
||||
for (array::index k = -1; k != 1; ++k) {
|
||||
BOOST_TEST(A[i][j][k] == *ptr);
|
||||
BOOST_TEST(B[i][j][k] == *ptr);
|
||||
BOOST_TEST(C[i][j][k] == *ptr++);
|
||||
BOOST_CHECK(A[i][j][k] == *ptr);
|
||||
BOOST_CHECK(B[i][j][k] == *ptr);
|
||||
BOOST_CHECK(C[i][j][k] == *ptr++);
|
||||
}
|
||||
}
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
// resize.cpp - Test of resizing multi_arrays
|
||||
//
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
#include "boost/multi_array.hpp"
|
||||
#include <iostream>
|
||||
using namespace std;
|
||||
|
||||
|
||||
int main() {
|
||||
int test_main(int,char*[]) {
|
||||
|
||||
typedef boost::multi_array<int,3> marray;
|
||||
|
||||
@@ -58,7 +58,7 @@ int main() {
|
||||
marray A(boost::extents[2][3][4]);
|
||||
A.assign(A_data,A_data+(2*3*4));
|
||||
A.resize(boost::extents[4][3][2]);
|
||||
BOOST_TEST(std::equal(A_resize,A_resize+(4*3*2),A.data()));
|
||||
BOOST_CHECK(std::equal(A_resize,A_resize+(4*3*2),A.data()));
|
||||
}
|
||||
|
||||
// resize through the Collection
|
||||
@@ -67,14 +67,14 @@ int main() {
|
||||
A.assign(A_data,A_data+(2*3*4));
|
||||
boost::array<int,3> new_extents = {{4,3,2}};
|
||||
A.resize(new_extents);
|
||||
BOOST_TEST(std::equal(A_resize,A_resize+(4*3*2),A.data()));
|
||||
BOOST_CHECK(std::equal(A_resize,A_resize+(4*3*2),A.data()));
|
||||
}
|
||||
|
||||
// default construct all the new elements (in this case, all elements)
|
||||
{
|
||||
marray defaultA;
|
||||
defaultA.resize(boost::extents[2][3][4]);
|
||||
BOOST_TEST(std::accumulate(defaultA.data(),
|
||||
BOOST_CHECK(std::accumulate(defaultA.data(),
|
||||
defaultA.data()+(2*3*4),0) == 0);
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ int main() {
|
||||
for (int x = 0; x < 3; x++) {
|
||||
for (int y = 0; y < 4; y++) {
|
||||
for (int z = 0; z < 2; z++) {
|
||||
BOOST_TEST(*(A.data() + check) == check);
|
||||
BOOST_CHECK(*(A.data() + check) == check);
|
||||
++check;
|
||||
}
|
||||
}
|
||||
@@ -123,5 +123,5 @@ int main() {
|
||||
}
|
||||
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
// reverse_view.cpp - a small test of creating a view with negative strides
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
#include "boost/test/minimal.hpp"
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
using namespace boost;
|
||||
|
||||
@@ -36,8 +36,8 @@ main()
|
||||
array::array_view<1>::type B = A[indices[range(3, -1, -1)]];
|
||||
|
||||
for(multi_array_types::size_type i = 0; i != B.size(); ++i) {
|
||||
BOOST_TEST(B[i] == rdata[i]);
|
||||
BOOST_CHECK(B[i] == rdata[i]);
|
||||
}
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
//
|
||||
|
||||
#include "generative_tests.hpp"
|
||||
#include <boost/array.hpp>
|
||||
#include <boost/mpl/if.hpp>
|
||||
#include <boost/type_traits/is_same.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include "boost/mpl/if.hpp"
|
||||
#include "boost/type_traits/is_same.hpp"
|
||||
|
||||
template <typename Array>
|
||||
struct view_traits_mutable {
|
||||
@@ -71,10 +71,10 @@ void test_views(Array& A, const ViewTraits&) {
|
||||
for (index i = 0; i != 2; ++i)
|
||||
for (index j = 0; j != 2; ++j)
|
||||
for (index k = 0; k != 2; ++k) {
|
||||
BOOST_TEST(B[i][j][k] == A[idx0+i][idx1+j+1][idx2+k*2]);
|
||||
BOOST_CHECK(B[i][j][k] == A[idx0+i][idx1+j+1][idx2+k*2]);
|
||||
boost::array<index,3> elmts;
|
||||
elmts[0]=i; elmts[1]=j; elmts[2]=k;
|
||||
BOOST_TEST(B(elmts) == A[idx0+i][idx1+j+1][idx2+k*2]);
|
||||
BOOST_CHECK(B(elmts) == A[idx0+i][idx1+j+1][idx2+k*2]);
|
||||
}
|
||||
}
|
||||
// Degenerate dimensions
|
||||
@@ -84,10 +84,10 @@ void test_views(Array& A, const ViewTraits&) {
|
||||
|
||||
for (index i = 0; i != 2; ++i)
|
||||
for (index j = 0; j != 2; ++j) {
|
||||
BOOST_TEST(B[i][j] == A[idx0+i][idx1+1][idx2+j*2]);
|
||||
BOOST_CHECK(B[i][j] == A[idx0+i][idx1+1][idx2+j*2]);
|
||||
boost::array<index,2> elmts;
|
||||
elmts[0]=i; elmts[1]=j;
|
||||
BOOST_TEST(B(elmts) == A[idx0+i][idx1+1][idx2+j*2]);
|
||||
BOOST_CHECK(B(elmts) == A[idx0+i][idx1+1][idx2+j*2]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,10 +105,10 @@ void test_views(Array& A, const ViewTraits&) {
|
||||
for (index i = 0; i != 2; ++i)
|
||||
for (index j = 0; j != 2; ++j)
|
||||
for (index k = 0; k != 2; ++k) {
|
||||
BOOST_TEST(B[i][j][k] == A[idx0+i][idx1+j][idx2+2-k]);
|
||||
BOOST_CHECK(B[i][j][k] == A[idx0+i][idx1+j][idx2+2-k]);
|
||||
boost::array<index,3> elmts;
|
||||
elmts[0]=i; elmts[1]=j; elmts[2]=k;
|
||||
BOOST_TEST(B(elmts) == A[idx0+i][idx1+j][idx2+2-k]);
|
||||
BOOST_CHECK(B(elmts) == A[idx0+i][idx1+j][idx2+2-k]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,6 +141,6 @@ void access(Array& A, const const_array_tag&) {
|
||||
}
|
||||
|
||||
|
||||
int main() {
|
||||
int test_main(int,char*[]) {
|
||||
return run_generative_tests();
|
||||
}
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
// stl_interaction.cpp - Make sure multi_arrays work with STL containers.
|
||||
//
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int, char*[])
|
||||
{
|
||||
using boost::extents;
|
||||
using boost::indices;
|
||||
@@ -51,7 +51,7 @@ main()
|
||||
myarray.assign(data,data+data_size);
|
||||
|
||||
array3vec myvec(5,myarray);
|
||||
BOOST_TEST(myarray == myvec[1]);
|
||||
BOOST_CHECK(myarray == myvec[1]);
|
||||
|
||||
array3::array_view<2>::type myview =
|
||||
myarray[indices[1][range(0,2)][range(1,3)]];
|
||||
@@ -65,8 +65,8 @@ main()
|
||||
|
||||
myvec.push_back(myarray);
|
||||
|
||||
BOOST_TEST(myarray != myvec[1]);
|
||||
BOOST_TEST(myarray == myvec[5]);
|
||||
BOOST_CHECK(myarray != myvec[1]);
|
||||
BOOST_CHECK(myarray == myvec[5]);
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
// storage_order.cpp - testing storage_order-isms.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
const int ndims=3;
|
||||
|
||||
@@ -67,7 +67,7 @@ main()
|
||||
for (array::index i = 0; i != 2; ++i)
|
||||
for (array::index j = 0; j != 3; ++j)
|
||||
for (array::index k = 0; k != 4; ++k)
|
||||
BOOST_TEST(A[i][j][k] == *num++);
|
||||
BOOST_CHECK(A[i][j][k] == *num++);
|
||||
}
|
||||
|
||||
// Mimic fortran_storage_order using
|
||||
@@ -88,7 +88,7 @@ main()
|
||||
for (array::index i = 0; i != 2; ++i)
|
||||
for (array::index j = 0; j != 3; ++j)
|
||||
for (array::index k = 0; k != 4; ++k)
|
||||
BOOST_TEST(A[i][j][k] == *num++);
|
||||
BOOST_CHECK(A[i][j][k] == *num++);
|
||||
}
|
||||
|
||||
// general_storage_order with arbitrary storage order
|
||||
@@ -119,7 +119,7 @@ main()
|
||||
for (array::index i = 0; i != 2; ++i)
|
||||
for (array::index j = 0; j != 3; ++j)
|
||||
for (array::index k = 0; k != 4; ++k)
|
||||
BOOST_TEST(A[i][j][k] == *num++);
|
||||
BOOST_CHECK(A[i][j][k] == *num++);
|
||||
}
|
||||
|
||||
|
||||
@@ -152,8 +152,8 @@ main()
|
||||
for (array::index i = 0; i != 2; ++i)
|
||||
for (array::index j = 0; j != 3; ++j)
|
||||
for (array::index k = 0; k != 4; ++k)
|
||||
BOOST_TEST(A[i][j][k] == *num++);
|
||||
BOOST_CHECK(A[i][j][k] == *num++);
|
||||
}
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
// test out my new storage_order stuff
|
||||
//
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/multi_array/storage_order.hpp>
|
||||
#include "boost/multi_array/storage_order.hpp"
|
||||
|
||||
int
|
||||
main() {
|
||||
test_main(int,char*[]) {
|
||||
|
||||
using namespace boost;
|
||||
|
||||
@@ -31,9 +31,9 @@ main() {
|
||||
general_storage_order<5> fortran_storage(fortran_ordering.begin(),
|
||||
ascending.begin());
|
||||
|
||||
BOOST_TEST(c_storage == (general_storage_order<5>) c_storage_order());
|
||||
BOOST_TEST(fortran_storage ==
|
||||
BOOST_CHECK(c_storage == (general_storage_order<5>) c_storage_order());
|
||||
BOOST_CHECK(fortran_storage ==
|
||||
(general_storage_order<5>) fortran_storage_order());
|
||||
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
@@ -14,15 +14,15 @@
|
||||
// index_bases - test of the index_base modifying facilities.
|
||||
//
|
||||
|
||||
#include <boost/multi_array.hpp>
|
||||
#include "boost/multi_array.hpp"
|
||||
|
||||
#include <boost/core/lightweight_test.hpp>
|
||||
#include "boost/test/minimal.hpp"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include "boost/array.hpp"
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
int
|
||||
main()
|
||||
test_main(int,char*[])
|
||||
{
|
||||
typedef boost::multi_array<double, 3> array;
|
||||
typedef array::array_view<3>::type array_view;
|
||||
@@ -40,5 +40,5 @@ main()
|
||||
array_view E = A[indices[irange(1,2)][irange(1,2)][irange(1,2)]];
|
||||
|
||||
}
|
||||
return boost::report_errors();
|
||||
return boost::exit_success;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user