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

various fixes regarding extending ranges/arrays + hdf5

Browse source
This commit is contained in:
Christian Zimmermann 2023-01-18 18:57:17 +01:00
parent e6da712482
commit 835b8e885f
7 changed files with 70 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/include/array/marray.cc.h
View file

@ -36,6 +36,9 @@ namespace CNORXZ
template <typename T>
MArray<T>& MArray<T>::extend(const RangePtr& range)
{
if(AB::mRange == nullptr) {
return this->init(range);
}
MArray<T> tmp(AB::mRange->extend(range));
auto ei = this->end();
auto ti = tmp.begin();

12
src/include/ranges/yrange.h
View file

@ -12,12 +12,12 @@
namespace CNORXZ
{
class YIndex : public IndexInterface<YIndex,DType>
class YIndex : public IndexInterface<YIndex,Vector<DType>>
{
public:
typedef IndexInterface<YIndex,DType> IB;
typedef IndexInterface<YIndex,Vector<DType>> IB;
typedef YRange RangeType;
typedef DType MetaType;
typedef Vector<DType> MetaType;
YIndex() = default;
YIndex(YIndex&& i) = default;
@ -44,15 +44,15 @@ namespace CNORXZ
UPos lmax() const;
IndexId<0> id() const;
DType operator*() const;
Vector<DType> operator*() const;
SizeT dim() const;
Sptr<YRange> range() const;
UPos stepSize(const IndexId<0> id) const;
String stringMeta() const;
DType meta() const;
YIndex& at(const DType& meta);
Vector<DType> meta() const;
YIndex& at(const Vector<DType>& meta);
DXpr<SizeT> ifor(const DXpr<SizeT>& xpr, std::function<SizeT(SizeT,SizeT)>&& f) const;

36
src/lib/ranges/yrange.cc
View file

@ -125,7 +125,7 @@ namespace CNORXZ
***************/
YIndex::YIndex(const YIndex& i) :
IndexInterface<YIndex,DType>(i),
IndexInterface<YIndex,Vector<DType>>(i),
mRange(rangeCast<YRange>(i.range())),
mIs(mkIndices()),
mFormat(mkFormat()),
@ -138,7 +138,7 @@ namespace CNORXZ
YIndex& YIndex::operator=(const YIndex& i)
{
IndexInterface<YIndex,DType>::operator=(i);
IndexInterface<YIndex,Vector<DType>>::operator=(i);
mRange = rangeCast<YRange>(i.range());
mIs = mkIndices();
mFormat = mkFormat();
@ -149,7 +149,7 @@ namespace CNORXZ
}
YIndex::YIndex(const Vector<XIndexPtr>& is) :
IndexInterface<YIndex,DType>(0),
IndexInterface<YIndex,Vector<DType>>(0),
mRange(std::dynamic_pointer_cast<YRange>(yrange(mkRangeVec(is)))),
mIs(is),
mFormat(mkFormat()),
@ -161,7 +161,7 @@ namespace CNORXZ
}
YIndex::YIndex(const YFormat& bs, const Vector<XIndexPtr>& is) :
IndexInterface<YIndex,DType>(0),
IndexInterface<YIndex,Vector<DType>>(0),
mRange(std::dynamic_pointer_cast<YRange>(yrange(mkRangeVec(is)))),
mIs(is),
mFormat(bs),
@ -173,7 +173,7 @@ namespace CNORXZ
}
YIndex::YIndex(const RangePtr& range, SizeT lexpos) :
IndexInterface<YIndex,DType>(0),
IndexInterface<YIndex,Vector<DType>>(0),
mRange(rangeCast<YRange>(range)),
mIs(mkIndices()),
mFormat(mkFormat()),
@ -185,7 +185,7 @@ namespace CNORXZ
}
YIndex::YIndex(const RangePtr& range, const YFormat& bs, SizeT lexpos) :
IndexInterface<YIndex,DType>(0),
IndexInterface<YIndex,Vector<DType>>(0),
mRange(rangeCast<YRange>(range)),
mIs(mkIndices()),
mFormat(bs),
@ -282,7 +282,7 @@ namespace CNORXZ
return IndexId<0>(this->ptrId());
}
DType YIndex::operator*() const
Vector<DType> YIndex::operator*() const
{
return meta();
}
@ -319,21 +319,20 @@ namespace CNORXZ
elim;
}
DType YIndex::meta() const
Vector<DType> YIndex::meta() const
{
Vector<DType> v(mIs.size());
std::transform(mIs.all().begin(), mIs.all().end(), v.begin(),
[](const auto& x) { return x->meta(); });
return DType(v);
return v;
}
YIndex& YIndex::at(const DType& meta)
YIndex& YIndex::at(const Vector<DType>& meta)
{
auto& v = std::any_cast<const Vector<DType>&>(meta.get());
assert(v.size() == mIs.size());
assert(meta.size() == mIs.size());
IB::mPos = 0;
for(SizeT i = 0; i != mIs.size(); ++i){
mIs[i]->at(v[i]);
mIs[i]->at(meta[i]);
IB::mPos += mIs[i]->pos() * mFormat[i].val();
}
return *this;
@ -481,7 +480,7 @@ namespace CNORXZ
const TypeInfo& YRange::metaType() const
{
return typeid(DType);
return typeid(Vector<DType>);
}
RangePtr YRange::extend(const RangePtr& r) const
@ -489,8 +488,13 @@ namespace CNORXZ
CXZ_ASSERT(r->dim() == this->dim(), "cannot extend range of dimension "
<< this->dim() << " by range of dimension " << r->dim());
Vector<RangePtr> rvec(this->dim());
for(SizeT i = 0; i != this->dim(); ++i){
rvec[i] = mRVec[i]->extend( r->sub(i) );
if(this->dim() == 1 and r->sub(0) == nullptr){
rvec[0] = mRVec[0]->extend( r );
}
else {
for(SizeT i = 0; i != this->dim(); ++i){
rvec[i] = mRVec[i]->extend( r->sub(i) );
}
}
return YRangeFactory( rvec ).create();
}

1
src/opt/hdf5/lib/h5_file.cc
View file

@ -70,6 +70,7 @@ namespace CNORXZ
if(mId != 0){
H5Fclose(mId);
}
mId = 0;
return *this;
}

