CiwPython · geraintpalmer · Jun 20, 2016 · Jun 2, 2016 · Jun 20, 2016 · Jun 20, 2016
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@
 *egg-info*
 .coverage
 dist/
-.hypothesis/eval_source/
+.hypothesis/eval_source/
+env/
diff --git a/.hypothesis/examples/09775cf0c5198908/379635829c16b65d b/.hypothesis/examples/09775cf0c5198908/379635829c16b65d
diff --git a/.hypothesis/examples/09775cf0c5198908/9f47c80709ddbdab b/.hypothesis/examples/09775cf0c5198908/9f47c80709ddbdab
diff --git a/.hypothesis/examples/09775cf0c5198908/a03b8168d51f08b8 b/.hypothesis/examples/09775cf0c5198908/a03b8168d51f08b8
diff --git a/.hypothesis/examples/09775cf0c5198908/b80aa24bf5892ac2 b/.hypothesis/examples/09775cf0c5198908/b80aa24bf5892ac2
diff --git a/.hypothesis/examples/0aa385d228f023ee/d3399b7262fb56cb b/.hypothesis/examples/0aa385d228f023ee/d3399b7262fb56cb
diff --git a/.hypothesis/examples/270079fd09aeb52f/26d49d52f8bccf2c b/.hypothesis/examples/270079fd09aeb52f/26d49d52f8bccf2c
diff --git a/.hypothesis/examples/270079fd09aeb52f/4df10856d6761249 b/.hypothesis/examples/270079fd09aeb52f/4df10856d6761249
diff --git a/.hypothesis/examples/270079fd09aeb52f/69a6af74229bed77 b/.hypothesis/examples/270079fd09aeb52f/69a6af74229bed77
diff --git a/.hypothesis/examples/270079fd09aeb52f/dbce28b3a773624c b/.hypothesis/examples/270079fd09aeb52f/dbce28b3a773624c
diff --git a/.hypothesis/examples/270079fd09aeb52f/dc1e81e206d41fbe b/.hypothesis/examples/270079fd09aeb52f/dc1e81e206d41fbe
diff --git a/.hypothesis/examples/270079fd09aeb52f/ddd3de213e2887d5 b/.hypothesis/examples/270079fd09aeb52f/ddd3de213e2887d5
diff --git a/.hypothesis/examples/270079fd09aeb52f/f54fb6a1a006207d b/.hypothesis/examples/270079fd09aeb52f/f54fb6a1a006207d
diff --git a/...xamples/fabf589bf8d75544/31cd3f2a0f974e08 → ...xamples/330452c2d6c22df4/31cd3f2a0f974e08 b/...xamples/fabf589bf8d75544/31cd3f2a0f974e08 → ...xamples/330452c2d6c22df4/31cd3f2a0f974e08
diff --git a/.hypothesis/examples/330452c2d6c22df4/59bffa4336791568 b/.hypothesis/examples/330452c2d6c22df4/59bffa4336791568
diff --git a/.hypothesis/examples/330452c2d6c22df4/690dca1ff62134d6 b/.hypothesis/examples/330452c2d6c22df4/690dca1ff62134d6
diff --git a/.hypothesis/examples/330452c2d6c22df4/afbedf2e052c4cec b/.hypothesis/examples/330452c2d6c22df4/afbedf2e052c4cec
diff --git a/.hypothesis/examples/3c29dce135837836/252b611bdb919e2d b/.hypothesis/examples/3c29dce135837836/252b611bdb919e2d
diff --git a/.hypothesis/examples/3c29dce135837836/c665ae7d6adb0d2a b/.hypothesis/examples/3c29dce135837836/c665ae7d6adb0d2a
diff --git a/.hypothesis/examples/48cf345eed852bde/2aa8bf5054776e2d b/.hypothesis/examples/48cf345eed852bde/2aa8bf5054776e2d
diff --git a/.hypothesis/examples/48cf345eed852bde/474b4b9a5cd00cce b/.hypothesis/examples/48cf345eed852bde/474b4b9a5cd00cce
diff --git a/.hypothesis/examples/48cf345eed852bde/ddf119247b4aca3f b/.hypothesis/examples/48cf345eed852bde/ddf119247b4aca3f
diff --git a/.hypothesis/examples/48cf345eed852bde/f5328cc719115bd6 b/.hypothesis/examples/48cf345eed852bde/f5328cc719115bd6
diff --git a/.hypothesis/examples/58dc838d45bdbf49/22a469db02ae65e8 b/.hypothesis/examples/58dc838d45bdbf49/22a469db02ae65e8
diff --git a/.hypothesis/examples/5c8ba280effba2c9/274e41cb286e9299 b/.hypothesis/examples/5c8ba280effba2c9/274e41cb286e9299
diff --git a/.hypothesis/examples/5c8ba280effba2c9/2a7e5ba7372ed501 b/.hypothesis/examples/5c8ba280effba2c9/2a7e5ba7372ed501
diff --git a/.hypothesis/examples/5c8ba280effba2c9/4964d08dc404175c b/.hypothesis/examples/5c8ba280effba2c9/4964d08dc404175c
diff --git a/.hypothesis/examples/5c8ba280effba2c9/563dad94363e9404 b/.hypothesis/examples/5c8ba280effba2c9/563dad94363e9404
diff --git a/.hypothesis/examples/5c8ba280effba2c9/647f1d39d45131bf b/.hypothesis/examples/5c8ba280effba2c9/647f1d39d45131bf
diff --git a/.hypothesis/examples/5c8ba280effba2c9/781d60b779ecde7d b/.hypothesis/examples/5c8ba280effba2c9/781d60b779ecde7d
diff --git a/.hypothesis/examples/5c8ba280effba2c9/7f0c91c8b9768434 b/.hypothesis/examples/5c8ba280effba2c9/7f0c91c8b9768434
diff --git a/.hypothesis/examples/5c8ba280effba2c9/cf486c910c32ad86 b/.hypothesis/examples/5c8ba280effba2c9/cf486c910c32ad86
diff --git a/.hypothesis/examples/5c8ba280effba2c9/e02ceaec1897c2af b/.hypothesis/examples/5c8ba280effba2c9/e02ceaec1897c2af
diff --git a/.hypothesis/examples/5c8ba280effba2c9/e1e4af0d394cf914 b/.hypothesis/examples/5c8ba280effba2c9/e1e4af0d394cf914
diff --git a/.hypothesis/examples/6212b31374f5bda0/22311dc647d289ae b/.hypothesis/examples/6212b31374f5bda0/22311dc647d289ae
diff --git a/.hypothesis/examples/6212b31374f5bda0/2dfff6e743cec071 b/.hypothesis/examples/6212b31374f5bda0/2dfff6e743cec071
diff --git a/.hypothesis/examples/6212b31374f5bda0/370b18859af37d43 b/.hypothesis/examples/6212b31374f5bda0/370b18859af37d43
diff --git a/.hypothesis/examples/6212b31374f5bda0/5b4c2f464db4d3df b/.hypothesis/examples/6212b31374f5bda0/5b4c2f464db4d3df
diff --git a/.hypothesis/examples/6212b31374f5bda0/6a6b426591e2cb31 b/.hypothesis/examples/6212b31374f5bda0/6a6b426591e2cb31
diff --git a/.hypothesis/examples/6212b31374f5bda0/c849c86d345a7bc2 b/.hypothesis/examples/6212b31374f5bda0/c849c86d345a7bc2
diff --git a/.hypothesis/examples/7c3794ecb2908746/0e0ebd7b08ebbbeb b/.hypothesis/examples/7c3794ecb2908746/0e0ebd7b08ebbbeb
diff --git a/.hypothesis/examples/7c3794ecb2908746/130db70d18ed43b3 b/.hypothesis/examples/7c3794ecb2908746/130db70d18ed43b3
diff --git a/.hypothesis/examples/7c3794ecb2908746/249e5d62af417257 b/.hypothesis/examples/7c3794ecb2908746/249e5d62af417257
diff --git a/.hypothesis/examples/7c3794ecb2908746/257f8b4ed9f3a2db b/.hypothesis/examples/7c3794ecb2908746/257f8b4ed9f3a2db
diff --git a/.hypothesis/examples/7c3794ecb2908746/2f763bbf7573b25f b/.hypothesis/examples/7c3794ecb2908746/2f763bbf7573b25f
diff --git a/.hypothesis/examples/7c3794ecb2908746/302a053988c35a23 b/.hypothesis/examples/7c3794ecb2908746/302a053988c35a23
diff --git a/.hypothesis/examples/7c3794ecb2908746/44f3da043fea3776 b/.hypothesis/examples/7c3794ecb2908746/44f3da043fea3776
diff --git a/.hypothesis/examples/7c3794ecb2908746/5472b8af5a269d1e b/.hypothesis/examples/7c3794ecb2908746/5472b8af5a269d1e
diff --git a/.hypothesis/examples/7c3794ecb2908746/61883e3ab80c3918 b/.hypothesis/examples/7c3794ecb2908746/61883e3ab80c3918
diff --git a/.hypothesis/examples/7c3794ecb2908746/6e3288a6203cb01c b/.hypothesis/examples/7c3794ecb2908746/6e3288a6203cb01c
diff --git a/.hypothesis/examples/7c3794ecb2908746/83c48129a67cf7f2 b/.hypothesis/examples/7c3794ecb2908746/83c48129a67cf7f2
diff --git a/.hypothesis/examples/7c3794ecb2908746/842726a1f97b58d8 b/.hypothesis/examples/7c3794ecb2908746/842726a1f97b58d8
diff --git a/.hypothesis/examples/7c3794ecb2908746/8c07133455454c63 b/.hypothesis/examples/7c3794ecb2908746/8c07133455454c63
diff --git a/.hypothesis/examples/7c3794ecb2908746/95b06c0884933b8f b/.hypothesis/examples/7c3794ecb2908746/95b06c0884933b8f
diff --git a/.hypothesis/examples/7c3794ecb2908746/994a07b553604acd b/.hypothesis/examples/7c3794ecb2908746/994a07b553604acd
diff --git a/.hypothesis/examples/7c3794ecb2908746/9d1cfdfae5739221 b/.hypothesis/examples/7c3794ecb2908746/9d1cfdfae5739221
diff --git a/.hypothesis/examples/7c3794ecb2908746/a69c1cedf54af85c b/.hypothesis/examples/7c3794ecb2908746/a69c1cedf54af85c
diff --git a/.hypothesis/examples/7c3794ecb2908746/c3cf219dafcba99d b/.hypothesis/examples/7c3794ecb2908746/c3cf219dafcba99d
diff --git a/...xamples/a40d01c034da88b1/cd7e1115f6eb8829 → ...xamples/7c3794ecb2908746/cd7e1115f6eb8829 b/...xamples/a40d01c034da88b1/cd7e1115f6eb8829 → ...xamples/7c3794ecb2908746/cd7e1115f6eb8829
diff --git a/.hypothesis/examples/7c3794ecb2908746/d9c2d47a0fe949a9 b/.hypothesis/examples/7c3794ecb2908746/d9c2d47a0fe949a9
diff --git a/.hypothesis/examples/7c3794ecb2908746/e7f82eeb8ecd1849 b/.hypothesis/examples/7c3794ecb2908746/e7f82eeb8ecd1849
diff --git a/.hypothesis/examples/7c3794ecb2908746/ee4dadc5b7a11eb9 b/.hypothesis/examples/7c3794ecb2908746/ee4dadc5b7a11eb9
diff --git a/.hypothesis/examples/7c3794ecb2908746/f2b84b3836dd8263 b/.hypothesis/examples/7c3794ecb2908746/f2b84b3836dd8263
diff --git a/.hypothesis/examples/7c3794ecb2908746/f329179d4f4bf722 b/.hypothesis/examples/7c3794ecb2908746/f329179d4f4bf722
diff --git a/.hypothesis/examples/91baf551f5d1c366/6f5a1b20f7726104 b/.hypothesis/examples/91baf551f5d1c366/6f5a1b20f7726104
diff --git a/.hypothesis/examples/91baf551f5d1c366/93e8767cb804d887 b/.hypothesis/examples/91baf551f5d1c366/93e8767cb804d887
diff --git a/.hypothesis/examples/91baf551f5d1c366/e7d363ef91203276 b/.hypothesis/examples/91baf551f5d1c366/e7d363ef91203276
diff --git a/.hypothesis/examples/93c20f9b841224fe/39582d72ae322f61 b/.hypothesis/examples/93c20f9b841224fe/39582d72ae322f61
diff --git a/.hypothesis/examples/93c20f9b841224fe/3c85f46a982523f2 b/.hypothesis/examples/93c20f9b841224fe/3c85f46a982523f2
diff --git a/.hypothesis/examples/93c20f9b841224fe/65c46e75b9714bfa b/.hypothesis/examples/93c20f9b841224fe/65c46e75b9714bfa
diff --git a/.hypothesis/examples/93c20f9b841224fe/c42343d5a52b6b7d b/.hypothesis/examples/93c20f9b841224fe/c42343d5a52b6b7d
diff --git a/.hypothesis/examples/9b48bdbd81e6d85f/19a5048e18246e2c b/.hypothesis/examples/9b48bdbd81e6d85f/19a5048e18246e2c
diff --git a/.hypothesis/examples/9b48bdbd81e6d85f/af54c9db9dff2218 b/.hypothesis/examples/9b48bdbd81e6d85f/af54c9db9dff2218
diff --git a/.hypothesis/examples/9b48bdbd81e6d85f/d3399b7262fb56cb b/.hypothesis/examples/9b48bdbd81e6d85f/d3399b7262fb56cb
diff --git a/.hypothesis/examples/a40d01c034da88b1/2e2eb4e0cdda39fc b/.hypothesis/examples/a40d01c034da88b1/2e2eb4e0cdda39fc
diff --git a/.hypothesis/examples/a40d01c034da88b1/2e9ed3030f598578 b/.hypothesis/examples/a40d01c034da88b1/2e9ed3030f598578
diff --git a/.hypothesis/examples/a40d01c034da88b1/34851b91dcc435e8 b/.hypothesis/examples/a40d01c034da88b1/34851b91dcc435e8
diff --git a/.hypothesis/examples/a40d01c034da88b1/54dc9704d01f52f8 b/.hypothesis/examples/a40d01c034da88b1/54dc9704d01f52f8
diff --git a/.hypothesis/examples/a40d01c034da88b1/69b51db2bf396d2d b/.hypothesis/examples/a40d01c034da88b1/69b51db2bf396d2d
diff --git a/.hypothesis/examples/a40d01c034da88b1/806aa91ff03b9614 b/.hypothesis/examples/a40d01c034da88b1/806aa91ff03b9614
diff --git a/.hypothesis/examples/a40d01c034da88b1/81ff1af3986f05e3 b/.hypothesis/examples/a40d01c034da88b1/81ff1af3986f05e3
diff --git a/.hypothesis/examples/a40d01c034da88b1/914fb471553aee33 b/.hypothesis/examples/a40d01c034da88b1/914fb471553aee33
diff --git a/.hypothesis/examples/a40d01c034da88b1/a64bc761fe725749 b/.hypothesis/examples/a40d01c034da88b1/a64bc761fe725749
diff --git a/.hypothesis/examples/a40d01c034da88b1/b31fd3df4e01ab57 b/.hypothesis/examples/a40d01c034da88b1/b31fd3df4e01ab57
diff --git a/.hypothesis/examples/a40d01c034da88b1/bbeb7cff16c47d4c b/.hypothesis/examples/a40d01c034da88b1/bbeb7cff16c47d4c
diff --git a/.hypothesis/examples/a40d01c034da88b1/c0d6248587c66f7b b/.hypothesis/examples/a40d01c034da88b1/c0d6248587c66f7b
diff --git a/.hypothesis/examples/a40d01c034da88b1/fd59b88514f719b7 b/.hypothesis/examples/a40d01c034da88b1/fd59b88514f719b7
diff --git a/.hypothesis/examples/c04adff332af426b/0395af1ea40091ce b/.hypothesis/examples/c04adff332af426b/0395af1ea40091ce
diff --git a/.hypothesis/examples/c04adff332af426b/2a4b6464aa1cd1d4 b/.hypothesis/examples/c04adff332af426b/2a4b6464aa1cd1d4
diff --git a/.hypothesis/examples/c04adff332af426b/2b8337d42e8a0d97 b/.hypothesis/examples/c04adff332af426b/2b8337d42e8a0d97
diff --git a/.hypothesis/examples/c04adff332af426b/e204e19592611238 b/.hypothesis/examples/c04adff332af426b/e204e19592611238
diff --git a/.hypothesis/examples/ca67049962958ce1/4b1b22fcd376699a b/.hypothesis/examples/ca67049962958ce1/4b1b22fcd376699a
diff --git a/.hypothesis/examples/ccfed85d73d5ca6f/0d9761e6b98996f2 b/.hypothesis/examples/ccfed85d73d5ca6f/0d9761e6b98996f2
diff --git a/.hypothesis/examples/ccfed85d73d5ca6f/36e8e42502d34ded b/.hypothesis/examples/ccfed85d73d5ca6f/36e8e42502d34ded
diff --git a/.hypothesis/examples/d3348279286776a1/223a3b1db81ce7d2 b/.hypothesis/examples/d3348279286776a1/223a3b1db81ce7d2
diff --git a/.hypothesis/examples/d3348279286776a1/3719655d41b583a0 b/.hypothesis/examples/d3348279286776a1/3719655d41b583a0
diff --git a/.hypothesis/examples/d3348279286776a1/b124a569a948fbbe b/.hypothesis/examples/d3348279286776a1/b124a569a948fbbe
diff --git a/.hypothesis/examples/d3348279286776a1/bc33fbaa46b1daf6 b/.hypothesis/examples/d3348279286776a1/bc33fbaa46b1daf6
diff --git a/.hypothesis/examples/e91f2da987415276/02ac26433f766cb2 b/.hypothesis/examples/e91f2da987415276/02ac26433f766cb2
diff --git a/.hypothesis/examples/e91f2da987415276/0abbde7f77ba6bc4 b/.hypothesis/examples/e91f2da987415276/0abbde7f77ba6bc4
diff --git a/.hypothesis/examples/e91f2da987415276/862bf8ee7fa76bfd b/.hypothesis/examples/e91f2da987415276/862bf8ee7fa76bfd
diff --git a/.hypothesis/examples/e91f2da987415276/ad9c8d3cc9fe097a b/.hypothesis/examples/e91f2da987415276/ad9c8d3cc9fe097a
diff --git a/.hypothesis/examples/f1faefd35ff946b5/366feeaafbca4d07 b/.hypothesis/examples/f1faefd35ff946b5/366feeaafbca4d07
diff --git a/.hypothesis/examples/f1faefd35ff946b5/4a9a5c3e5c6ed79f b/.hypothesis/examples/f1faefd35ff946b5/4a9a5c3e5c6ed79f
diff --git a/.hypothesis/examples/f1faefd35ff946b5/804f0714ecd02a62 b/.hypothesis/examples/f1faefd35ff946b5/804f0714ecd02a62
diff --git a/.hypothesis/unicodedata/8.0.0/charmap.pickle.gz b/.hypothesis/unicodedata/8.0.0/charmap.pickle.gz
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,13 @@
 language: python
 python:
   - 2.7
