Merge branch 'master' into taylor_oshan-pysal_gwr

2017-11-02 15:38:54 -04:00
parent 79b6ef59de ce5d1f9e86
commit 2dafc0f80e
37 changed files with 6171 additions and 4 deletions
--- a/src/pg/crankshaft.control
+++ b/src/pg/crankshaft.control
@@ -1,5 +1,5 @@
 comment = 'CartoDB Spatial Analysis extension'
-default_version = '0.5.1'
+default_version = '0.5.2'
 requires = 'plpythonu, postgis'
 superuser = true
 schema = cdb_crankshaft
--- a/src/py/crankshaft/crankshaft/clustering/moran.py
+++ b/src/py/crankshaft/crankshaft/clustering/moran.py
@@ -88,7 +88,7 @@ class Moran:
        """
        params = OrderedDict([("id_col", id_col),
                              ("attr1", numerator),
-                              ("attr2", denominator)
+                              ("attr2", denominator),
                              ("geom_col", geom_col),
                              ("subquery", subquery),
                              ("num_ngbrs", num_ngbrs)])