chizeta/cnorxz
chizeta/cnorxz
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some fixes...

Browse source
This commit is contained in:
Christian Zimmermann 2019-03-11 19:24:34 +01:00
parent 8f25e0aeb0
commit f47ca055db
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/include/helper_tools.cc.h
View file

@ -215,17 +215,17 @@ namespace MultiArrayTools
template <class Range> template <class Range>
auto metaSlice(const std::shared_ptr<Range>& r) auto metaSlice(const std::shared_ptr<Range>& r)
-> ConstSlice<typename Range::value_type,ClassicRange> -> ConstSlice<typename Range::MetaType,ClassicRange>
{ {
ClassicRF crf(r->size()); ClassicRF crf(r->size());
return ConstSlice<typename Range::value_type,ClassicRange>( createExplicit(crf), &r->get(0) ); return ConstSlice<typename Range::MetaType,ClassicRange>( createExplicit(crf), &r->get(0) );
} }
template <class Range, class ORange> template <class Range, class ORange>
auto metaSlice(const std::shared_ptr<Range>& r, const std::shared_ptr<ORange>& ro) auto metaSlice(const std::shared_ptr<Range>& r, const std::shared_ptr<ORange>& ro)
-> ConstSlice<typename Range::value_type,ORange> -> ConstSlice<typename Range::MetaType,ORange>
{ {
return ConstSlice<typename Range::value_type,ORange>( ro, &r->get(0) ); return ConstSlice<typename Range::MetaType,ORange>( ro, &r->get(0) );
} }

4
src/include/helper_tools.h
View file

@ -97,11 +97,11 @@ namespace MultiArrayTools
template <class Range> template <class Range>
auto metaSlice(const std::shared_ptr<Range>& r) auto metaSlice(const std::shared_ptr<Range>& r)
-> ConstSlice<typename Range::value_type,ClassicRange>; -> ConstSlice<typename Range::MetaType,ClassicRange>;
template <class Range, class ORange> template <class Range, class ORange>
auto metaSlice(const std::shared_ptr<Range>& r, const std::shared_ptr<ORange>& ro) auto metaSlice(const std::shared_ptr<Range>& r, const std::shared_ptr<ORange>& ro)
-> ConstSlice<typename Range::value_type,ORange>; -> ConstSlice<typename Range::MetaType,ORange>;
template <class IndexType> template <class IndexType>
inline void For(const std::shared_ptr<IndexType>& ind, const std::function<void(void)>& ll) inline void For(const std::shared_ptr<IndexType>& ind, const std::function<void(void)>& ll)

4
src/include/map_range.cc.h
View file

@ -563,10 +563,10 @@ namespace MultiArrayTools
} }
template <class MapF, SpaceType XSTYPE, class... Ranges> template <class MapF, SpaceType XSTYPE, class... Ranges>
std::vector<size_t> GenMapRange<MapF,XSTYPE,Ranges...>::mapPos() const vector<size_t> GenMapRange<MapF,XSTYPE,Ranges...>::mapPos() const
{ {
auto i = mMapf.begin(); auto i = mMapf.begin();
std::vector<size_t> out(i.max()); vector<size_t> out(i.max());
for(; i.pos() != i.max(); ++i){ for(; i.pos() != i.max(); ++i){
out[i.pos()] = mOutRange->getMeta( mMapf[i] ); out[i.pos()] = mOutRange->getMeta( mMapf[i] );
} }

2
src/include/map_range.h
View file

@ -269,7 +269,7 @@ namespace MultiArrayTools
const MultiArray<size_t,ORType>& mapMultiplicity() const; const MultiArray<size_t,ORType>& mapMultiplicity() const;
MultiArray<size_t,GenMapRange> explMapMultiplicity() const; MultiArray<size_t,GenMapRange> explMapMultiplicity() const;
std::vector<size_t> mapPos() const; vector<size_t> mapPos() const;
/* /*
template <class... ERanges> template <class... ERanges>