+  - 3.4
+  - 3.5
 install:
   - pip install -r requirements.txt
   - python setup.py develop
   - pip install coveralls
 script:
   - python doctests.py
   - coverage run --source=ciw -m unittest discover ciw
-after_success: coveralls
+after_success: coveralls
diff --git a/ciw/__init__.py b/ciw/__init__.py
@@ -1,13 +1,15 @@
-from simulation import Simulation
-from data_record import DataRecord
-from server import Server
-from individual import Individual
-from arrival_node import ArrivalNode
-from exit_node import ExitNode
-from node import Node
-from state_tracker import *
-from exactnode import *
-from import_params import *
-from network import *
+from __future__ import absolute_import
 
-__version__ = '0.1.1'
+from .simulation import Simulation
+from .data_record import DataRecord
+from .server import Server
+from .individual import Individual
+from .arrival_node import ArrivalNode
+from .exit_node import ExitNode
+from .node import Node
+from .state_tracker import *
+from .exactnode import *
+from .import_params import *
+from .network import *
+
+__version__ = '0.1.0'
diff --git a/ciw/arrival_node.py b/ciw/arrival_node.py
@@ -1,5 +1,5 @@
 from __future__ import division
-from individual import Individual
+from .individual import Individual
 
 
 class ArrivalNode(object):
