diff --git a/pub/lib/func.cpp b/pub/lib/func.cpp
index 20ae940e129f30ceadc6c71a8a186aa25dd1cf62..f87d5f80a97335b1d86a9e36e7fb271f62d10885 100644
--- a/pub/lib/func.cpp
+++ b/pub/lib/func.cpp
@@ -310,7 +310,7 @@ double func_rotdiff( double w, double tau, double qb )
//* Coordinate concatenation *//
//**************************************************************************//
-CCoord CFunc::coord( CCoord *co1 ) const
+CCoord CFunc1::coord( CCoord *co1 ) const
{
CCoord co = *co1;
if (txt=="0-") {
@@ -328,7 +328,7 @@ CCoord CFunc::coord( CCoord *co1 ) const
return co;
}
-CCoord CFunc::coord( class CCoord *co1, class CCoord *co2 ) const
+CCoord CFunc2::coord( class CCoord *co1, class CCoord *co2 ) const
{
CCoord co = *co1;
@@ -372,7 +372,7 @@ CCoord CFunc::coord( class CCoord *co1, class CCoord *co2 ) const
return co;
}
-CCoord CFunc::coord( class CCoord *co1, class CCoord *co2, class CCoord *co3 )
+CCoord CFunc3::coord( class CCoord *co1, class CCoord *co2, class CCoord *co3 )
const
{
CCoord co;
@@ -430,186 +430,186 @@ void CFunc::register_me() const
void NFunctions::initialize(void)
{
// operators by precedence (as in xax_yacc.ypp):
- CFunc( "+-", func_pm, deri_pm, 1 ).register_me();
- CFunc( "^", func_pow, deri_pow, 2 ).register_me();
- CFunc( "!", func_not, 0, 3 ).register_me();
- CFunc( "neg", func_neg, deri_neg, 4 ).register_me();
- CFunc( "over",func_over, 0, 5 ).register_me();
- CFunc( "*", func_mul, deri_mul, 6 ).register_me();
- CFunc( "/", func_div, deri_div, 6 ).register_me();
- CFunc( "mod", func_mod, 0, 6 ).register_me();
- CFunc( "div", func_idiv, 0, 6 ).register_me();
- CFunc( "+", func_add, deri_add, 7 ).register_me();
- CFunc( "-", func_sub, deri_sub, 7 ).register_me();
- CFunc( ">", func_gt, 0, 8 ).register_me();
- CFunc( ">=", func_ge, 0, 8 ).register_me();
- CFunc( "<", func_lt, 0, 8 ).register_me();
- CFunc( "<=", func_le, 0, 8 ).register_me();
- CFunc( "==", func_eq, 0, 9 ).register_me();
- CFunc( "!=", func_ne, 0, 9 ).register_me();
- CFunc( "xor", func_xor, 0, 10 ).register_me();
- CFunc( "&&", func_and, 0, 11 ).register_me();
- CFunc( "||", func_or , 0, 12 ).register_me();
- CFunc( "?:", func_cond, deri_cond, 13 ).register_me();
+ CFunc2( "+-", func_pm, deri_pm, 1 ).register_me();
+ CFunc2( "^", func_pow, deri_pow, 2 ).register_me();
+ CFunc1( "!", func_not, 0, 3 ).register_me();
+ CFunc1( "neg", func_neg, deri_neg, 4 ).register_me();
+ CFunc2( "over",func_over, 0, 5 ).register_me();
+ CFunc2( "*", func_mul, deri_mul, 6 ).register_me();
+ CFunc2( "/", func_div, deri_div, 6 ).register_me();
+ CFunc2( "mod", func_mod, 0, 6 ).register_me();
+ CFunc2( "div", func_idiv, 0, 6 ).register_me();
+ CFunc2( "+", func_add, deri_add, 7 ).register_me();
+ CFunc2( "-", func_sub, deri_sub, 7 ).register_me();
+ CFunc2( ">", func_gt, 0, 8 ).register_me();
+ CFunc2( ">=", func_ge, 0, 8 ).register_me();
+ CFunc2( "<", func_lt, 0, 8 ).register_me();
+ CFunc2( "<=", func_le, 0, 8 ).register_me();
+ CFunc2( "==", func_eq, 0, 9 ).register_me();
+ CFunc2( "!=", func_ne, 0, 9 ).register_me();
+ CFunc2( "xor", func_xor, 0, 10 ).register_me();
+ CFunc2( "&&", func_and, 0, 11 ).register_me();
+ CFunc2( "||", func_or , 0, 12 ).register_me();
+ CFunc3( "?:", func_cond, deri_cond, 13 ).register_me();
// f( 1 arg )
- CFunc( "ln", func_ln, deri_ln, 0,
+ CFunc1( "ln", func_ln, deri_ln, 0,
"(x): natural logarithm of x, or 0 if x<=0" ).register_me();
- CFunc( "lg", func_lg, deri_lg, 0,
+ CFunc1( "lg", func_lg, deri_lg, 0,
"(x): decadic logarithm of x, or 0 if x<=0" ).register_me();
- CFunc( "sqrt", func_sqrt, deri_sqrt, 0,
+ CFunc1( "sqrt", func_sqrt, deri_sqrt, 0,
"(x): square root of x, or 0 if x<0" ).register_me();
- CFunc( "abs", func_abs, deri_abs, 0,
+ CFunc1( "abs", func_abs, deri_abs, 0,
"(x): absolute value of x" ).register_me();
- CFunc( "abs", func_sign, deri_sign, 0,
+ CFunc1( "abs", func_sign, deri_sign, 0,
"(x): sign of x" ).register_me();
- CFunc( "exp", func_exp, deri_exp, 0,
+ CFunc1( "exp", func_exp, deri_exp, 0,
"(x): exponential function of x" ).register_me();
- CFunc( "sin", func_sin, 0, 0,
+ CFunc1( "sin", func_sin, 0, 0,
"(x): sine of x (where x in radian)" ).register_me();
- CFunc( "cos", func_cos, 0, 0,
+ CFunc1( "cos", func_cos, 0, 0,
"(x): cosine of x (where x in radian)" ).register_me();
- CFunc( "tan", func_tan, 0, 0,
+ CFunc1( "tan", func_tan, 0, 0,
"(x): tangent of x (where x in radian)" ).register_me();
- CFunc( "cot", func_cot, 0, 0,
+ CFunc1( "cot", func_cot, 0, 0,
"(x): cotangent of x (where x in radian)" ).register_me();
- CFunc( "sind", func_sind, 0, 0,
+ CFunc1( "sind", func_sind, 0, 0,
"(x): sine of x (where x in degrees)" ).register_me();
- CFunc( "cosd", func_cosd, 0, 0,
+ CFunc1( "cosd", func_cosd, 0, 0,
"(x): cosine of x (where x in degrees)" ).register_me();
- CFunc( "tand", func_tand, 0, 0,
+ CFunc1( "tand", func_tand, 0, 0,
"(x): tangent of x (where x in degrees)" ).register_me();
- CFunc( "cotd", func_cotd, 0, 0,
+ CFunc1( "cotd", func_cotd, 0, 0,
"(x): cotangent of x (where x in degrees)" ).register_me();
- CFunc( "asin", func_asin, 0, 0,
+ CFunc1( "asin", func_asin, 0, 0,
"(x): arc sine of x (result is in radian; return 0 if |x|>1)"
).register_me();
- CFunc( "acos", func_acos, 0, 0,
+ CFunc1( "acos", func_acos, 0, 0,
"(x): arc cosine of x (result is in radian; return 0 if |x|>1)"
).register_me();
- CFunc( "atan", func_atan, 0, 0,
+ CFunc1( "atan", func_atan, 0, 0,
"(x): arc tangent of x (result is in radian)" ).register_me();
- CFunc( "acot", func_acot, 0, 0,
+ CFunc1( "acot", func_acot, 0, 0,
"(x): arc cotangent of x (result is in radian)" ).register_me();
- CFunc( "asind", func_asind, 0, 0,
+ CFunc1( "asind", func_asind, 0, 0,
"(x): arc sine of x (result is in degrees; return 0 if |x|>1)"
).register_me();
- CFunc( "acosd", func_acosd, 0, 0,
+ CFunc1( "acosd", func_acosd, 0, 0,
"(x): arc cosine of x (result is in degrees; return 0 if |x|>1)"
).register_me();
- CFunc( "atand", func_atand, 0, 0,
+ CFunc1( "atand", func_atand, 0, 0,
"(x): arc tangent of x (result is in degrees)" ).register_me();
- CFunc( "acotd", func_acotd, 0, 0,
+ CFunc1( "acotd", func_acotd, 0, 0,
"(x): arc cotangent of x (result is in degrees)" ).register_me();
- CFunc( "sinh", func_sinh, 0, 0,
+ CFunc1( "sinh", func_sinh, 0, 0,
"(x): hyperbolic sine of x" ).register_me();
- CFunc( "cosh", func_cosh, 0, 0,
+ CFunc1( "cosh", func_cosh, 0, 0,
"(x): hyperbolic cosine of x" ).register_me();
- CFunc( "tanh", func_tanh, 0, 0,
+ CFunc1( "tanh", func_tanh, 0, 0,
"(x): hyperbolic tangent of x" ).register_me();
- CFunc( "coth", func_coth, 0, 0,
+ CFunc1( "coth", func_coth, 0, 0,
"(x): hyperbolic tangent of x" ).register_me();
- CFunc( "j0", func_j0, 0, 0,
+ CFunc1( "j0", func_j0, 0, 0,
"(x): spherical Bessel function x" ).register_me();
- CFunc( "j1", func_j1, 0, 0,
+ CFunc1( "j1", func_j1, 0, 0,
"(x): spherical Bessel function x" ).register_me();
- CFunc( "fac",func_fac, 0, 0,
+ CFunc1( "fac",func_fac, 0, 0,
"(x): factorial of nearest integer of x" ).register_me();
- CFunc( "cata",func_cata, 0, 0,
+ CFunc1( "cata",func_cata, 0, 0,
"(x): Catalan number of nearest integer of x" ).register_me();
- CFunc( "gamma",func_gamma, 0, 0,
+ CFunc1( "gamma",func_gamma, 0, 0,
"(x): gamma function of x (i.e. factorial of x-1)" ).register_me();
- CFunc( "lgamma",func_lgamma, 0, 0,
+ CFunc1( "lgamma",func_lgamma, 0, 0,
"(x): ln of gamma of x" ).register_me();
- CFunc( "debye1",func_debye1, 0, 0,
+ CFunc1( "debye1",func_debye1, 0, 0,
"(x): Debye function D1 of x" ).register_me();
- CFunc( "debye3",func_debye3, 0, 0,
+ CFunc1( "debye3",func_debye3, 0, 0,
"(x): Debye function D3 of x" ).register_me();
- CFunc( "debyeu2",func_debye_msd, 0, 0,
+ CFunc1( "debyeu2",func_debye_msd, 0, 0,
"(x): Debye mean squared displacement's temperature dependence"
).register_me();
- CFunc( "debyeui",func_debye_ui, 0, 0,
+ CFunc1( "debyeui",func_debye_ui, 0, 0,
"(x): Debye internal energy" ).register_me();
- CFunc( "debyecv",func_debye_cv, 0, 0,
+ CFunc1( "debyecv",func_debye_cv, 0, 0,
"(x): Debye heat capacity" ).register_me();
- CFunc( "erfP", func_erfP, 0, 0,
+ CFunc1( "erfP", func_erfP, 0, 0,
"(x): ?" ).register_me();
- CFunc( "erfQ", func_erfQ , 0, 0,
+ CFunc1( "erfQ", func_erfQ , 0, 0,
"(x): ?" ).register_me();
- CFunc( "erf", func_erf, 0, 0,
+ CFunc1( "erf", func_erf, 0, 0,
"(x): error function of x" ).register_me();
- CFunc( "erfc", func_erfc, 0, 0,
+ CFunc1( "erfc", func_erfc, 0, 0,
"(x): complementary error function of x" ).register_me();
- CFunc( "dawson", func_dawson, 0, 0,
+ CFunc1( "dawson", func_dawson, 0, 0,
"(x): Dawson function of x" ).register_me();
- CFunc( "sinc", func_sinc, 0, 0,
+ CFunc1( "sinc", func_sinc, 0, 0,
"(x): sinus cardinalis, sin(x)/x" ).register_me();
- CFunc( "ceil", func_ceil, 0, 0,
+ CFunc1( "ceil", func_ceil, 0, 0,
"(x): the smallest integer i with i>=x" ).register_me();
- CFunc( "floor",func_floor, 0, 0,
+ CFunc1( "floor",func_floor, 0, 0,
"(x): the largest integer i with i<=x" ).register_me();
- CFunc( "nint", func_nint, 0, 0,
+ CFunc1( "nint", func_nint, 0, 0,
"(x): the integer nearest to x" ).register_me();
- CFunc( "diehl", func_diehl, 0, 0,
+ CFunc1( "diehl", func_diehl, 0, 0,
"(cauchywid/gausswid): normalized convolution gauss(*)cauchy"
).register_me();
- CFunc( "lndiehl", func_lndiehl, 0, 0,
+ CFunc1( "lndiehl", func_lndiehl, 0, 0,
"(cauchywid/gausswid): ln of normalized convolution gauss(*)cauchy"
).register_me();
// f(2 args)
- CFunc( "min", func_min, 0, 0,
+ CFunc2( "min", func_min, 0, 0,
"(x,y): the smaller of the two arguments x and y" ).register_me();
- CFunc( "max", func_max, 0, 0,
+ CFunc2( "max", func_max, 0, 0,
"(x,y): the smaller of the two arguments x and y" ).register_me();
- CFunc( "ran", func_ran, 0, 0,
+ CFunc2( "ran", func_ran, 0, 0,
"(x,y): a random number between x and y" ).register_me();
- CFunc( "gauss", func_gauss, 0, 0,
+ CFunc2( "gauss", func_gauss, 0, 0,
"(x,s): the normalized Gaussian exp(-x^2/2/s^2)/sqrt(2 pi)/s"
).register_me();
- CFunc( "gnn", func_gaussnn, 0, 0,
+ CFunc2( "gnn", func_gaussnn, 0, 0,
"(x,s): the unnormalized Gaussian exp(-x^2/2/s^2)" ).register_me();
- CFunc( "cauchy", func_cauchy, 0, 0,
+ CFunc2( "cauchy", func_cauchy, 0, 0,
"(x,w): the Cauchy-Lorentz function ?/(x^2+w^2)" ).register_me();
- CFunc( "rehavneg", func_re_havneg, 0, 0,
+
+
+ // f(3 args)
+ CFunc3( "rehavneg", func_re_havneg, 0, 0,
"(x,y,z): real part of the Havriliak-Negami function"
).register_me();
- CFunc( "imhavneg", func_im_havneg, 0, 0,
+ CFunc3( "imhavneg", func_im_havneg, 0, 0,
"(x,y,z): imaginary part of the Havriliak-Negami function"
).register_me();
-
-
- // f(3 args)
- CFunc( "q4w", func_q4w, 0, 0,
+ CFunc3( "q4w", func_q4w, 0, 0,
"(x,y,z): ?" ).register_me();
- CFunc( "cauchy2", func_cauchy2, 0, 0,
+ CFunc3( "cauchy2", func_cauchy2, 0, 0,
"(x,y,z): ?" ).register_me();
- CFunc( "kwwc", func_kwwc, 0, 0,
+ CFunc3( "kwwc", func_kwwc, 0, 0,
"(w,tau,b): Fourier cosine transform (t->w) of exp((t/tau)^b)"
).register_me();
- CFunc( "kwws", func_kwws, 0, 0,
+ CFunc3( "kwws", func_kwws, 0, 0,
"(w,tau,b): Fourier sine transform (t->w) of exp((t/tau)^b)"
).register_me();
- CFunc( "kwwp", func_kwwp, 0, 0,
+ CFunc3( "kwwp", func_kwwp, 0, 0,
"(w,tau,b): primitive of "
"Fourier cosine transform (t->w) of exp((t/tau)^b)"
).register_me();
- CFunc( "voigt", func_voigt, 0, 0,
+ CFunc3( "voigt", func_voigt, 0, 0,
"(x,sigma,gamma): convolution of Gaussian(x,sigma) and "
"Lorentzian(x,gamma)"
).register_me();
- CFunc( "zorn", func_zorn, 0, 0,
+ CFunc3( "zorn", func_zorn, 0, 0,
"(I,<I>,s): Zorn's multiple-scattering corrected elastic intensity"
).register_me();
- CFunc( "zorn2", func_zorn_gauss, 0, 0,
+ CFunc3( "zorn2", func_zorn_gauss, 0, 0,
"(q,<u^2>,s): Zorn's multiple-scattering corrected Gaussian "
"elastic intensity for Si111" ).register_me();
- CFunc( "rrdm", func_rrdm, 0, 0,
+ CFunc3( "rrdm", func_rrdm, 0, 0,
"(w*t0,EA_mean/T,EA_stdv/EA_mean: rotational rate distribution model"
).register_me();
- CFunc( "rotdiff", func_rotdiff, 0, 0,
+ CFunc3( "rotdiff", func_rotdiff, 0, 0,
"(w,tau,qb: rotational diffusion spectrum)").register_me();
}
diff --git a/pub/lib/func.hpp b/pub/lib/func.hpp
index 14c73a6488c376e36daf6c8784cb3ce414006d2b..fb077f24eb95bf952fc6b3bd66b709a7f9c577f8 100644
--- a/pub/lib/func.hpp
+++ b/pub/lib/func.hpp
@@ -24,28 +24,43 @@ typedef void (*deri_f3) (double&,double&,
class CFunc {
public:
- string txt;
int narg;
- func_f1 f1;
- func_f2 f2;
- func_f3 f3;
- deri_f1 d1;
- deri_f2 d2;
- deri_f3 d3;
+ string txt;
int prec;
string com;
+ CFunc( int _narg, string _txt, int _prec, string _com="" )
+ : narg(_narg), txt(_txt), prec(_prec), com(_com) {};
+ virtual ~CFunc() {}; // magic: makes dynamic_cast possible
+
+ void register_me() const;
+};
+
+class CFunc1 : public CFunc {
+ public:
+ func_f1 f1;
+ deri_f1 d1;
+ CFunc1( string _txt, func_f1 _f, deri_f1 _d, int _prec, string _com="" )
+ : CFunc( 1, _txt, _prec, _com ), f1(_f), d1(_d) {};
class CCoord coord( class CCoord *co ) const;
+};
+
+class CFunc2 : public CFunc {
+ public:
+ func_f2 f2;
+ deri_f2 d2;
+ CFunc2( string _txt, func_f2 _f, deri_f2 _d, int _prec, string _com="" )
+ : CFunc( 2, _txt, _prec, _com ), f2(_f), d2(_d) {};
class CCoord coord( class CCoord *co1, class CCoord *co2 ) const;
- class CCoord coord( class CCoord *co1, class CCoord *co2,
- class CCoord *co3 ) const;
- CFunc( string _txt, func_f1 _f1, deri_f1 _d1, int _prec, string _com="" )
- : txt(_txt), narg(1), f1(_f1), d1(_d1), prec(_prec), com(_com) {};
- CFunc( string _txt, func_f2 _f2, deri_f2 _d2, int _prec, string _com="" )
- : txt(_txt), narg(2), f2(_f2), d2(_d2), prec(_prec), com(_com) {};
- CFunc( string _txt, func_f3 _f3, deri_f3 _d3, int _prec, string _com="" )
- : txt(_txt), narg(3), f3(_f3), d3(_d3), prec(_prec), com(_com) {};
+};
- void register_me() const;
+class CFunc3 : public CFunc {
+ public:
+ func_f3 f3;
+ deri_f3 d3;
+ CFunc3( string _txt, func_f3 _f, deri_f3 _d, int _prec, string _com="" )
+ : CFunc( 3, _txt, _prec, _com ), f3(_f), d3(_d) {};
+ class CCoord coord(
+ class CCoord *co1, class CCoord *co2, class CCoord *co3 ) const;
};
//! Collection of function wrappers CFunc
diff --git a/pub/lib/node.cpp b/pub/lib/node.cpp
index 5a39b79c068ccbbc16cb0c381d9f997c53de9a1d..0d725b0e130e1f1b9bcc8dac795bc2e5185154e3 100644
--- a/pub/lib/node.cpp
+++ b/pub/lib/node.cpp
@@ -94,54 +94,54 @@ void CNodeFun::tree_val( CResult& ret, const CContext& ctx ) const
ret.preset_v( n, ctx.want_error );
}
// now evaluate the function
- if ( narg==1 ) {
- if( ctx.want_error && fun->d1 && err_input ) {
+ if ( const CFunc1* fu = dynamic_cast<const CFunc1*>( fun ) ) {
+ if( ctx.want_error && fu->d1 && err_input ) {
if ( is_scalar ) {
- (*(fun->d1))( ret.r, ret.dr, a[0].r, a[0].dr );
+ (*(fu->d1))( ret.r, ret.dr, a[0].r, a[0].dr );
} else {
for ( int i=0; i<n; ++i )
- (*(fun->d1))( ret.v[i], ret.dv[i], a[0].v[i], a[0].dv[i] );
+ (*(fu->d1))( ret.v[i], ret.dv[i], a[0].v[i], a[0].dv[i] );
}
} else {
if ( is_scalar )
- ret.set_r( (*(fun->f1))( a[0].r ) );
+ ret.set_r( (*(fu->f1))( a[0].r ) );
else
for ( int i=0; i<n; ++i )
- ret.v[i] = (*(fun->f1))( a[0].v[i] );
+ ret.v[i] = (*(fu->f1))( a[0].v[i] );
}
- } else if ( narg==2 ) {
- if( ctx.want_error && ( ( fun->d2 && err_input ) ||
- fun->txt=="+-" ) ) {
+ } else if ( const CFunc2* fu = dynamic_cast<const CFunc2*>( fun ) ) {
+ if( ctx.want_error && ( ( fu->d2 && err_input ) ||
+ fu->txt=="+-" ) ) {
if ( is_scalar ) {
- (*(fun->d2))( ret.r, ret.dr, a[0].r, a[0].dr, a[1].r, a[1].dr );
+ (*(fu->d2))( ret.r, ret.dr, a[0].r, a[0].dr, a[1].r, a[1].dr );
} else {
for ( int i=0; i<n; ++i )
- (*(fun->d2))( ret.v[i], ret.dv[i],
+ (*(fu->d2))( ret.v[i], ret.dv[i],
a[0].to_r(i), a[0].to_dr(i),
a[1].to_r(i), a[1].to_dr(i) );
}
} else {
if ( !a[0].vectorial && !a[1].vectorial )
- ret.set_r( (*(fun->f2))( a[0].r, a[1].r ) );
+ ret.set_r( (*(fu->f2))( a[0].r, a[1].r ) );
else if ( !a[0].vectorial && a[1].vectorial ) {
for ( int i=0; i<n; ++i )
- ret.v[i] = (*(fun->f2))( a[0].r, a[1].v[i] );
+ ret.v[i] = (*(fu->f2))( a[0].r, a[1].v[i] );
} else if ( a[0].vectorial && !a[1].vectorial ) {
for ( int i=0; i<n; ++i )
- ret.v[i] = (*(fun->f2))( a[0].v[i], a[1].r );
+ ret.v[i] = (*(fu->f2))( a[0].v[i], a[1].r );
} else if ( a[0].vectorial && a[1].vectorial ) {
for ( int i=0; i<n; ++i )
- ret.v[i] = (*(fun->f2))( a[0].v[i], a[1].v[i] );
+ ret.v[i] = (*(fu->f2))( a[0].v[i], a[1].v[i] );
}
}
- } else if ( narg==3 ) {
- if( ctx.want_error && fun->d3 && err_input ) {
+ } else if ( const CFunc3* fu = dynamic_cast<const CFunc3*>( fun ) ) {
+ if( ctx.want_error && fu->d3 && err_input ) {
if ( is_scalar ) {
- (*(fun->d3))( ret.r, ret.dr, a[0].r, a[0].dr, a[1].r, a[1].dr,
- a[2].r, a[2].dr );
+ (*(fu->d3))( ret.r, ret.dr, a[0].r, a[0].dr,
+ a[1].r, a[1].dr, a[2].r, a[2].dr );
} else {
for ( int i=0; i<n; ++i )
- (*(fun->d3))(
+ (*(fu->d3))(
ret.v[i], ret.dv[i],
a[0].to_r(i), a[0].to_dr(i),
a[1].to_r(i), a[1].to_dr(i),
@@ -149,10 +149,10 @@ void CNodeFun::tree_val( CResult& ret, const CContext& ctx ) const
}
} else {
if ( is_scalar )
- ret.set_r( (*(fun->f3))( a[0].r, a[1].r, a[2].r ) );
+ ret.set_r( (*(fu->f3))( a[0].r, a[1].r, a[2].r ) );
else {
for ( int i=0; i<n; ++i )
- ret.v[i] = (*(fun->f3))(
+ ret.v[i] = (*(fu->f3))(
a[0].to_r(i), a[1].to_r(i), a[2].to_r(i) );
}
}
@@ -201,12 +201,12 @@ void CNodeFun::set_coord( CCoord& ret, int k ) const {
CCoord r[maxarg];
for ( int iarg=0; iarg<narg; ++iarg )
arg[iarg]->set_coord( r[iarg], k );
- if ( narg==1 )
- ret = fun->coord( r+0);
- else if ( narg==2 )
- ret = fun->coord( r+0, r+1 );
- else if ( narg==3 )
- ret = fun->coord( r+0, r+1, r+2 );
+ if ( const CFunc1* fu = dynamic_cast<const CFunc1*>( fun ) )
+ ret = fu->coord( r+0);
+ else if ( const CFunc2* fu = dynamic_cast<const CFunc2*>( fun ) )
+ ret = fu->coord( r+0, r+1 );
+ else if ( const CFunc3* fu = dynamic_cast<const CFunc3*>( fun ) )
+ ret = fu->coord( r+0, r+1, r+2 );
}
string CNodeFun::tree_info() const