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

adds tests passing for spatial_markov

Browse Source
This commit is contained in:
Andy Eschbacher 2016-06-02 12:52:34 -04:00
parent d1a267febb
commit 54d35c614b
2 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/py/crankshaft/crankshaft/space_time_dynamics/markov.py
View File

@ -9,7 +9,7 @@ import plpy
import crankshaft.pysal_utils as pu import crankshaft.pysal_utils as pu
def spatial_markov_trend(subquery, time_cols, num_classes = 7, def spatial_markov_trend(subquery, time_cols, num_classes = 7,
w_type = 'knn', num_ngbrs = 5, permutations = 999, w_type = 'knn', num_ngbrs = 5, permutations = 0,
geom_col = 'the_geom', id_col = 'cartodb_id'): geom_col = 'the_geom', id_col = 'cartodb_id'):
""" """
Predict the trends of a unit based on: Predict the trends of a unit based on:
@ -55,6 +55,7 @@ def spatial_markov_trend(subquery, time_cols, num_classes = 7,
## build weight ## build weight
weights = pu.get_weight(query_result, w_type) weights = pu.get_weight(query_result, w_type)
weights.transform = 'r'
## prep time data ## prep time data
t_data = get_time_data(query_result, time_cols) t_data = get_time_data(query_result, time_cols)
@ -62,7 +63,6 @@ def spatial_markov_trend(subquery, time_cols, num_classes = 7,
plpy.debug('shape of t_data %d, %d' % t_data.shape) plpy.debug('shape of t_data %d, %d' % t_data.shape)
plpy.debug('number of weight objects: %d, %d' % (weights.sparse).shape) plpy.debug('number of weight objects: %d, %d' % (weights.sparse).shape)
plpy.debug('first num elements: %f' % t_data[0, 0]) plpy.debug('first num elements: %f' % t_data[0, 0])
# ls = ps.lag_spatial(weights, t_data)
sp_markov_result = ps.Spatial_Markov(t_data, sp_markov_result = ps.Spatial_Markov(t_data,
weights, weights,
@ -156,7 +156,7 @@ def get_prob_stats(prob_dist, unit_indices):
Outputs: Outputs:
@param trend_up ndarray(float): sum of probabilities for upward @param trend_up ndarray(float): sum of probabilities for upward
movement (relative to the unit index of that prob) movement (relative to the unit index of that prob)
@param trend_down ndarray(float): sum of probabilities for downard @param trend_down ndarray(float): sum of probabilities for downward
movement (relative to the unit index of that prob) movement (relative to the unit index of that prob)
@param trend ndarray(float): difference of upward and downward @param trend ndarray(float): difference of upward and downward
movements movements

70
src/py/crankshaft/test/test_space_time_dynamics.py
View File

@ -58,39 +58,39 @@ class SpaceTimeTests(unittest.TestCase):
[ 0. , 0. , 0. , 0.02352941, 0.97647059]]] [ 0. , 0. , 0. , 0.02352941, 0.97647059]]]
) )
# def test_spatial_markov(self): def test_spatial_markov(self):
# """Test Spatial Markov.""" """Test Spatial Markov."""
# data = [ { 'id': d['id'], data = [ { 'id': d['id'],
# 'attr1': d['y1995'], 'attr1': d['y1995'],
# 'attr2': d['y1996'], 'attr2': d['y1996'],
# 'attr3': d['y1997'], 'attr3': d['y1997'],
# 'attr4': d['y1998'], 'attr4': d['y1998'],
# 'attr5': d['y1999'], 'attr5': d['y1999'],
# 'attr6': d['y2000'], 'attr6': d['y2000'],
# 'attr7': d['y2001'], 'attr7': d['y2001'],
# 'attr8': d['y2002'], 'attr8': d['y2002'],
# 'attr9': d['y2003'], 'attr9': d['y2003'],
# 'attr10': d['y2004'], 'attr10': d['y2004'],
# 'attr11': d['y2005'], 'attr11': d['y2005'],
# 'attr12': d['y2006'], 'attr12': d['y2006'],
# 'attr13': d['y2007'], 'attr13': d['y2007'],
# 'attr14': d['y2008'], 'attr14': d['y2008'],
# 'attr15': d['y2009'], 'attr15': d['y2009'],
# 'neighbors': d['neighbors'] } for d in self.neighbors_data] 'neighbors': d['neighbors'] } for d in self.neighbors_data]
# print(str(data[0])) print(str(data[0]))
# plpy._define_result('select', data) plpy._define_result('select', data)
# random_seeds.set_random_seeds(1234) random_seeds.set_random_seeds(1234)
#
# result = std.spatial_markov_trend('subquery', ['y1995', 'y1996', 'y1997', 'y1998', 'y1999', 'y2000', 'y2001', 'y2002', 'y2003', 'y2004', 'y2005', 'y2006', 'y2007', 'y2008', 'y2009'], 7, 'knn', 5, 99, 'the_geom', 'cartodb_id') result = std.spatial_markov_trend('subquery', ['y1995', 'y1996', 'y1997', 'y1998', 'y1999', 'y2000', 'y2001', 'y2002', 'y2003', 'y2004', 'y2005', 'y2006', 'y2007', 'y2008', 'y2009'], 5, 'knn', 5, 0, 'the_geom', 'cartodb_id')
#
# print 'result == None? ', result == None self.assertTrue(result != None)
# result = [(row[0], row[1], row[2], row[3], row[4]) for row in result] result = [(row[0], row[1], row[2], row[3], row[4]) for row in result]
# print result[0] print result[0]
# expected = self.markov_data expected = self.markov_data
# for ([res_trend, res_up, res_down, res_vol, res_id], for ([res_trend, res_up, res_down, res_vol, res_id],
# [exp_trend, exp_up, exp_down, exp_vol, exp_id] [exp_trend, exp_up, exp_down, exp_vol, exp_id]
# ) in zip(result, expected): ) in zip(result, expected):
# self.assertAlmostEqual(res_trend, exp_trend) self.assertAlmostEqual(res_trend, exp_trend)
def test_get_time_data(self): def test_get_time_data(self):
"""Test get_time_data""" """Test get_time_data"""
@ -240,7 +240,7 @@ class SpaceTimeTests(unittest.TestCase):
[ 0.95861858, 0.95774543, 0.98254811, 0.98919472, 0.98684824, 0.98882205 [ 0.95861858, 0.95774543, 0.98254811, 0.98919472, 0.98684824, 0.98882205
, 0.97662234, 0.95601578, 0.94905385, 0.94934888, 0.97152609, 0.97163004 , 0.97662234, 0.95601578, 0.94905385, 0.94934888, 0.97152609, 0.97163004
, 0.9700702, 0.97158948, 0.95884908], , 0.9700702, 0.97158948, 0.95884908],
[ 0.83980439, 0.84726737, 0.85747, 0.85467221, 0.8556751, 0.84818516 [ 0.83980439, 0.84726737, 0.85747, 0.85467221, 0.8556751, 0.84818516
, 0.85265681, 0.84502402, 0.82645665, 0.81743586, 0.83550406, 0.83338919 , 0.85265681, 0.84502402, 0.82645665, 0.81743586, 0.83550406, 0.83338919
, 0.83511679, 0.82136617, 0.80921874], , 0.83511679, 0.82136617, 0.80921874],
[ 0.95118156, 0.9466212, 0.94688098, 0.9508583, 0.9512441, 0.95440787 [ 0.95118156, 0.9466212, 0.94688098, 0.9508583, 0.9512441, 0.95440787
@ -263,6 +263,8 @@ class SpaceTimeTests(unittest.TestCase):
, 1.17025154, 1.18730553, 1.14242645]]) , 1.17025154, 1.18730553, 1.14242645]])
self.assertTrue(np.allclose(result, expected)) self.assertTrue(np.allclose(result, expected))
self.assertTrue(type(result) == type(expected))
self.assertTrue(result.shape == expected.shape)
def test_rebin_data(self): def test_rebin_data(self):
"""Test rebin_data""" """Test rebin_data"""