Merge pull request #18 from weikang9009/vec_cor

fix all doctests and require doctests to pass on travis testing

Author: ljwolf

.travis.yml

@@ -45,7 +45,7 @@ install:
 script:
   - python setup.py sdist >/dev/null
   - python setup.py install
-  - nosetests --verbose --with-coverage --cover-package=spint;
+  - nosetests --verbose --with-doctest --with-coverage --cover-package=spint;
 
 notifications:
     email:

spint/count_model.py

@@ -45,18 +45,18 @@ class CountModel(object):
     -------
     >>> from spint.count_model import CountModel
     >>> import libpysal
-    >>> db = libpysal.open(libpysal.examples.get_path('columbus.dbf'),'r')
+    >>> db = libpysal.io.open(libpysal.examples.get_path('columbus.dbf'),'r')
     >>> y =  np.array(db.by_col("HOVAL"))
     >>> y = np.reshape(y, (49,1))
-    >>> self.y = np.round(y).astype(int)
+    >>> y = np.round(y).astype(int)
     >>> X = []
     >>> X.append(db.by_col("INC"))
     >>> X.append(db.by_col("CRIME"))
-    >>> self.X = np.array(X).T
-    >>> model = CountModel(self.y, self.X, family=Poisson())
+    >>> X = np.array(X).T
+    >>> model = CountModel(y, X, family=Poisson())
     >>> results = model.fit('GLM')
     >>> results.params
-    array([3.92159085, 0.01183491, -0.01371397])
+    array([ 3.92159085,  0.01183491, -0.01371397])
 
     """
 

spint/gravity.py

@@ -145,12 +145,12 @@ class BaseGravity(CountModel):
     >>> import numpy as np
     >>> import libpysal
     >>> from spint.gravity import BaseGravity
-    >>> db = libpysal.open(libpysal.examples.get_path('nyc_bikes_ct.csv'))
+    >>> db = libpysal.io.open(libpysal.examples.get_path('nyc_bikes_ct.csv'))
     >>> cost = np.array(db.by_col('tripduration')).reshape((-1,1))
     >>> flows = np.array(db.by_col('count')).reshape((-1,1))
     >>> model = BaseGravity(flows, cost)
     >>> model.params
-    array([ 17.84839637,  -1.68325787])
+    array([17.84839637, -1.68325787])
 
     """
 
@@ -431,15 +431,14 @@ class Gravity(BaseGravity):
     >>> import numpy as np
     >>> import libpysal
     >>> from spint.gravity import Gravity
-    >>> db = libpysal.open(libpysal.examples.get_path('nyc_bikes_ct.csv'))
+    >>> db = libpysal.io.open(libpysal.examples.get_path('nyc_bikes_ct.csv'))
     >>> cost = np.array(db.by_col('tripduration')).reshape((-1,1))
     >>> flows = np.array(db.by_col('count')).reshape((-1,1))
     >>> o_cap = np.array(db.by_col('o_cap')).reshape((-1,1))
     >>> d_cap = np.array(db.by_col('d_cap')).reshape((-1,1))
     >>> model = Gravity(flows, o_cap, d_cap, cost, 'exp')
     >>> model.params
-    array([  3.80050153e+00,   5.54103854e-01,   3.94282921e-01,
-            -2.27091686e-03])
+    array([ 3.80050153e+00,  5.54103854e-01,  3.94282921e-01, -2.27091686e-03])
 
     """
 
@@ -653,7 +652,7 @@ class Production(BaseGravity):
     >>> import numpy as np
     >>> import libpysal
     >>> from spint.gravity import Production
-    >>> db = libpysal.open(libpysal.examples.get_path('nyc_bikes_ct.csv'))
+    >>> db = libpysal.io.open(libpysal.examples.get_path('nyc_bikes_ct.csv'))
     >>> cost = np.array(db.by_col('tripduration')).reshape((-1,1))
     >>> flows = np.array(db.by_col('count')).reshape((-1,1))
     >>> o = np.array(db.by_col('o_tract')).reshape((-1,1))
@@ -867,7 +866,7 @@ class Attraction(BaseGravity):
     >>> import numpy as np
     >>> import libpysal
     >>> from spint.gravity import Attraction
-    >>> db = libpysal.open(libpysal.examples.get_path('nyc_bikes_ct.csv'))
+    >>> db = libpysal.io.open(libpysal.examples.get_path('nyc_bikes_ct.csv'))
     >>> cost = np.array(db.by_col('tripduration')).reshape((-1,1))
     >>> flows = np.array(db.by_col('count')).reshape((-1,1))
     >>> d = np.array(db.by_col('d_tract')).reshape((-1,1))
@@ -1082,9 +1081,9 @@ class Doubly(BaseGravity):
     Example
     -------
     >>> import numpy as np
-    >>> import libpsal
+    >>> import libpysal
     >>> from spint.gravity import Doubly
-    >>> db = libpysal.open(libpysal.examples.get_path('nyc_bikes_ct.csv'))
+    >>> db = libpysal.io.open(libpysal.examples.get_path('nyc_bikes_ct.csv'))
     >>> cost = np.array(db.by_col('tripduration')).reshape((-1,1))
     >>> flows = np.array(db.by_col('count')).reshape((-1,1))
     >>> d = np.array(db.by_col('d_tract')).reshape((-1,1))