@@ -34,6 +34,7 @@ def find_next_event_date(self):
         times = [[self.event_dates_dict[nd+1][cls]
             for cls in range(len(self.event_dates_dict[1]))]
             for nd in range(len(self.event_dates_dict))]
+
         mintimes = [min(obs) for obs in times]
         nd = mintimes.index(min(mintimes))
         cls = times[nd].index(min(times[nd]))

diff --git a/ciw/deadlock_detector.py b/ciw/deadlock_detector.py
@@ -58,7 +58,7 @@ def initialise_at_node(self, node):
         Initialises the state digraph when the node is created.
         Adds the servers of that node if c < Inf.
         """
-        if node.c < 'Inf':
+        if node.c < float('Inf'):
             self.statedigraph.add_nodes_from([str(s)for s in node.servers])
 
     def detect_deadlock(self):

diff --git a/ciw/exactnode.py b/ciw/exactnode.py
@@ -1,5 +1,5 @@
-from node import Node
-from arrival_node import ArrivalNode
+from .node import Node
+from .arrival_node import ArrivalNode
 from decimal import Decimal, getcontext
 
 class ExactNode(Node):

diff --git a/ciw/exit_node.py b/ciw/exit_node.py
@@ -10,8 +10,8 @@ def __init__(self):
         """
         self.individuals = []
         self.id_number = -1
