Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Simon Perkins
ducc
Commits
74a2b455
Commit
74a2b455
authored
Apr 16, 2020
by
Martin Reinecke
Browse files
temporary test
parent
a9a85d97
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/mr_util/infra/mav.h
View file @
74a2b455
...
...
@@ -27,7 +27,7 @@
#include
<vector>
#include
<memory>
#include
"mr_util/infra/error_handling.h"
#define _MSC_VER
namespace
mr
{
namespace
detail_mav
{
...
...
@@ -113,8 +113,15 @@ template<typename T> class membuf
:
ptr
(
make_unique
<
vector
<
T
>>
(
sz
)),
d
(
ptr
->
data
()),
rw
(
true
)
{}
membuf
(
const
membuf
&
other
)
:
ptr
(
other
.
ptr
),
d
(
other
.
d
),
rw
(
false
)
{}
#if defined(_MSC_VER)
// membuf(membuf &other)
// : ptr(other.ptr), d(other.d), rw(other.rw) {}
// membuf(membuf &&other)
// : ptr(other.ptr), d(other.d), rw(other.rw) {}
#else
membuf
(
membuf
&
other
)
=
default
;
membuf
(
membuf
&&
other
)
=
default
;
#endif
template
<
typename
I
>
T
&
vraw
(
I
i
)
{
...
...
@@ -151,9 +158,12 @@ template<typename T> class fmav: public fmav_info, public membuf<T>
:
fmav_info
(
info
),
membuf
<
T
>
(
d_
,
rw_
)
{}
fmav
(
const
T
*
d_
,
const
fmav_info
&
info
)
:
fmav_info
(
info
),
membuf
<
T
>
(
d_
)
{}
#if defined(_MSC_VER)
#else
fmav
(
const
fmav
&
other
)
=
default
;
fmav
(
fmav
&
other
)
=
default
;
fmav
(
fmav
&&
other
)
=
default
;
#endif
fmav
(
membuf
<
T
>
&
buf
,
const
shape_t
&
shp_
,
const
stride_t
&
str_
)
:
fmav_info
(
shp_
,
str_
),
membuf
<
T
>
(
buf
)
{}
fmav
(
const
membuf
<
T
>
&
buf
,
const
shape_t
&
shp_
,
const
stride_t
&
str_
)
...
...
@@ -318,9 +328,12 @@ template<typename T, size_t ndim> class mav: public mav_info<ndim>, public membu
:
mav_info
<
ndim
>
(
shp_
),
membuf
<
T
>
(
d_
,
rw_
)
{}
mav
(
const
array
<
size_t
,
ndim
>
&
shp_
)
:
mav_info
<
ndim
>
(
shp_
),
membuf
<
T
>
(
size
())
{}
#if defined(_MSC_VER)
#else
mav
(
const
mav
&
other
)
=
default
;
mav
(
mav
&
other
)
=
default
;
mav
(
mav
&&
other
)
=
default
;
#endif
mav
(
const
shape_t
&
shp_
,
const
stride_t
&
str_
,
const
T
*
d_
,
membuf
<
T
>
&
mb
)
:
mav_info
<
ndim
>
(
shp_
,
str_
),
membuf
<
T
>
(
d_
,
mb
)
{}
mav
(
const
shape_t
&
shp_
,
const
stride_t
&
str_
,
const
T
*
d_
,
const
membuf
<
T
>
&
mb
)
...
...
src/mr_util/sharp/sharp.cc
View file @
74a2b455
...
...
@@ -26,6 +26,7 @@
*/
#include
<cmath>
#include
<algorithm>
#include
<atomic>
#include
<memory>
#include
"mr_util/math/math_utils.h"
...
...
src/mr_util/sharp/sharp_geomhelpers.cc
View file @
74a2b455
...
...
@@ -25,6 +25,7 @@
* \author Martin Reinecke
*/
#include
<algorithm>
#include
<cmath>
#include
<vector>
#include
"mr_util/sharp/sharp_geomhelpers.h"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment