Changeset: f32ea89786ee for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f32ea89786ee
Added Files:
sql/backends/monet5/gsl/Tests/gsl00.malC
Removed Files:
sql/backends/monet5/gsl/Tests/gsl00.mal
Modified Files:
clients/Tests/All
monetdb5/modules/kernel/aggr.mal.sh
sql/backends/monet5/gsl/Tests/gsl00.stable.out
Branch: Oct2014
Log Message:
merged
diffs (60 lines):
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -3,7 +3,7 @@ HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIB
HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_fits_geom
!HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_geom
!HAVE_CFITSIO&!HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_none
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?SQL-dump_all
+HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL&!BITS32?SQL-dump_all
HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?SQL-dump_geom
-!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?SQL-dump_none
+!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL&!BITS32?SQL-dump_none
MERCURIAL?malcheck
diff --git a/monetdb5/modules/kernel/aggr.mal.sh
b/monetdb5/modules/kernel/aggr.mal.sh
--- a/monetdb5/modules/kernel/aggr.mal.sh
+++ b/monetdb5/modules/kernel/aggr.mal.sh
@@ -303,7 +303,7 @@ address AGGRmedian3
comment "Grouped median aggregate";
function median(b:bat[:oid,:any_1]) :any_1;
- bn := submedian(b, false);
+ bn := submedian(b, true);
return algebra.fetch(bn, 0@0);
end aggr.median;
diff --git a/sql/backends/monet5/gsl/Tests/gsl00.mal
b/sql/backends/monet5/gsl/Tests/gsl00.malC
rename from sql/backends/monet5/gsl/Tests/gsl00.mal
rename to sql/backends/monet5/gsl/Tests/gsl00.malC
diff --git a/sql/backends/monet5/gsl/Tests/gsl00.stable.out
b/sql/backends/monet5/gsl/Tests/gsl00.stable.out
--- a/sql/backends/monet5/gsl/Tests/gsl00.stable.out
+++ b/sql/backends/monet5/gsl/Tests/gsl00.stable.out
@@ -18,15 +18,18 @@ stdout of test 'gsl00` in directory 'sql
# MonetDB/GIS module loaded
# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
-function user.main():void;
- a := 20:dbl;
- b := 5:dbl;
- c := gsl.chi2prob(a,b);
- io.print(c);
-end main;
-[ 0.0012497305630313768 ]
+# MonetDB/R module loaded
-# 15:55:26 >
-# 15:55:26 > "Done."
-# 15:55:26 >
+Ready.
+# 17:18:32 >
+# 17:18:32 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13823" "--port=38735"
+# 17:18:32 >
+
+#io.print(c);
+[ 0.001249730563 ]
+
+# 17:18:32 >
+# 17:18:32 > "Done."
+# 17:18:32 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