-        self.next_event_date = "Inf"
-        self.node_capacity = "Inf"
+        self.next_event_date = float("Inf")
+        self.node_capacity = float("Inf")
 
     def __repr__(self):
         """
@@ -31,4 +31,4 @@ def update_next_event_date(self):
         Just passes as next_event_date always set to
         the max_simulation_time
         """
-        pass
+        pass
diff --git a/ciw/import_params.py b/ciw/import_params.py
@@ -1,7 +1,7 @@
 import os
 import yaml
 import copy
-from network import *
+from .network import *
 
 
 def create_network(params):
@@ -47,31 +47,34 @@ def create_network_from_dictionary(params_input):
     validify_dictionary(params)
     # Then make the Network object
     arrivals = [params['Arrival_distributions']['Class ' + str(cls)]
-        for cls in xrange(len(params['Arrival_distributions']))]
+        for cls in range(len(params['Arrival_distributions']))]
     services = [params['Service_distributions']['Class ' + str(cls)]
-        for cls in xrange(len(params['Service_distributions']))]
+        for cls in range(len(params['Service_distributions']))]
     transitions = [params['Transition_matrices']['Class ' + str(cls)]
-        for cls in xrange(len(params['Transition_matrices']))]
+        for cls in range(len(params['Transition_matrices']))]
     number_of_classes = params['Number_of_classes']
     number_of_nodes = params['Number_of_nodes']
