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

switch order of rowid to be last in output signature

Browse Source
This commit is contained in:
Andy Eschbacher 2017-01-04 16:36:46 -05:00
parent dbee19723e
commit b049da4155
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pg/sql/21_gwr.sql
View File

@ -1,7 +1,7 @@
CREATE OR REPLACE FUNCTION CREATE OR REPLACE FUNCTION
CDB_GWR(subquery text, dep_var text, ind_vars text[], CDB_GWR(subquery text, dep_var text, ind_vars text[],
bw numeric default null, fixed boolean default False, kernel text default 'bisquare') bw numeric default null, fixed boolean default False, kernel text default 'bisquare')
RETURNS table(coeffs JSON, stand_errs JSON, t_vals JSON, predicted numeric, residuals numeric, r_squared numeric, rowid bigint, bandwidth numeric) RETURNS table(coeffs JSON, stand_errs JSON, t_vals JSON, predicted numeric, residuals numeric, r_squared numeric, bandwidth numeric, rowid bigint)
AS $$ AS $$
from crankshaft.regression import GWR from crankshaft.regression import GWR

2
src/py/crankshaft/crankshaft/regression/gwr_cs.py
View File

@ -89,4 +89,4 @@ class GWR:
for k, var in enumerate(ind_vars)})) for k, var in enumerate(ind_vars)}))
return zip(coeffs, stand_errs, t_vals, return zip(coeffs, stand_errs, t_vals,
predicted, residuals, r_squared, rowid, bw) predicted, residuals, r_squared, bw, rowid)