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

simplify loops to idx; add json.dumps

Browse Source
This commit is contained in:
Taylor Oshan
2016-11-29 09:16:01 -07:00
parent 8aca98433b
commit 4a1efc4e3c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/py/crankshaft/crankshaft/regression/gwr_cs.py
+8 -4
View File
@@ -3,6 +3,7 @@ from gwr.base.gwr import GWR
from gwr.base.sel_bw import Sel_BW from gwr.base.sel_bw import Sel_BW
import plpy import plpy
import crankshaft.pysal_utils as pu import crankshaft.pysal_utils as pu
import json
def gwr(subquery, dep_var, ind_vars, def gwr(subquery, dep_var, ind_vars,
@@ -72,10 +73,13 @@ def gwr(subquery, dep_var, ind_vars,
residuals = model.resid_response residuals = model.resid_response
r_squared = model.localR2 r_squared = model.localR2
for n, row in enumerate(Y): for idx in xrange(n):
coefficients.append({var: model.params[n,k] for k, var in enumerate(ind_vars)}) coefficients.append(json.dumps({var: model.params[idx,k] for k, var in
stand_errs.append({var: model.bse[n,k] for k, var in enumerate(ind_vars)}) enumerate(ind_vars)}))
t_vals.append({var: model.tvalues[n,k] for k, var in enumerate(ind_vars)}) stand_errs.append(json.dumps({var: model.bse[idx,k] for k, var in
enumerate(ind_vars)}))
t_vals.append(json.dumps({var: model.tvalues[idx,k] for k, var in
enumerate(ind_vars)}))
plpy.notice(str(zip(coefficients, stand_errs, t_vals, predicted, residuals, r_squared, rowid))) plpy.notice(str(zip(coefficients, stand_errs, t_vals, predicted, residuals, r_squared, rowid)))
return zip(coefficients, stand_errs, t_vals, predicted, residuals, r_squared, rowid) return zip(coefficients, stand_errs, t_vals, predicted, residuals, r_squared, rowid)