-    queueing_capacities = params['Queue_capacities']
+    queueing_capacities = [float(i) if i == "Inf" else i for i in params['Queue_capacities']]
     class_change_matrices = params.get('Class_change_matrices',
-        {'Node ' + str(nd + 1): None for nd in xrange(number_of_nodes)})
+        {'Node ' + str(nd + 1): None for nd in range(number_of_nodes)})
     number_of_servers, schedules, nodes, classes = [], [], [], []
     for c in params['Number_of_servers']:
         if isinstance(c, str) and c != 'Inf':
             number_of_servers.append('schedule')
             schedules.append(params[c])
+        elif c == 'Inf':
+            number_of_servers.append(float(c))
+            schedules.append(None)  
         else:
             number_of_servers.append(c)
             schedules.append(None)    
-    for nd in xrange(number_of_nodes):
+    for nd in range(number_of_nodes):
         nodes.append(ServiceCentre(
             number_of_servers[nd],
             queueing_capacities[nd],
             class_change_matrices['Node ' + str(nd + 1)],
             schedules[nd]))
-    for cls in xrange(number_of_classes):
+    for cls in range(number_of_classes):
         classes.append(CustomerClass(
             arrivals[cls],
             services[cls],
@@ -99,7 +102,7 @@ def fill_out_dictionary(params_input):
         'Name': 'Simulation',
         'Number_of_nodes': len(params['Number_of_servers']),
         'Number_of_classes': len(params['Arrival_distributions']),
-        'Queue_capacities': ['Inf' for _ in xrange(len(
+        'Queue_capacities': ['Inf' for _ in range(len(
             params['Number_of_servers']))],
         }
 
@@ -132,7 +135,7 @@ def validify_dictionary(params):
         len(obs) for obs in params['Arrival_distributions'].values()] + [
         len(obs) for obs in params['Service_distributions'].values()] + [
         len(obs) for obs in params['Transition_matrices'].values()] + [
-        len(row) for row in obs for obs in params['Transition_matrices'].values()] + [
+        len(row) for row in [obs for obs in params['Transition_matrices'].values()][0]] + [
         len(params['Number_of_servers'])] + [
         len(params['Queue_capacities'])]
     if len(set(num_nodes_count)) != 1:

diff --git a/ciw/node.py b/ciw/node.py
@@ -1,13 +1,13 @@
 from __future__ import division
-from random import random, choice
+from random import random
 import os
 from csv import writer
 
 import networkx as nx
 import numpy.random as nprandom
 
-from data_record import DataRecord
-from server import Server
+from .data_record import DataRecord
+from .server import Server
 
 
 class Node(object):
@@ -29,28 +29,25 @@ def __init__(self, id_, simulation):
             self.c = self.schedule[0][1]
             raw_schedule_boundaries = [row[0] for row in raw_schedule]
             self.date_generator = self.date_from_schedule_generator(raw_schedule_boundaries)
-            self.next_shift_change = self.date_generator.next()
+            self.next_shift_change = next(self.date_generator)
         else:
             self.c = node.number_of_servers
             self.schedule = None
-        if node.queueing_capacity == "Inf":
-            self.node_capacity = "Inf"
-        else:
-            self.node_capacity = node.queueing_capacity + self.c
+        self.node_capacity = node.queueing_capacity + self.c
         self.transition_row = [
             self.simulation.network.customer_classes[
-            cls].transition_matrix[id_ - 1] for cls in xrange(
+            cls].transition_matrix[id_ - 1] for cls in range(
             self.simulation.network.number_of_classes)]
         self.class_change = node.class_change_matrix
         self.individuals = []
         self.id_number = id_
         if self.schedule:
             self.next_event_date = self.next_shift_change
         else:
-            self.next_event_date = "Inf"
+            self.next_event_date = float("Inf")
         self.blocked_queue = []
-        if self.c < 'Inf':
-            self.servers = [Server(self, i + 1) for i in xrange(self.c)]
+        if self.c < float('Inf'):
+            self.servers = [Server(self, i + 1) for i in range(self.c)]
         self.highest_id = self.c
         self.simulation.deadlock_detector.initialise_at_node(self)
 
@@ -78,7 +75,7 @@ def add_new_servers(self, shift_indx):
         Add appropriate amount of servers for the given shift.
         """
         num_servers = self.schedule[shift_indx][1]
-        for i in xrange(num_servers):
+        for i in range(num_servers):
             self.highest_id += 1
             self.servers.append(Server(self, self.highest_id))
 
@@ -103,7 +100,7 @@ def begin_service_if_possible_accept(self,
         next_individual.service_time = self.get_service_time(
             next_individual.customer_class)
         if self.free_server():
-            if self.c < 'Inf':
+            if self.c < float('Inf'):
                 self.attach_server(self.find_free_server(),
                                    next_individual)
             next_individual.service_start_date = self.get_now(current_time)
@@ -129,7 +126,7 @@ def begin_service_if_possible_release(self, current_time):
         Begins the service of the next individual, giving
         that customer a service time, end date and node.
         """
-        if self.free_server() and self.c != 'Inf':
+        if self.free_server() and self.c != float('Inf'):
             srvr = self.find_free_server()
             if len([i for i in self.individuals if not i.server]) > 0:
                 ind = [i for i in self.individuals if not i.server][0]
@@ -159,7 +156,7 @@ def change_customer_class(self,individual):
         if self.class_change:
             individual.previous_class = individual.customer_class
             individual.customer_class = nprandom.choice(
-                xrange(len(self.class_change)),
+                range(len(self.class_change)),
                 p = self.class_change[individual.previous_class])
 
     def change_shift(self):
@@ -179,7 +176,7 @@ def change_shift(self):
         self.add_new_servers(indx)
 
         self.c = self.schedule[indx][1]
-        self.next_shift_change = self.date_generator.next()
+        self.next_shift_change = next(self.date_generator)
         self.begin_service_if_possible_change_shift(
             self.next_event_date)
 
@@ -207,7 +204,7 @@ def free_server(self):
         """
         Returns True if a server is available, False otherwise
         """
-        if self.c == 'Inf':
+        if self.c == float('Inf'):
             return True
         return len([svr for svr in self.servers if not svr.busy]) > 0
 
@@ -227,7 +224,7 @@ def find_next_individual(self):
             [ind.service_end_date for ind in self.individuals]
             ) if x == self.next_event_date]
         if len(next_individual_indices) > 1:
-            next_individual_index = choice(next_individual_indices)
+            next_individual_index = nprandom.choice(next_individual_indices)
         else:
             next_individual_index = next_individual_indices[0]
         return self.individuals[next_individual_index], next_individual_index
@@ -289,7 +286,7 @@ def release(self, next_individual_index, next_node, current_time):
         next_individual = self.individuals.pop(next_individual_index)
         next_individual.queue_size_at_departure = len(self.individuals)
         next_individual.exit_date = current_time
-        if self.c < 'Inf':
+        if self.c < float('Inf'):
             self.detatch_server(next_individual.server, next_individual)
         self.write_individual_record(next_individual)
         self.simulation.statetracker.change_state_release(self.id_number,
@@ -342,7 +339,7 @@ def update_next_event_date(self, current_time):
         next_end_service = min([ind.service_end_date
             for ind in self.individuals
             if not ind.is_blocked
-            if ind.service_end_date >= current_time] + ["Inf"])
+            if ind.service_end_date >= current_time] + [float("Inf")])
         if self.schedule:
             next_shift_change = self.next_shift_change
             self.next_event_date = min(

diff --git a/ciw/simulation.py b/ciw/simulation.py
@@ -1,7 +1,7 @@
 from __future__ import division
 import os
 from random import (random, expovariate, uniform, triangular,
-    gammavariate, gauss, lognormvariate, weibullvariate, choice)
+    gammavariate, gauss, lognormvariate, weibullvariate)
 from csv import writer, reader
 import copy
 from decimal import Decimal, getcontext
