You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@madlib.apache.org by nk...@apache.org on 2019/10/07 21:14:07 UTC
[madlib] branch master updated: Kmeans: Use squared dist norm2 as a
default for silh functions
This is an automated email from the ASF dual-hosted git repository.
nkak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git
The following commit(s) were added to refs/heads/master by this push:
new 828f9fe Kmeans: Use squared dist norm2 as a default for silh functions
828f9fe is described below
commit 828f9feca37cbec169df7f1b6d68e277f0952d35
Author: Orhan Kislal <ok...@apache.org>
AuthorDate: Wed Oct 2 19:09:12 2019 -0400
Kmeans: Use squared dist norm2 as a default for silh functions
JIRA: MADLIB-1383
---
src/ports/postgres/modules/kmeans/kmeans.sql_in | 12 ++++++------
src/ports/postgres/modules/kmeans/test/kmeans.sql_in | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/ports/postgres/modules/kmeans/kmeans.sql_in b/src/ports/postgres/modules/kmeans/kmeans.sql_in
index 50f6500..9e36a92 100644
--- a/src/ports/postgres/modules/kmeans/kmeans.sql_in
+++ b/src/ports/postgres/modules/kmeans/kmeans.sql_in
@@ -2092,7 +2092,7 @@ CREATE OR REPLACE FUNCTION MADLIB_SCHEMA.simple_silhouette(
rel_source VARCHAR,
expr_point VARCHAR,
centroids DOUBLE PRECISION[][],
- fn_dist VARCHAR /*+ DEFAULT 'dist_norm2' */
+ fn_dist VARCHAR /*+ DEFAULT 'squared_dist_norm2' */
) RETURNS DOUBLE PRECISION
LANGUAGE plpgsql VOLATILE
AS $$
@@ -2164,7 +2164,7 @@ STABLE
LANGUAGE sql
AS $$
SELECT MADLIB_SCHEMA.simple_silhouette($1, $2, $3,
- 'MADLIB_SCHEMA.dist_norm2')
+ 'MADLIB_SCHEMA.squared_dist_norm2')
$$
m4_ifdef(`__HAS_FUNCTION_PROPERTIES__', `READS SQL DATA', `');
@@ -2347,7 +2347,7 @@ CREATE OR REPLACE FUNCTION MADLIB_SCHEMA.simple_silhouette_points(
expr_point VARCHAR,
centroids_table VARCHAR,
centroids_col VARCHAR,
- fn_dist VARCHAR /*+ DEFAULT 'dist_norm2' */
+ fn_dist VARCHAR /*+ DEFAULT 'squared_dist_norm2' */
) RETURNS VOID AS $$
PythonFunction(kmeans, kmeans, simple_silhouette_points_str_wrapper)
$$ LANGUAGE plpythonu VOLATILE
@@ -2363,7 +2363,7 @@ CREATE OR REPLACE FUNCTION MADLIB_SCHEMA.simple_silhouette_points(
) RETURNS VOID
AS $$
SELECT MADLIB_SCHEMA.simple_silhouette_points($1, $2, $3, $4, $5, $6,
- 'MADLIB_SCHEMA.dist_norm2')
+ 'MADLIB_SCHEMA.squared_dist_norm2')
$$ LANGUAGE sql VOLATILE
m4_ifdef(`\_\_HAS_FUNCTION_PROPERTIES\_\_', `MODIFIES SQL DATA', `');
@@ -2374,7 +2374,7 @@ CREATE OR REPLACE FUNCTION MADLIB_SCHEMA.simple_silhouette_points(
pid VARCHAR,
expr_point VARCHAR,
centroids DOUBLE PRECISION[],
- fn_dist VARCHAR /*+ DEFAULT 'dist_norm2' */
+ fn_dist VARCHAR /*+ DEFAULT 'squared_dist_norm2' */
) RETURNS VOID AS $$
PythonFunction(kmeans, kmeans, simple_silhouette_points_dbl_wrapper)
$$ LANGUAGE plpythonu VOLATILE
@@ -2389,6 +2389,6 @@ CREATE OR REPLACE FUNCTION MADLIB_SCHEMA.simple_silhouette_points(
) RETURNS VOID
AS $$
SELECT MADLIB_SCHEMA.simple_silhouette_points($1, $2, $3, $4, $5,
- 'MADLIB_SCHEMA.dist_norm2')
+ 'MADLIB_SCHEMA.squared_dist_norm2')
$$ LANGUAGE sql VOLATILE
m4_ifdef(`\_\_HAS_FUNCTION_PROPERTIES\_\_', `MODIFIES SQL DATA', `');
diff --git a/src/ports/postgres/modules/kmeans/test/kmeans.sql_in b/src/ports/postgres/modules/kmeans/test/kmeans.sql_in
index b0e5024..6e86c82 100644
--- a/src/ports/postgres/modules/kmeans/test/kmeans.sql_in
+++ b/src/ports/postgres/modules/kmeans/test/kmeans.sql_in
@@ -242,7 +242,7 @@ DROP TABLE IF EXISTS silh_out;
SELECT * FROM simple_silhouette_points(
'km_sample', 'silh_out', 'pid', 'points',
ARRAY[[1,1,1,1,1,1,1,1,1,1,1,1,1],
- [14.23, 1.71, 2.43, 15.6, 127, 2.8, 3.0600, 0.2800, 2.29, 5.64, 1.04, 3.92, 1065]]::DOUBLE PRECISION[][]);
+ [14.23, 1.71, 2.43, 15.6, 127, 2.8, 3.0600, 0.2800, 2.29, 5.64, 1.04, 3.92, 1065]]::DOUBLE PRECISION[][],'MADLIB_SCHEMA.dist_norm2');
SELECT assert(relative_error(1, silh) < 1e-3,
'Incorrect silhouette value')