Changeset: 6c9c64c91978 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c9c64c91978
Modified Files:
sql/backends/monet5/Tests/pyapi06.sql
sql/backends/monet5/Tests/pyapi23.sql
Branch: pythonudf
Log Message:
Fix test output for certain versions of NumPy.
diffs (33 lines):
diff --git a/sql/backends/monet5/Tests/pyapi06.sql
b/sql/backends/monet5/Tests/pyapi06.sql
--- a/sql/backends/monet5/Tests/pyapi06.sql
+++ b/sql/backends/monet5/Tests/pyapi06.sql
@@ -11,7 +11,7 @@ CREATE AGGREGATE aggrmedian(val integer)
unique = numpy.unique(aggr_group)
x = numpy.zeros(shape=(unique.size))
for i in range(0,unique.size):
- x[i] = numpy.median(val[aggr_group==unique[i]])
+ x[i] =
numpy.median(val[numpy.where(aggr_group==unique[i])])
return(x)
else:
return(numpy.median(val))
@@ -36,7 +36,7 @@ CREATE AGGREGATE aggrsum(val integer) RE
unique = numpy.unique(aggr_group)
x = numpy.zeros(shape=(unique.size))
for i in range(0, unique.size):
- x[i] = numpy.sum(val[aggr_group==unique[i]])
+ x[i] = numpy.sum(val[numpy.where(aggr_group==unique[i])])
return x
};
diff --git a/sql/backends/monet5/Tests/pyapi23.sql
b/sql/backends/monet5/Tests/pyapi23.sql
--- a/sql/backends/monet5/Tests/pyapi23.sql
+++ b/sql/backends/monet5/Tests/pyapi23.sql
@@ -7,7 +7,7 @@ CREATE AGGREGATE pyapi23(val integer) RE
unique = numpy.unique(aggr_group)
x = numpy.zeros(shape=(unique.size))
for i in range(0,unique.size):
- x[i] = numpy.sum(val[aggr_group==unique[i]])
+ x[i] =
numpy.sum(val[numpy.where(aggr_group==unique[i])])
return(x)
else:
return(numpy.sum(val))
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