@@ -10,15 +10,15 @@
 import yaml
 import numpy.random as nprandom
 
-from node import Node
-from exactnode import ExactNode, ExactArrivalNode
-from arrival_node import ArrivalNode
-from exit_node import ExitNode
-from server import Server
-from individual import Individual
-from data_record import DataRecord
-from state_tracker import *
-from deadlock_detector import *
+from .node import Node
+from .exactnode import ExactNode, ExactArrivalNode
+from .arrival_node import ArrivalNode
+from .exit_node import ExitNode
+from .server import Server
+from .individual import Individual
+from .data_record import DataRecord
+from .state_tracker import *
+from .deadlock_detector import *
 
 
 Record = namedtuple('Record', 'id_number customer_class node arrival_date waiting_time service_start_date service_time service_end_date time_blocked exit_date destination queue_size_at_arrival queue_size_at_departure')
@@ -44,7 +44,7 @@ def __init__(self, network, exact=False, name='Simulation', tracker=False, deadl
         self.inter_arrival_times = self.find_times_dict('Arr')
         self.service_times = self.find_times_dict('Ser')
         self.transitive_nodes = [self.NodeType(i + 1, self)
-            for i in xrange(network.number_of_nodes)]
+            for i in range(network.number_of_nodes)]
         self.nodes = ([self.ArrivalNodeType(self)] +
                       self.transitive_nodes +
                       [ExitNode()])
