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

update tests and paths

Browse Source
This commit is contained in:
Andy Eschbacher
2016-06-28 10:48:10 -04:00
parent dd0ca9a24f
commit 32515f445e
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ CREATE OR REPLACE FUNCTION
id_col TEXT DEFAULT 'cartodb_id')
RETURNS TABLE (trend NUMERIC, trend_up NUMERIC, trend_down NUMERIC, volatility NUMERIC, rowid INT)
AS $$
plpy.execute('SELECT cdb_crankshaft._cdb_crankshaft_activate_py()')
from crankshaft.space_time_dynamics import spatial_markov_trend

18
src/pg/test/sql/05_markov_test.sql
View File

@@ -10,21 +10,21 @@ SELECT cdb_crankshaft._cdb_random_seeds(1234);
SELECT
m1.cartodb_id,
CASE WHEN m1.cartodb_id = 1 THEN (m2.trend - 0.0714285714286) / 0.0714285714286 < 0.01
WHEN m1.cartodb_id = 2 THEN (m2.trend - 0.222222222222) / 0.222222222222 < 0.01
WHEN m1.cartodb_id = 3 THEN (m2.trend - 0.0526315789474) / 0.0526315789474 < 0.01
CASE WHEN m1.cartodb_id = 1 THEN abs(m2.trend - 0.0714285714286) / 0.0714285714286 < 0.05
WHEN m1.cartodb_id = 2 THEN abs(m2.trend - 0.222222222222) / 0.222222222222 < 0.05
WHEN m1.cartodb_id = 3 THEN abs(m2.trend - 0.0526315789474) / 0.0526315789474 < 0.05
ELSE NULL END As trend_test,
CASE WHEN m1.cartodb_id = 1 THEN (m2.trend_up - 0.0666666666667) / 0.0666666666667 < 0.01
WHEN m1.cartodb_id = 2 THEN (m2.trend_up - 0.181818181818) / 0.181818181818 < 0.01
WHEN m1.cartodb_id = 3 THEN (m2.trend_up - 0.05) / 0.05 < 0.01
CASE WHEN m1.cartodb_id = 1 THEN abs(m2.trend_up - 0.0666666666667) / 0.0666666666667 < 0.05
WHEN m1.cartodb_id = 2 THEN abs(m2.trend_up - 0.181818181818) / 0.181818181818 < 0.05
WHEN m1.cartodb_id = 3 THEN abs(m2.trend_up - 0.05) / 0.05 < 0.05
ELSE NULL END As trend_up_test,
CASE WHEN m1.cartodb_id = 1 THEN m2.trend_down = 0.0
WHEN m1.cartodb_id = 2 THEN m2.trend_down = 0.0
WHEN m1.cartodb_id = 3 THEN m2.trend_down = 0.0
ELSE NULL END As trend_down_test,
CASE WHEN m1.cartodb_id = 1 THEN (m2.volatility - 0.367574633389) / 0.367574633389 < 0.1
WHEN m1.cartodb_id = 2 THEN (m2.volatility - 0.317010832258) / 0.317010832258 < 0.1
WHEN m1.cartodb_id = 3 THEN (m2.volatility - 0.37549966711) / 0.37549966711 < 0.1
CASE WHEN m1.cartodb_id = 1 THEN abs(m2.volatility - 0.367574633389) / 0.367574633389 < 0.1
WHEN m1.cartodb_id = 2 THEN abs(m2.volatility - 0.317010832258) / 0.317010832258 < 0.1
WHEN m1.cartodb_id = 3 THEN abs(m2.volatility - 0.37549966711) / 0.37549966711 < 0.1
ELSE NULL END As volatility_test
FROM markov_usjoin_example As m1
JOIN cdb_crankshaft.CDB_SpatialMarkovTrend('SELECT * FROM markov_usjoin_example ORDER BY cartodb_id DESC', Array['y1995', 'y1996', 'y1997', 'y1998', 'y1999', 'y2000', 'y2001', 'y2002', 'y2003', 'y2004', 'y2005', 'y2006', 'y2007', 'y2008', 'y2009']::text[], 5::int, 'knn'::text, 5::int, 0::int, 'the_geom'::text, 'cartodb_id'::text) As m2

2
src/py/crankshaft/crankshaft/space_time_dynamics/__init__.py
View File

@@ -1,2 +1,2 @@
"""Import all functions from clustering libraries."""
from crankshaft.space_time_dynamics.markov import *
from markov import *