cartodb4/crankshaft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change function name to match requirements

Browse Source
This commit is contained in:
Andy Eschbacher 2016-05-25 12:01:55 -04:00
parent 7a1eb6b9b6
commit fd7aa4140a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pg/sql/11_markov.sql
View File

@ -6,21 +6,21 @@
-- 2 | Pt2 | 11.0 | 13.2 | 12.5 -- 2 | Pt2 | 11.0 | 13.2 | 12.5
-- ... -- ...
-- Sample Function call: -- Sample Function call:
-- SELECT cdb_spatial_markov('SELECT * FROM real_estate', -- SELECT CDB_SpatialMarkov('SELECT * FROM real_estate',
-- Array['date_1', 'date_2', 'date_3']) -- Array['date_1', 'date_2', 'date_3'])
CREATE OR REPLACE FUNCTION CREATE OR REPLACE FUNCTION
cdb_spatial_markov ( CDB_SpatialMarkov (
subquery TEXT, subquery TEXT,
time_cols text[], time_cols TEXT[],
num_time_per_bin int DEFAULT 1, num_classes INT DEFAULT 7,
w_type TEXT DEFAULT 'knn',
num_ngbrs INT DEFAULT 5,
permutations INT DEFAULT 99, permutations INT DEFAULT 99,
geom_col TEXT DEFAULT 'the_geom', geom_col TEXT DEFAULT 'the_geom',
id_col TEXT DEFAULT 'cartodb_id', id_col TEXT DEFAULT 'cartodb_id')
w_type TEXT DEFAULT 'knn', RETURNS TABLE (trend NUMERIC, trend_up NUMERIC, trend_down NUMERIC, volatility NUMERIC, ids INT)
num_ngbrs int DEFAULT 5)
RETURNS TABLE (trend numeric, trend_up numeric, trend_down numeric, volatility numeric, ids int)
AS $$ AS $$
plpy.execute('SELECT cdb_crankshaft._cdb_crankshaft_activate_py()') plpy.execute('SELECT cdb_crankshaft._cdb_crankshaft_activate_py()')
@ -28,7 +28,7 @@ AS $$
## TODO: use named parameters or a dictionary ## TODO: use named parameters or a dictionary
return spatial_markov_trend(subquery, time_cols, num_time_per_bin, permutations, geom_col, id_col, w_type, num_ngbrs) return spatial_markov_trend(subquery, time_cols, permutations, geom_col, id_col, w_type, num_ngbrs)
$$ LANGUAGE plpythonu; $$ LANGUAGE plpythonu;
-- input table format: identical to above but in a predictable format -- input table format: identical to above but in a predictable format