@@ -99,7 +99,7 @@ def find_distributions(self, n, c, kind):
         Finds distribution functions
         """
         if self.source(c, n, kind) == 'NoArrivals':
-            return lambda : 'Inf'
+            return lambda : float('Inf')
         if self.source(c, n, kind)[0] == 'Uniform':
             return lambda : uniform(self.source(c, n, kind)[1],
                                     self.source(c, n, kind)[2])
@@ -129,8 +129,8 @@ def find_distributions(self, n, c, kind):
         if self.source(c, n, kind)[0] == 'Empirical':
             if isinstance(self.source(c, n, kind)[1], str):
                 empirical_dist = self.import_empirical(self.source(c, n, kind)[1])
-                return lambda : choice(empirical_dist)
-            return lambda : choice(self.source(c, n, kind)[1])
+                return lambda : nprandom.choice(empirical_dist)
+            return lambda : nprandom.choice(self.source(c, n, kind)[1])
 
     def find_next_active_node(self):
         """
@@ -140,7 +140,7 @@ def find_next_active_node(self):
             nd.next_event_date for nd in self.nodes]) if x == min([
             nd.next_event_date for nd in self.nodes])]
         if len(next_active_node_indices) > 1:
-            return self.nodes[choice(next_active_node_indices)]
+            return self.nodes[nprandom.choice(next_active_node_indices)]
         return self.nodes[next_active_node_indices[0]]
 
     def find_times_dict(self, kind):
@@ -150,8 +150,8 @@ def find_times_dict(self, kind):
         """
         return {node+1: {
             cls: self.find_distributions(node, cls, kind)
-            for cls in xrange(self.network.number_of_classes)}
-            for node in xrange(self.network.number_of_nodes)}
+            for cls in range(self.network.number_of_classes)}
+            for node in range(self.network.number_of_nodes)}
 
     def get_all_individuals(self):
         """