23
src/opt/hdf5/lib/h5_group.cc
View file

@ -51,6 +51,7 @@ namespace CNORXZ
if(mId != 0){
H5Gclose(mId);
}
mId = 0;
return *this;
}
@ -80,6 +81,28 @@ namespace CNORXZ
return mCont;
}
Group& Group::addGroup(const String& name)
{
CXZ_ASSERT(this->isOpen(), "tried to extend closed group");
Vector<String> nvec({name});
Vector<DType> dvec({DType(name)});
auto extr = URangeFactory<String>( nvec ).create();
mCont.extend(extr);
auto ii = mCont.begin();
ii.at(dvec); // 'at' returns YIndex&, so cannot use it inline...
*ii = std::make_shared<Group>(name, this);
(*ii)->open(); // create new group
return *this;
}
template <typename T>
Group& Group::addData(const String& name, const ArrayBase<T>& data)
{
CXZ_ASSERT(this->isOpen(), "tried to extend closed group");
CXZ_ERROR(name << data.size() << " NOT IMPLEMENTED!!!");
return *this;
}
struct InitContData
{
const ContentBase* parent;

27
src/opt/hdf5/tests/h5_basic_unit_test.cc
View file

@ -37,7 +37,6 @@ namespace
Group_Test()
{
mFileName = "test_file.h5";
std::remove(mFileName.c_str());
mGrps = { "gr1", "gr2" };
}
@ -47,35 +46,35 @@ namespace
TEST_F(NoFile_Test, NoFile)
{
auto l = [&](){ return std::make_shared<File>(mNoFileName, true); };
EXPECT_THROW(l(), std::runtime_error);
File f(mNoFileName, true);
EXPECT_THROW(f.open(), std::runtime_error);
}
TEST_F(NoFile_Test, NoH5Format)
{
auto l1 = [&](){ return std::make_shared<File>(mWrongFileName, true); };
auto l2 = [&](){ return std::make_shared<File>(mWrongFileName, false); };
EXPECT_THROW(l1(), std::runtime_error);
EXPECT_THROW(l2(), std::runtime_error);
File f1(mWrongFileName, true);
File f2(mWrongFileName, false);
EXPECT_THROW(f1.open(), std::runtime_error);
EXPECT_THROW(f2.open(), std::runtime_error);
}
TEST_F(Group_Test, Create)
{
std::remove(mFileName.c_str());
File h5f(mFileName, false);
EXPECT_FALSE(h5f.ro());
//h5f.append("gr1");
auto grange = URangeFactory<String>( mGrps ).create();
h5f.set( grange );
for(auto i = grange->begin(); i != grange->end(); ++i){
(*h5f.get())[i] = std::make_shared<Group>( i.meta().str(), &h5f );
}
h5f.open();
h5f.addGroup("gr1");
h5f.addGroup("gr2");
EXPECT_EQ(h5f.get().size(), 2u);
}
TEST_F(Group_Test, Read)
{
File h5f(mFileName, true);
h5f.open();
EXPECT_TRUE(h5f.ro());
EXPECT_EQ(h5f.get().size(), 2u);
}
}

8
src/tests/range_unit_test.cc
View file

@ -342,7 +342,7 @@ namespace
auto a = yi + i;
EXPECT_EQ(a.lex(), i);
EXPECT_EQ(a.pos(), i);
auto mmi = DType(mkm(i));
auto mmi = mkm(i);
EXPECT_TRUE(a.meta() == mmi);
EXPECT_TRUE(*a == mmi);
EXPECT_EQ(a.stringMeta(), toString(mmi));
@ -350,7 +350,7 @@ namespace
for(SizeT j = 0; j != yr->size(); ++j){
const Int jj = static_cast<Int>(j) - static_cast<Int>(i);
auto b = a + jj;
auto mmj = DType(mkm(j));
auto mmj = mkm(j);
EXPECT_EQ(b.lex(), j);
EXPECT_EQ(b.pos(), j);
EXPECT_TRUE(*b == mmj);
@ -386,7 +386,7 @@ namespace
auto a = yi + i;
EXPECT_EQ(a.lex(), i);
EXPECT_EQ(a.pos(), i);
auto mmi = DType(mkm(i));
auto mmi = mkm(i);
EXPECT_TRUE(a.meta() == mmi);
EXPECT_TRUE(*a == mmi);
EXPECT_EQ(a.stringMeta(), toString(mmi));
@ -394,7 +394,7 @@ namespace
for(SizeT j = 0; j != yr2->size(); ++j){
const Int jj = static_cast<Int>(j) - static_cast<Int>(i);
auto b = a + jj;
auto mmj = DType(mkm(j));
auto mmj = mkm(j);
EXPECT_EQ(b.lex(), j);
EXPECT_EQ(b.pos(), j);
EXPECT_TRUE(*b == mmj);