Changeset: 3083709b315f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3083709b315f Modified Files: clients/Tests/SQL-dump.sql clients/Tests/SQL-dump_all.stable.out clients/Tests/SQL-dump_all.stable.out.oid32 Branch: Oct2014 Log Message:
Merge with jan2014 branch. diffs (77 lines): diff --git a/clients/Tests/SQL-dump.sql b/clients/Tests/SQL-dump.sql --- a/clients/Tests/SQL-dump.sql +++ b/clients/Tests/SQL-dump.sql @@ -62,6 +62,7 @@ \dSf sys.boundary \dSf sys.broadcast \dSf sys.buffer +\dSf sys.chi2prob \dSf sys.cluster1 \dSf sys.cluster2 \dSf sys.columnsize diff --git a/clients/Tests/SQL-dump_all.stable.out b/clients/Tests/SQL-dump_all.stable.out --- a/clients/Tests/SQL-dump_all.stable.out +++ b/clients/Tests/SQL-dump_all.stable.out @@ -495,6 +495,29 @@ create function buffer(a geometry, dista -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. +-- (co) Arjen de Rijke, Bart Scheers +-- Use statistical functions from gsl library + +-- Calculate Chi squared probability +create function sys.chi2prob(chi2 double, datapoints double) +returns double external name gsl."chi2prob"; +-- The contents of this file are subject to the MonetDB Public License +-- Version 1.1 (the "License"); you may not use this file except in +-- compliance with the License. You may obtain a copy of the License at +-- http://www.monetdb.org/Legal/MonetDBLicense +-- +-- Software distributed under the License is distributed on an "AS IS" +-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +-- License for the specific language governing rights and limitations +-- under the License. +-- +-- The Original Code is the MonetDB Database System. +-- +-- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +-- Copyright August 2008-2014 MonetDB B.V. +-- All Rights Reserved. + -- Clustering a relational table should be done with care. -- For, the oid's are used in join-indices. diff --git a/clients/Tests/SQL-dump_all.stable.out.oid32 b/clients/Tests/SQL-dump_all.stable.out.oid32 --- a/clients/Tests/SQL-dump_all.stable.out.oid32 +++ b/clients/Tests/SQL-dump_all.stable.out.oid32 @@ -495,6 +495,29 @@ create function buffer(a geometry, dista -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. +-- (co) Arjen de Rijke, Bart Scheers +-- Use statistical functions from gsl library + +-- Calculate Chi squared probability +create function sys.chi2prob(chi2 double, datapoints double) +returns double external name gsl."chi2prob"; +-- The contents of this file are subject to the MonetDB Public License +-- Version 1.1 (the "License"); you may not use this file except in +-- compliance with the License. You may obtain a copy of the License at +-- http://www.monetdb.org/Legal/MonetDBLicense +-- +-- Software distributed under the License is distributed on an "AS IS" +-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +-- License for the specific language governing rights and limitations +-- under the License. +-- +-- The Original Code is the MonetDB Database System. +-- +-- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +-- Copyright August 2008-2014 MonetDB B.V. +-- All Rights Reserved. + -- Clustering a relational table should be done with care. -- For, the oid's are used in join-indices. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
