set up argtypes for shortest_path_n()

- it was for shortest_path(), which is not the path engine used
  for the current Path4GMNS;
- remove some deprecated functions, calls and comments in classes.py;
- update docstrings for class Column and class ColumnVec (for better
  understanding of these two data structures);
- change version number to 0.7.5.

Author: jdlph

path4gmns/__init__.py

@@ -4,7 +4,7 @@
 from .utils import *
 
 
-__version__ = '0.7.4'
+__version__ = '0.7.5'
 
 
 # print out the current version

path4gmns/classes.py

@@ -305,7 +305,7 @@ def allocate_for_CAPI(self):
         to_node_no_array = [link.to_node_seq_no for link in self.link_list]
         link_cost_array = [link.cost for link in self.link_list]
 
-        # initialize others as numpy arrays directly
+        # initialize others
         queue_next = [0] * node_size
         first_link_from = [-1] * node_size
         last_link_from = [-1] * node_size
@@ -324,8 +324,6 @@ def allocate_for_CAPI(self):
             last_link_from[i] = j
 
         # setup allowed uses
-        # allowed_uses = [''] * link_size
-        # self._setup_allowed_use(allowed_uses)
         allowed_uses = [link.allowed_uses for link in self.link_list]
 
         # set up arrays using ctypes
@@ -569,7 +567,7 @@ def set_agent_type_name(self, at_name):
 
 
 class Column:
-
+    """ column is path """
     def __init__(self, seq_no=-1):
         self.seq_no = seq_no
         self.vol = 0
@@ -656,7 +654,13 @@ def set_geometry(self, g):
 
 
 class ColumnVec:
+    """ column pool for (at, dp, oz, dz)
 
+    where, at is agent type id,
+           dp is demand period id,
+           oz is origin zone id,
+           dz is destination zone id.
+    """
     def __init__(self):
         self.od_vol = 0
         self.route_fixed = False
@@ -1257,7 +1261,7 @@ def get_agent_orig_node_id(self, agent_id):
         return self.network.get_agent_orig_node_id(agent_id)
 
     def get_agent_dest_node_id(self, agent_id):
-        """ return the destnation node id of an agent
+        """ return the destination node id of an agent
 
         exception will be handled by _get_agent() in class Network
         """
@@ -1451,7 +1455,7 @@ def get_agent_orig_node_id(self, agent_id):
         return self._base_assignment.get_agent_orig_node_id(agent_id)
 
     def get_agent_dest_node_id(self, agent_id):
-        """ return the destnation node id of an agent """
+        """ return the destination node id of an agent """
         return self._base_assignment.get_agent_dest_node_id(agent_id)
 
     def get_agent_node_path(self, agent_id):

path4gmns/path.py

@@ -38,7 +38,7 @@
 _cdll = ctypes.cdll.LoadLibrary(_dll_file)
 
 # set up the argument types for the shortest path function in dll.
-_cdll.shortest_path.argtypes = [
+_cdll.shortest_path_n.argtypes = [
     ctypes.c_int,
     ctypes.c_int,
     ctypes.POINTER(ctypes.c_int),

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="path4gmns",
-    version="0.7.4",
+    version="0.7.5",
     author="Dr. Xuesong Zhou, Dr. Peiheng Li",
     author_email="xzhou74@asu.edu, jdlph@hotmail.com",
     description="An open-source, cross-platform, lightweight, and fast Python\