Changeset: 2684ad5ead92 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2684ad5ead92
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batmmath.h
monetdb5/modules/kernel/mmath.c
monetdb5/modules/kernel/mmath.h
Branch: Oct2014
Log Message:
Added const qualifier to mmath.
diffs (truncated from 505 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1205,46 +1205,46 @@ str CMDqgramnormalize(str *res, str *inp
str CMDqgramselfjoin(bat *res1, bat *res2, bat *qid, bat *bid, bat *pid, bat
*lid, flt *c, int *k);
str CMDraise(str *ret, str *msg);
str CMDregisterFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CMDscience_bat_cst_atan2_dbl(bat *ret, bat *bid, dbl *d);
-str CMDscience_bat_cst_atan2_flt(bat *ret, bat *bid, flt *d);
-str CMDscience_bat_cst_pow_dbl(bat *ret, bat *bid, dbl *d);
-str CMDscience_bat_cst_pow_flt(bat *ret, bat *bid, flt *d);
-str CMDscience_bat_dbl_acos(bat *ret, bat *bid);
-str CMDscience_bat_dbl_asin(bat *ret, bat *bid);
-str CMDscience_bat_dbl_atan(bat *ret, bat *bid);
-str CMDscience_bat_dbl_ceil(bat *ret, bat *bid);
-str CMDscience_bat_dbl_cos(bat *ret, bat *bid);
-str CMDscience_bat_dbl_cosh(bat *ret, bat *bid);
-str CMDscience_bat_dbl_degrees(bat *ret, bat *bid);
-str CMDscience_bat_dbl_exp(bat *ret, bat *bid);
-str CMDscience_bat_dbl_fabs(bat *ret, bat *bid);
-str CMDscience_bat_dbl_floor(bat *ret, bat *bid);
-str CMDscience_bat_dbl_log(bat *ret, bat *bid);
-str CMDscience_bat_dbl_log10(bat *ret, bat *bid);
-str CMDscience_bat_dbl_radians(bat *ret, bat *bid);
-str CMDscience_bat_dbl_sin(bat *ret, bat *bid);
-str CMDscience_bat_dbl_sinh(bat *ret, bat *bid);
-str CMDscience_bat_dbl_sqrt(bat *ret, bat *bid);
-str CMDscience_bat_dbl_tan(bat *ret, bat *bid);
-str CMDscience_bat_dbl_tanh(bat *ret, bat *bid);
-str CMDscience_bat_flt_acos(bat *ret, bat *bid);
-str CMDscience_bat_flt_asin(bat *ret, bat *bid);
-str CMDscience_bat_flt_atan(bat *ret, bat *bid);
-str CMDscience_bat_flt_ceil(bat *ret, bat *bid);
-str CMDscience_bat_flt_cos(bat *ret, bat *bid);
-str CMDscience_bat_flt_cosh(bat *ret, bat *bid);
-str CMDscience_bat_flt_degrees(bat *ret, bat *bid);
-str CMDscience_bat_flt_exp(bat *ret, bat *bid);
-str CMDscience_bat_flt_fabs(bat *ret, bat *bid);
-str CMDscience_bat_flt_floor(bat *ret, bat *bid);
-str CMDscience_bat_flt_log(bat *ret, bat *bid);
-str CMDscience_bat_flt_log10(bat *ret, bat *bid);
-str CMDscience_bat_flt_radians(bat *ret, bat *bid);
-str CMDscience_bat_flt_sin(bat *ret, bat *bid);
-str CMDscience_bat_flt_sinh(bat *ret, bat *bid);
-str CMDscience_bat_flt_sqrt(bat *ret, bat *bid);
-str CMDscience_bat_flt_tan(bat *ret, bat *bid);
-str CMDscience_bat_flt_tanh(bat *ret, bat *bid);
+str CMDscience_bat_cst_atan2_dbl(bat *ret, const bat *bid, const dbl *d);
+str CMDscience_bat_cst_atan2_flt(bat *ret, const bat *bid, const flt *d);
+str CMDscience_bat_cst_pow_dbl(bat *ret, const bat *bid, const dbl *d);
+str CMDscience_bat_cst_pow_flt(bat *ret, const bat *bid, const flt *d);
+str CMDscience_bat_dbl_acos(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_asin(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_atan(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_ceil(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_cos(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_cosh(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_degrees(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_exp(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_fabs(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_floor(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_log(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_log10(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_radians(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_sin(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_sinh(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_sqrt(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_tan(bat *ret, const bat *bid);
+str CMDscience_bat_dbl_tanh(bat *ret, const bat *bid);
+str CMDscience_bat_flt_acos(bat *ret, const bat *bid);
+str CMDscience_bat_flt_asin(bat *ret, const bat *bid);
+str CMDscience_bat_flt_atan(bat *ret, const bat *bid);
+str CMDscience_bat_flt_ceil(bat *ret, const bat *bid);
+str CMDscience_bat_flt_cos(bat *ret, const bat *bid);
+str CMDscience_bat_flt_cosh(bat *ret, const bat *bid);
+str CMDscience_bat_flt_degrees(bat *ret, const bat *bid);
+str CMDscience_bat_flt_exp(bat *ret, const bat *bid);
+str CMDscience_bat_flt_fabs(bat *ret, const bat *bid);
+str CMDscience_bat_flt_floor(bat *ret, const bat *bid);
+str CMDscience_bat_flt_log(bat *ret, const bat *bid);
+str CMDscience_bat_flt_log10(bat *ret, const bat *bid);
+str CMDscience_bat_flt_radians(bat *ret, const bat *bid);
+str CMDscience_bat_flt_sin(bat *ret, const bat *bid);
+str CMDscience_bat_flt_sinh(bat *ret, const bat *bid);
+str CMDscience_bat_flt_sqrt(bat *ret, const bat *bid);
+str CMDscience_bat_flt_tan(bat *ret, const bat *bid);
+str CMDscience_bat_flt_tanh(bat *ret, const bat *bid);
str CMDsetAllProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc);
str CMDsetFilterProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDsetFilterVariable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pc);
@@ -1475,57 +1475,57 @@ str MANUALcreateSection(Client cntxt, Ma
str MANUALcreateSummary(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str MANUALhelp(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANUALsearch(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MATHbinary_ATAN2dbl(dbl *res, dbl *a, dbl *b);
-str MATHbinary_ATAN2flt(flt *res, flt *a, flt *b);
-str MATHbinary_POWdbl(dbl *res, dbl *a, dbl *b);
-str MATHbinary_POWflt(flt *res, flt *a, flt *b);
-str MATHbinary_ROUNDdbl(dbl *res, dbl *a, int *b);
-str MATHbinary_ROUNDflt(flt *res, flt *a, int *b);
+str MATHbinary_ATAN2dbl(dbl *res, const dbl *a, const dbl *b);
+str MATHbinary_ATAN2flt(flt *res, const flt *a, const flt *b);
+str MATHbinary_POWdbl(dbl *res, const dbl *a, const dbl *b);
+str MATHbinary_POWflt(flt *res, const flt *a, const flt *b);
+str MATHbinary_ROUNDdbl(dbl *res, const dbl *a, const int *b);
+str MATHbinary_ROUNDflt(flt *res, const flt *a, const int *b);
str MATHpi(dbl *pi);
str MATHrandint(int *res);
str MATHrandintseed(int *res, const int *seed);
-str MATHsqlrandint(int *res, int *seed);
+str MATHsqlrandint(int *res, const int *seed);
str MATHsrandint(void *ret, const int *seed);
-str MATHunary_ACOSdbl(dbl *res, dbl *a);
-str MATHunary_ACOSflt(flt *res, flt *a);
-str MATHunary_ASINdbl(dbl *res, dbl *a);
-str MATHunary_ASINflt(flt *res, flt *a);
-str MATHunary_ATANdbl(dbl *res, dbl *a);
-str MATHunary_ATANflt(flt *res, flt *a);
-str MATHunary_CEILdbl(dbl *res, dbl *a);
-str MATHunary_CEILflt(flt *res, flt *a);
-str MATHunary_COSHdbl(dbl *res, dbl *a);
-str MATHunary_COSHflt(flt *res, flt *a);
-str MATHunary_COSdbl(dbl *res, dbl *a);
-str MATHunary_COSflt(flt *res, flt *a);
-str MATHunary_COTdbl(dbl *res, dbl *a);
-str MATHunary_COTflt(flt *res, flt *a);
-str MATHunary_DEGREESdbl(dbl *res, dbl *a);
-str MATHunary_DEGREESflt(flt *res, flt *a);
-str MATHunary_EXPdbl(dbl *res, dbl *a);
-str MATHunary_EXPflt(flt *res, flt *a);
-str MATHunary_FABSdbl(dbl *res, dbl *a);
-str MATHunary_FINITE(bit *res, dbl *a);
-str MATHunary_FLOORdbl(dbl *res, dbl *a);
-str MATHunary_FLOORflt(flt *res, flt *a);
-str MATHunary_ISINF(int *res, dbl *a);
-str MATHunary_ISNAN(bit *res, dbl *a);
-str MATHunary_LOG10dbl(dbl *res, dbl *a);
-str MATHunary_LOG10flt(flt *res, flt *a);
-str MATHunary_LOGdbl(dbl *res, dbl *a);
-str MATHunary_LOGflt(flt *res, flt *a);
-str MATHunary_RADIANSdbl(dbl *res, dbl *a);
-str MATHunary_RADIANSflt(flt *res, flt *a);
-str MATHunary_SINHdbl(dbl *res, dbl *a);
-str MATHunary_SINHflt(flt *res, flt *a);
-str MATHunary_SINdbl(dbl *res, dbl *a);
-str MATHunary_SINflt(flt *res, flt *a);
-str MATHunary_SQRTdbl(dbl *res, dbl *a);
-str MATHunary_SQRTflt(flt *res, flt *a);
-str MATHunary_TANHdbl(dbl *res, dbl *a);
-str MATHunary_TANHflt(flt *res, flt *a);
-str MATHunary_TANdbl(dbl *res, dbl *a);
-str MATHunary_TANflt(flt *res, flt *a);
+str MATHunary_ACOSdbl(dbl *res, const dbl *a);
+str MATHunary_ACOSflt(flt *res, const flt *a);
+str MATHunary_ASINdbl(dbl *res, const dbl *a);
+str MATHunary_ASINflt(flt *res, const flt *a);
+str MATHunary_ATANdbl(dbl *res, const dbl *a);
+str MATHunary_ATANflt(flt *res, const flt *a);
+str MATHunary_CEILdbl(dbl *res, const dbl *a);
+str MATHunary_CEILflt(flt *res, const flt *a);
+str MATHunary_COSHdbl(dbl *res, const dbl *a);
+str MATHunary_COSHflt(flt *res, const flt *a);
+str MATHunary_COSdbl(dbl *res, const dbl *a);
+str MATHunary_COSflt(flt *res, const flt *a);
+str MATHunary_COTdbl(dbl *res, const dbl *a);
+str MATHunary_COTflt(flt *res, const flt *a);
+str MATHunary_DEGREESdbl(dbl *res, const dbl *a);
+str MATHunary_DEGREESflt(flt *res, const flt *a);
+str MATHunary_EXPdbl(dbl *res, const dbl *a);
+str MATHunary_EXPflt(flt *res, const flt *a);
+str MATHunary_FABSdbl(dbl *res, const dbl *a);
+str MATHunary_FINITE(bit *res, const dbl *a);
+str MATHunary_FLOORdbl(dbl *res, const dbl *a);
+str MATHunary_FLOORflt(flt *res, const flt *a);
+str MATHunary_ISINF(int *res, const dbl *a);
+str MATHunary_ISNAN(bit *res, const dbl *a);
+str MATHunary_LOG10dbl(dbl *res, const dbl *a);
+str MATHunary_LOG10flt(flt *res, const flt *a);
+str MATHunary_LOGdbl(dbl *res, const dbl *a);
+str MATHunary_LOGflt(flt *res, const flt *a);
+str MATHunary_RADIANSdbl(dbl *res, const dbl *a);
+str MATHunary_RADIANSflt(flt *res, const flt *a);
+str MATHunary_SINHdbl(dbl *res, const dbl *a);
+str MATHunary_SINHflt(flt *res, const flt *a);
+str MATHunary_SINdbl(dbl *res, const dbl *a);
+str MATHunary_SINflt(flt *res, const flt *a);
+str MATHunary_SQRTdbl(dbl *res, const dbl *a);
+str MATHunary_SQRTflt(flt *res, const flt *a);
+str MATHunary_TANHdbl(dbl *res, const dbl *a);
+str MATHunary_TANHflt(flt *res, const flt *a);
+str MATHunary_TANdbl(dbl *res, const dbl *a);
+str MATHunary_TANflt(flt *res, const flt *a);
str MATdummy(int *ret, str *grp);
str MAThasMoreElements(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATinfo(bat *ret, str *grp, str *elm);
diff --git a/monetdb5/modules/kernel/batmmath.c
b/monetdb5/modules/kernel/batmmath.c
--- a/monetdb5/modules/kernel/batmmath.c
+++ b/monetdb5/modules/kernel/batmmath.c
@@ -46,7 +46,7 @@
#define scienceFcnImpl(X1,X2,X3)
\
-str CMDscience_bat_##X2##_##X1(bat *ret, bat *bid) \
+str CMDscience_bat_##X2##_##X1(bat *ret, const bat *bid) \
{
\
BAT *b,*bn;
\
X2 *o, *p, *q;
\
@@ -82,7 +82,7 @@ str CMDscience_bat_##X2##_##X1(bat *ret,
}
#define scienceBinaryImpl(X1,X2,X3)
\
-str CMDscience_bat_cst_##X1##_##X2(bat *ret, bat *bid, X2 *d) \
+str CMDscience_bat_cst_##X1##_##X2(bat *ret, const bat *bid, const X2 *d)
\
{
\
BAT *b,*bn;
\
X2 *o, *p, *q;
\
diff --git a/monetdb5/modules/kernel/batmmath.h
b/monetdb5/modules/kernel/batmmath.h
--- a/monetdb5/modules/kernel/batmmath.h
+++ b/monetdb5/modules/kernel/batmmath.h
@@ -40,8 +40,8 @@
#define scienceDef(X1)\
-batmmath_export str CMDscience_bat_dbl_##X1(bat *ret, bat *bid);\
-batmmath_export str CMDscience_bat_flt_##X1(bat *ret, bat *bid);
+batmmath_export str CMDscience_bat_dbl_##X1(bat *ret, const bat *bid);\
+batmmath_export str CMDscience_bat_flt_##X1(bat *ret, const bat *bid);
scienceDef(asin)
scienceDef(acos)
@@ -62,8 +62,8 @@ scienceDef(ceil)
scienceDef(fabs)
scienceDef(floor)
-batmmath_export str CMDscience_bat_cst_atan2_dbl(bat *ret, bat *bid, dbl *d);
-batmmath_export str CMDscience_bat_cst_atan2_flt(bat *ret, bat *bid, flt *d);
-batmmath_export str CMDscience_bat_cst_pow_dbl(bat *ret, bat *bid, dbl *d);
-batmmath_export str CMDscience_bat_cst_pow_flt(bat *ret, bat *bid, flt *d);
+batmmath_export str CMDscience_bat_cst_atan2_dbl(bat *ret, const bat *bid,
const dbl *d);
+batmmath_export str CMDscience_bat_cst_atan2_flt(bat *ret, const bat *bid,
const flt *d);
+batmmath_export str CMDscience_bat_cst_pow_dbl(bat *ret, const bat *bid, const
dbl *d);
+batmmath_export str CMDscience_bat_cst_pow_flt(bat *ret, const bat *bid, const
flt *d);
#endif /* _BATMATH_H */
diff --git a/monetdb5/modules/kernel/mmath.c b/monetdb5/modules/kernel/mmath.c
--- a/monetdb5/modules/kernel/mmath.c
+++ b/monetdb5/modules/kernel/mmath.c
@@ -100,7 +100,7 @@ MNisinf(double x)
#define floor_unary(x, z) *z = floor(*x)
static str
-math_unary_ISNAN(bit *res, dbl *a)
+math_unary_ISNAN(bit *res, const dbl *a)
{
#ifdef DEBUG
printf("math_unary_ISNAN\n");
@@ -114,7 +114,7 @@ math_unary_ISNAN(bit *res, dbl *a)
}
static str
-math_unary_ISINF(int *res, dbl *a)
+math_unary_ISINF(int *res, const dbl *a)
{
#ifdef DEBUG
printf("math_unary_ISINF\n");
@@ -132,7 +132,7 @@ math_unary_ISINF(int *res, dbl *a)
}
static str
-math_unary_FINITE(bit *res, dbl *a)
+math_unary_FINITE(bit *res, const dbl *a)
{
#ifdef DEBUG
printf("math_unary_FINITE\n");
@@ -145,83 +145,93 @@ math_unary_FINITE(bit *res, dbl *a)
return MAL_SUCCEED;
}
-#define unopbaseM5(X1,X2,X3)\
-str MATHunary##X1##X3 (X3 *res , X3 *a ) {\
- dbl tmp1,tmp2;\
- str msg= MAL_SUCCEED;\
- if (*a == X3##_nil) {\
- *res =X3##_nil;\
- } else {\
- tmp1= *a;\
- X2##_unary( &tmp1, &tmp2 );\
- *res = (X3) tmp2;\
- }\
- return msg;\
+#define unopbaseM5(X1,X2,X3) \
+str
\
+MATHunary##X1##X3(X3 *res , const X3 *a) \
+{
\
+ dbl tmp1,tmp2;
\
+ str msg= MAL_SUCCEED; \
+ if (*a == X3##_nil) { \
+ *res =X3##_nil;
\
+ } else {
\
+ tmp1= *a;
\
+ X2##_unary( &tmp1, &tmp2); \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
