remove expression.*
This commit is contained in:
Christian Zimmermann
parent
ca55bd0702
commit
de21f197c5
5 changed files with 3 additions and 231 deletions
|
|
@ -1,39 +0,0 @@
|
||||||
|
|
||||||
#include "expressions.h"
|
|
||||||
|
|
||||||
namespace MultiArrayTools
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
template <class Expr>
|
|
||||||
inline ExpressionHolder<Expr> Expressions1::ifor(size_t step,
|
|
||||||
ExpressionHolder<Expr> ex) const
|
|
||||||
{
|
|
||||||
return iforx(step, ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Expr>
|
|
||||||
inline ExpressionHolder<Expr> Expressions1::iforh(size_t step,
|
|
||||||
ExpressionHolder<Expr> ex) const
|
|
||||||
{
|
|
||||||
return iforhx(step, ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Expr>
|
|
||||||
inline ExpressionHolder<Expr> Expressions1::ifori(size_t step, Expr ex) const
|
|
||||||
{
|
|
||||||
return iforxi(step, ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Expr>
|
|
||||||
inline ExpressionHolder<Expr> Expressions1::iforhi(size_t step, Expr ex) const
|
|
||||||
{
|
|
||||||
return iforhxi(step, ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class EC, class Index>
|
|
||||||
std::shared_ptr<EC> makeec(const std::shared_ptr<Index>& i)
|
|
||||||
{
|
|
||||||
return std::make_shared<EC>(i);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
} // namespace MultiArrayTools
|
|
||||||
|
|
@ -1,189 +0,0 @@
|
||||||
|
|
||||||
#ifndef __expressions_h__
|
|
||||||
#define __expressions_h__
|
|
||||||
|
|
||||||
#include "ranges/dynamic_range.h"
|
|
||||||
#include "multi_array_base.h"
|
|
||||||
#include "multi_array_operation.h"
|
|
||||||
#include "xfor/xfor.h"
|
|
||||||
|
|
||||||
#define XCOMMAX() ,
|
|
||||||
|
|
||||||
namespace MultiArrayTools
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
//class Expressions1;
|
|
||||||
|
|
||||||
template <class EC>
|
|
||||||
using DDMA = MultiArrayBase<double,DynamicRange<EC>>;
|
|
||||||
|
|
||||||
template <class EC>
|
|
||||||
using DDMMA = MutableMultiArrayBase<double,DynamicRange<EC>>;
|
|
||||||
|
|
||||||
template <class EC, class MA>
|
|
||||||
using oo = decltype(std::declval<MA>()(std::declval<const std::shared_ptr<DynamicIndex<EC>>&>()));
|
|
||||||
|
|
||||||
template <template <class> class OpF, class... oos>
|
|
||||||
using OO = Operation<double,OpF<double>,oos...>;
|
|
||||||
|
|
||||||
template <class EC, template <class> class OpF, class... MAs>
|
|
||||||
using OX = Operation<double,OpF<double>,oo<EC,MAs>...>;
|
|
||||||
|
|
||||||
template <class EC, class Tar, class Second>
|
|
||||||
using AEXT = AssignmentExpr2<double,Tar,Second>;
|
|
||||||
|
|
||||||
template <class EC, class Tar, class Second>
|
|
||||||
using AEXT_P = AssignmentExpr2<double,Tar,Second>;
|
|
||||||
|
|
||||||
template <class EC, class Tar, template <class> class OpF, class... MAs>
|
|
||||||
using AEX = AEXT<EC,Tar,OX<EC,OpF,MAs...>>;
|
|
||||||
|
|
||||||
template <class EC>
|
|
||||||
using AEX_M = AEXT<EC,oo<EC,DDMMA<EC>>,oo<EC,DDMMA<EC>>>;
|
|
||||||
|
|
||||||
template <class EC>
|
|
||||||
using AEX_C = AEXT<EC,oo<EC,DDMMA<EC>>,oo<EC,DDMA<EC>>>;
|
|
||||||
|
|
||||||
template <class EC, template <class> class OpF>
|
|
||||||
using AEX_B_MM = AEX<EC,oo<EC,DDMMA<EC>>,OpF,DDMMA<EC>,DDMMA<EC>>;
|
|
||||||
|
|
||||||
template <class EC, template <class> class OpF>
|
|
||||||
using AEX_B_MC = AEX<EC,oo<EC,DDMMA<EC>>,OpF,DDMMA<EC>,DDMA<EC>>;
|
|
||||||
|
|
||||||
template <class EC, template <class> class OpF>
|
|
||||||
using AEX_B_CM = AEX<EC,oo<EC,DDMMA<EC>>,OpF,DDMA<EC>,DDMMA<EC>>;
|
|
||||||
|
|
||||||
template <class EC, template <class> class OpF>
|
|
||||||
using AEX_B_CC = AEX<EC,oo<EC,DDMMA<EC>>,OpF,DDMA<EC>,DDMA<EC>>;
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
template <class EC>
|
|
||||||
class ECInterface
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
EC& THIS() { return static_cast<EC&>(*this); }
|
|
||||||
const EC& THIS() const { return static_cast<EC const&>(*this); }
|
|
||||||
|
|
||||||
template <class Expr>
|
|
||||||
auto ifor(size_t step, Expr ex) const
|
|
||||||
-> decltype(THIS().ifor(step, ex))
|
|
||||||
{
|
|
||||||
return THIS().ifor(step, ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Expr>
|
|
||||||
auto iforh(size_t step, Expr ex) const
|
|
||||||
-> decltype(THIS().iforh(step, ex))
|
|
||||||
{
|
|
||||||
return THIS().iforh(step, ex);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
template <class EC, class Index>
|
|
||||||
std::shared_ptr<EC> makeec(const std::shared_ptr<Index>& i);
|
|
||||||
|
|
||||||
#define V_IFOR_X(Expr) \
|
|
||||||
virtual MultiArrayTools::ExpressionHolder<Expr> iforx(size_t step, MultiArrayTools::ExpressionHolder<Expr> ex) const = 0; \
|
|
||||||
virtual MultiArrayTools::ExpressionHolder<Expr> iforhx(size_t step, MultiArrayTools::ExpressionHolder<Expr> ex) const = 0; \
|
|
||||||
virtual MultiArrayTools::ExpressionHolder<Expr> iforxi(size_t step, Expr ex) const = 0; \
|
|
||||||
virtual MultiArrayTools::ExpressionHolder<Expr> iforhxi(size_t step, Expr ex) const = 0
|
|
||||||
|
|
||||||
#define V_IFOR_A(EC,OpF) \
|
|
||||||
V_IFOR_X(AEX_B_MM<EC XCOMMAX() OpF>); \
|
|
||||||
V_IFOR_X(AEX_B_MC<EC XCOMMAX() OpF>); \
|
|
||||||
V_IFOR_X(AEX_B_CM<EC XCOMMAX() OpF>); \
|
|
||||||
V_IFOR_X(AEX_B_CC<EC XCOMMAX() OpF>)
|
|
||||||
|
|
||||||
#define V_IFOR_A_1(EC) \
|
|
||||||
V_IFOR_X(AEX_M<EC>); \
|
|
||||||
V_IFOR_X(AEX_C<EC>)
|
|
||||||
|
|
||||||
template <class Index>
|
|
||||||
class E1;
|
|
||||||
|
|
||||||
class Expressions1 //: public ECInterface<Expressions1<X>>
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
typedef Expressions1 EX;
|
|
||||||
|
|
||||||
template <class Index>
|
|
||||||
static auto make(const std::shared_ptr<Index>& i)
|
|
||||||
-> decltype(makeec<E1<Index>>(i))
|
|
||||||
{
|
|
||||||
return makeec<E1<Index>>(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
V_IFOR_A(EX,MultiArrayTools::plus);
|
|
||||||
V_IFOR_A(EX,MultiArrayTools::minus);
|
|
||||||
V_IFOR_A(EX,MultiArrayTools::multiplies);
|
|
||||||
V_IFOR_A(EX,MultiArrayTools::divides);
|
|
||||||
V_IFOR_A_1(EX);
|
|
||||||
|
|
||||||
public:
|
|
||||||
template <class Expr>
|
|
||||||
inline MultiArrayTools::ExpressionHolder<Expr> ifor(size_t step, MultiArrayTools::ExpressionHolder<Expr> ex) const;
|
|
||||||
|
|
||||||
template <class Expr>
|
|
||||||
inline MultiArrayTools::ExpressionHolder<Expr> iforh(size_t step, MultiArrayTools::ExpressionHolder<Expr> ex) const;
|
|
||||||
|
|
||||||
template <class Expr>
|
|
||||||
inline MultiArrayTools::ExpressionHolder<Expr> ifori(size_t step, Expr ex) const;
|
|
||||||
|
|
||||||
template <class Expr>
|
|
||||||
inline MultiArrayTools::ExpressionHolder<Expr> iforhi(size_t step, Expr ex) const;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#define D_IFOR_X(Expr,Ind) \
|
|
||||||
MultiArrayTools::ExpressionHolder<Expr> iforx(size_t step, MultiArrayTools::ExpressionHolder<Expr> ex) const \
|
|
||||||
{ return MultiArrayTools::ExpressionHolder<Expr>(Ind->ifor(step, ex)); } \
|
|
||||||
MultiArrayTools::ExpressionHolder<Expr> iforhx(size_t step, MultiArrayTools::ExpressionHolder<Expr> ex) const \
|
|
||||||
{ return MultiArrayTools::ExpressionHolder<Expr>(Ind->iforh(step, ex)); } \
|
|
||||||
MultiArrayTools::ExpressionHolder<Expr> iforxi(size_t step, Expr ex) const \
|
|
||||||
{ return MultiArrayTools::ExpressionHolder<Expr>(Ind->ifor(step, ex)); } \
|
|
||||||
MultiArrayTools::ExpressionHolder<Expr> iforhxi(size_t step, Expr ex) const \
|
|
||||||
{ return MultiArrayTools::ExpressionHolder<Expr>(Ind->iforh(step, ex)); }
|
|
||||||
|
|
||||||
#define D_IFOR_A(EC,OpF,Ind) \
|
|
||||||
D_IFOR_X(AEX_B_MM<EC XCOMMAX() OpF>,Ind); \
|
|
||||||
D_IFOR_X(AEX_B_MC<EC XCOMMAX() OpF>,Ind); \
|
|
||||||
D_IFOR_X(AEX_B_CM<EC XCOMMAX() OpF>,Ind); \
|
|
||||||
D_IFOR_X(AEX_B_CC<EC XCOMMAX() OpF>,Ind)
|
|
||||||
|
|
||||||
#define D_IFOR_A_1(EC,Ind) \
|
|
||||||
D_IFOR_X(AEX_M<EC>,Ind); \
|
|
||||||
D_IFOR_X(AEX_C<EC>,Ind)
|
|
||||||
|
|
||||||
template <class Index>
|
|
||||||
class E1 : public Expressions1
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
|
|
||||||
typedef Expressions1 EX;
|
|
||||||
|
|
||||||
E1() = default;
|
|
||||||
|
|
||||||
std::shared_ptr<Index> mI;
|
|
||||||
|
|
||||||
D_IFOR_A(EX,MultiArrayTools::plus,mI);
|
|
||||||
D_IFOR_A(EX,MultiArrayTools::minus,mI);
|
|
||||||
D_IFOR_A(EX,MultiArrayTools::multiplies,mI);
|
|
||||||
D_IFOR_A(EX,MultiArrayTools::divides,mI);
|
|
||||||
D_IFOR_A_1(EX,mI);
|
|
||||||
|
|
||||||
public:
|
|
||||||
E1(const E1& in) = default;
|
|
||||||
E1(E1&& in) = default;
|
|
||||||
E1& operator=(const E1& in) = default;
|
|
||||||
E1& operator=(E1&& in) = default;
|
|
||||||
|
|
||||||
E1(const std::shared_ptr<Index>& i) : mI(i) {}
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
} // namespace MultiArrayTools
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -6,6 +6,6 @@
|
||||||
#include "multi_array_base.cc.h"
|
#include "multi_array_base.cc.h"
|
||||||
#include "multi_array.cc.h"
|
#include "multi_array.cc.h"
|
||||||
#include "slice.cc.h"
|
#include "slice.cc.h"
|
||||||
#include "expressions.cc.h"
|
//#include "expressions.cc.h"
|
||||||
|
|
||||||
#include "ranges/dynamic_range.cc.h"
|
#include "ranges/dynamic_range.cc.h"
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
#include "helper_tools.h"
|
#include "helper_tools.h"
|
||||||
#include "operation_def.h"
|
#include "operation_def.h"
|
||||||
#include "map_range.h"
|
#include "map_range.h"
|
||||||
#include "expressions.h"
|
//#include "expressions.h"
|
||||||
|
|
||||||
#include "multi_array_header.cc.h"
|
#include "multi_array_header.cc.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include "ranges/rheader.h"
|
#include "ranges/rheader.h"
|
||||||
#include "expressions.h"
|
//#include "expressions.h"
|
||||||
#include "ranges/dynamic_range.cc.h"
|
#include "ranges/dynamic_range.cc.h"
|
||||||
//#include "multi_array_header.h"
|
//#include "multi_array_header.h"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue