diff --git a/src/pg/sql/21_gwr.sql b/src/pg/sql/21_gwr.sql index 5890c8f..2831080 100644 --- a/src/pg/sql/21_gwr.sql +++ b/src/pg/sql/21_gwr.sql @@ -11,3 +11,17 @@ gwr = GWR() return gwr.gwr(subquery, dep_var, ind_vars, bw, fixed, kernel) $$ LANGUAGE plpythonu; + + +CREATE OR REPLACE FUNCTION +CDB_GWR_Predict(subquery text, dep_var text, ind_vars text[], + bw numeric default null, fixed boolean default False, + kernel text default 'bisquare') +RETURNS table(coeffs JSON, stand_errs JSON, t_vals JSON, r_squared numeric, predicted numeric, rowid bigint) +AS $$ + +from crankshaft.regression import gwr_cs + +return gwr_cs.gwr_predict(subquery, dep_var, ind_vars, bw, fixed, kernel) + +$$ LANGUAGE plpythonu; diff --git a/src/pg/sql/29_gwr_predict.sql b/src/pg/sql/29_gwr_predict.sql deleted file mode 100644 index de5fb4d..0000000 --- a/src/pg/sql/29_gwr_predict.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE OR REPLACE FUNCTION -CDB_GWR_PREDICT(subquery text, dep_var text, ind_vars text[], - bw numeric default null, fixed boolean default False, kernel text default 'bisquare') -RETURNS table(coeffs JSON, stand_errs JSON, t_vals JSON, r_squared numeric, predicted numeric, rowid bigint) -AS $$ - -from crankshaft.regression import gwr_cs - -return gwr_cs.gwr_predict(subquery, dep_var, ind_vars, bw, fixed, kernel) - -$$ LANGUAGE plpythonu;