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

implement operator+= ...

Browse source
This commit is contained in:
Christian Zimmermann 2017-03-08 22:53:18 +01:00
parent a6c860a352
commit 63eb7d0505
5 changed files with 93 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/index_base.cc
View file

@ -1,4 +1,4 @@
// -*- C++ -*-
#include "index_base.h" #include "index_base.h"
namespace MultiArrayTools namespace MultiArrayTools
@ -9,7 +9,7 @@ namespace MultiArrayTools
IndefinitIndexBase::~IndefinitIndexBase() IndefinitIndexBase::~IndefinitIndexBase()
{ {
freeLinked(); //freeLinked();
mLinked = nullptr; mLinked = nullptr;
mMajor = nullptr; mMajor = nullptr;
mSoftLinked = nullptr; mSoftLinked = nullptr;

2
src/index_base.h
View file

@ -44,7 +44,7 @@ namespace MultiArrayTools
virtual bool linked() const; virtual bool linked() const;
virtual void linkTo(IndefinitIndexBase* target) = 0; virtual void linkTo(IndefinitIndexBase* target) = 0;
virtual IndefinitIndexBase* getLinked(const std::string& name) = 0; //virtual IndefinitIndexBase* getLinked(const std::string& name) = 0;
virtual void setPos(size_t pos); virtual void setPos(size_t pos);

38
src/multi_array_operation.cc
View file

@ -155,6 +155,44 @@ namespace MultiArrayTools
return operator()(std::divides<T>(), sec); return operator()(std::divides<T>(), sec);
} }
template <typename T, class Range>
MultiArrayOperationRoot<T,Range> MultiArrayOperationRoot<T,Range>::copyThis()
{
return MultiArrayOperationRoot<T,Range>(mArrayRef, mNm);
}
template <typename T, class Range>
template <class MAOp>
MultiArrayOperationRoot<T,Range>&
MultiArrayOperationRoot<T,Range>::operator+=(const MAOp& sec)
{
return (*this) = copyThis() + sec;
}
template <typename T, class Range>
template <class MAOp>
MultiArrayOperationRoot<T,Range>&
MultiArrayOperationRoot<T,Range>::operator-=(const MAOp& sec)
{
return (*this) = copyThis() - sec;
}
template <typename T, class Range>
template <class MAOp>
MultiArrayOperationRoot<T,Range>&
MultiArrayOperationRoot<T,Range>::operator*=(const MAOp& sec)
{
return (*this) = copyThis() * sec;
}
template <typename T, class Range>
template <class MAOp>
MultiArrayOperationRoot<T,Range>&
MultiArrayOperationRoot<T,Range>::operator/=(const MAOp& sec)
{
return (*this) = copyThis() / sec;
}
template <typename T, class Range> template <typename T, class Range>
size_t MultiArrayOperationRoot<T,Range>::argNum() const size_t MultiArrayOperationRoot<T,Range>::argNum() const
{ {

14
src/multi_array_operation.h
View file

@ -70,6 +70,20 @@ namespace MultiArrayTools
template <class MAOp> template <class MAOp>
auto operator/(const MAOp& sec) -> decltype(operator()(std::divides<T>(), sec)); auto operator/(const MAOp& sec) -> decltype(operator()(std::divides<T>(), sec));
MultiArrayOperationRoot copyThis();
template <class MAOp>
MultiArrayOperationRoot& operator+=(const MAOp& sec);
template <class MAOp>
MultiArrayOperationRoot& operator-=(const MAOp& sec);
template <class MAOp>
MultiArrayOperationRoot& operator*=(const MAOp& sec);
template <class MAOp>
MultiArrayOperationRoot& operator/=(const MAOp& sec);
virtual size_t argNum() const override; virtual size_t argNum() const override;
// set index -> implement !!!!! // set index -> implement !!!!!

38
src/unit_test.cc
View file

@ -313,6 +313,44 @@ namespace {
EXPECT_EQ(ma3d2[i(i1 = 2, i2 = 3, i3 = 1)], -129); EXPECT_EQ(ma3d2[i(i1 = 2, i2 = 3, i3 = 1)], -129);
} }
TEST_F(OperationTest, CorrectlyAdded2)
{
//MultiArray3dAny ma3d2(r3d);
auto i = ma3d.begin();
auto i1 = i.template getIndex<0>();
auto i2 = i.template getIndex<1>();
auto i3 = i.template getIndex<2>();
ma3d("alpha","beta","gamma") += ma("alpha","beta");
EXPECT_EQ(ma3d[i(i1 = 0, i2 = 0, i3 = 0)], -10);
EXPECT_EQ(ma3d[i(i1 = 0, i2 = 0, i3 = 1)], 1);
EXPECT_EQ(ma3d[i(i1 = 0, i2 = 1, i3 = 0)], 8);
EXPECT_EQ(ma3d[i(i1 = 0, i2 = 1, i3 = 1)], 7);
EXPECT_EQ(ma3d[i(i1 = 0, i2 = 2, i3 = 0)], 11);
EXPECT_EQ(ma3d[i(i1 = 0, i2 = 2, i3 = 1)], 56);
EXPECT_EQ(ma3d[i(i1 = 0, i2 = 3, i3 = 0)], 28);
EXPECT_EQ(ma3d[i(i1 = 0, i2 = 3, i3 = 1)], -6);
EXPECT_EQ(ma3d[i(i1 = 1, i2 = 0, i3 = 0)], -4);
EXPECT_EQ(ma3d[i(i1 = 1, i2 = 0, i3 = 1)], 41);
EXPECT_EQ(ma3d[i(i1 = 1, i2 = 1, i3 = 0)], 144);
EXPECT_EQ(ma3d[i(i1 = 1, i2 = 1, i3 = 1)], -13);
EXPECT_EQ(ma3d[i(i1 = 1, i2 = 2, i3 = 0)], 17);
EXPECT_EQ(ma3d[i(i1 = 1, i2 = 2, i3 = 1)], 43);
EXPECT_EQ(ma3d[i(i1 = 1, i2 = 3, i3 = 0)], -9);
EXPECT_EQ(ma3d[i(i1 = 1, i2 = 3, i3 = 1)], 94);
EXPECT_EQ(ma3d[i(i1 = 2, i2 = 0, i3 = 0)], 26);
EXPECT_EQ(ma3d[i(i1 = 2, i2 = 0, i3 = 1)], -77);
EXPECT_EQ(ma3d[i(i1 = 2, i2 = 1, i3 = 0)], 113);
EXPECT_EQ(ma3d[i(i1 = 2, i2 = 1, i3 = 1)], 10);
EXPECT_EQ(ma3d[i(i1 = 2, i2 = 2, i3 = 0)], 104);
EXPECT_EQ(ma3d[i(i1 = 2, i2 = 2, i3 = 1)], 124);
EXPECT_EQ(ma3d[i(i1 = 2, i2 = 3, i3 = 0)], 28);
EXPECT_EQ(ma3d[i(i1 = 2, i2 = 3, i3 = 1)], -129);
}
TEST_F(OperationTest, CorrectlyAdded_3args) TEST_F(OperationTest, CorrectlyAdded_3args)
{ {
MultiArray3dAny ma3d2(r3d); MultiArray3dAny ma3d2(r3d);