Skip to content

Commit 8799ccd

Browse files
geraintpalmergeraintpalmer
committed
Remove xrange from tests
1 parent fb7840d commit 8799ccd

5 files changed

Lines changed: 23 additions & 31 deletions

File tree

‎ciw/tests/test_network.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from past.builtins import xrange
2-
31
import unittest
42
import ciw
53
import copy
@@ -73,8 +71,8 @@ def test_init_method(self):
7371
transition_matrix = [[0.2, 0.6, 0.2],
7472
[0.0, 0.0, 0.0],
7573
[0.5, 0.0, 0.0]]
76-
service_centres = [ciw.ServiceCentre(number_of_servers, queueing_capacity, class_change_matrix, schedule) for i in xrange(4)]
77-
customer_classes = [ciw.CustomerClass(arrival_distributions, service_distributions, transition_matrix) for i in xrange(2)]
74+
service_centres = [ciw.ServiceCentre(number_of_servers, queueing_capacity, class_change_matrix, schedule) for i in range(4)]
75+
customer_classes = [ciw.CustomerClass(arrival_distributions, service_distributions, transition_matrix) for i in range(2)]
7876
N = ciw.Network(service_centres, customer_classes)
7977
self.assertEqual(N.service_centres, service_centres)
8078
self.assertEqual(N.customer_classes, customer_classes)

‎ciw/tests/test_node.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from past.builtins import xrange
2-
31
import unittest
42
import ciw
53
from random import seed
@@ -124,7 +122,7 @@ def test_finish_service_method(self):
124122
Q = ciw.Simulation(ciw.create_network(
125123
'ciw/tests/testing_parameters/params.yml'))
126124
N = Q.transitive_nodes[0]
127-
inds = [ciw.Individual(i + 1) for i in xrange(3)]
125+
inds = [ciw.Individual(i + 1) for i in range(3)]
128126
for current_time in [0.01, 0.02, 0.03]:
129127
N.accept(inds[int(current_time*100 - 1)], current_time)
130128
self.assertEqual([str(obs) for obs in N.individuals],
@@ -161,7 +159,7 @@ def test_block_individual_method(self):
161159
Q = ciw.Simulation(ciw.create_network(
162160
'ciw/tests/testing_parameters/params_deadlock.yml'),
163161
deadlock_detector='StateDigraph')
164-
inds = [ciw.Individual(i + 1) for i in xrange(7)]
162+
inds = [ciw.Individual(i + 1) for i in range(7)]
165163
N1 = Q.transitive_nodes[0]
166164
N1.individuals = inds[:6]
167165
N2 = Q.transitive_nodes[1]
@@ -184,7 +182,7 @@ def test_release_method(self):
184182
Q = ciw.Simulation(ciw.create_network(
185183
'ciw/tests/testing_parameters/params.yml'))
186184
N = Q.transitive_nodes[0]
187-
inds = [ciw.Individual(i+1) for i in xrange(3)]
185+
inds = [ciw.Individual(i+1) for i in range(3)]
188186
for current_time in [0.01, 0.02, 0.03]:
189187
N.accept(inds[int(current_time*100 - 1)], current_time)
190188
self.assertEqual([str(obs) for obs in N.individuals],
@@ -205,7 +203,7 @@ def test_begin_service_if_possible_release_method(self):
205203
Q = ciw.Simulation(ciw.create_network(
206204
'ciw/tests/testing_parameters/params_deadlock.yml'),
207205
deadlock_detector='StateDigraph')
208-
inds = [ciw.Individual(i) for i in xrange(30)]
206+
inds = [ciw.Individual(i) for i in range(30)]
209207
Q.transitive_nodes[0].individuals = inds
210208
ind = Q.transitive_nodes[0].individuals[0]
211209
ind.service_time = 3.14
@@ -237,8 +235,8 @@ def test_release_blocked_individual_method(self):
237235
deadlock_detector='StateDigraph')
238236
N1 = Q.transitive_nodes[0]
239237
N2 = Q.transitive_nodes[1]
240-
N1.individuals = [ciw.Individual(i) for i in xrange(N1.c + 3)]
241-
N2.individuals = [ciw.Individual(i + 100) for i in xrange(N2.c + 4)]
238+
N1.individuals = [ciw.Individual(i) for i in range(N1.c + 3)]
239+
N2.individuals = [ciw.Individual(i + 100) for i in range(N2.c + 4)]
242240
for ind in N1.individuals[:2]:
243241
N1.attach_server(N1.find_free_server(), ind)
244242
for ind in N2.individuals[:1]:

‎ciw/tests/test_sampling.py‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from past.builtins import xrange
2-
31
import unittest
42
import ciw
53
from random import seed, random, choice
@@ -72,7 +70,7 @@ def test_sampling_uniform_dist_hypothesis(self, u, rm):
7270
}
7371
Q = ciw.Simulation(ciw.create_network(params))
7472
Nu = Q.transitive_nodes[0]
75-
for itr in xrange(10): # Because repition happens in the simulation
73+
for itr in range(10): # Because repition happens in the simulation
7674
self.assertTrue(ul <= Nu.simulation.service_times[Nu.id_number][0]() <= uh)
7775
self.assertTrue(ul <= Nu.simulation.inter_arrival_times[Nu.id_number][0]() <= uh)
7876

@@ -149,7 +147,7 @@ def test_sampling_deterministic_dist_hypothesis(self, d, rm):
149147
}
150148
Q = ciw.Simulation(ciw.create_network(params))
151149
Nd = Q.transitive_nodes[0]
152-
for itr in xrange(10): # Because repition happens in the simulation
150+
for itr in range(10): # Because repition happens in the simulation
153151
self.assertEqual(Nd.simulation.service_times[Nd.id_number][0](), d)
154152
self.assertEqual(Nd.simulation.inter_arrival_times[Nd.id_number][0](), d)
155153

@@ -218,7 +216,7 @@ def test_sampling_triangular_dist_hypothesis(self, t, rm):
218216
}
219217
Q = ciw.Simulation(ciw.create_network(params))
220218
Nt = Q.transitive_nodes[0]
221-
for itr in xrange(10): # Because repition happens in the simulation
219+
for itr in range(10): # Because repition happens in the simulation
222220
self.assertTrue(tl <= Nt.simulation.service_times[Nt.id_number][0]() <= th)
223221
self.assertTrue(tl <= Nt.simulation.inter_arrival_times[Nt.id_number][0]() <= th)
224222

@@ -295,7 +293,7 @@ def test_sampling_exponential_dist_hypothesis(self, e, rm):
295293
}
296294
Q = ciw.Simulation(ciw.create_network(params))
297295
Ne = Q.transitive_nodes[0]
298-
for itr in xrange(10): # Because repition happens in the simulation
296+
for itr in range(10): # Because repition happens in the simulation
299297
self.assertTrue(Ne.simulation.service_times[Ne.id_number][0]() >= 0.0)
300298
self.assertTrue(Ne.simulation.inter_arrival_times[Ne.id_number][0]() >= 0.0)
301299

@@ -342,7 +340,7 @@ def test_sampling_gamma_dist_hypothesis(self, ga, gb, rm):
342340
}
343341
Q = ciw.Simulation(ciw.create_network(params))
344342
Ng = Q.transitive_nodes[0]
345-
for itr in xrange(10): # Because repition happens in the simulation
343+
for itr in range(10): # Because repition happens in the simulation
346344
self.assertTrue(Ng.simulation.service_times[Ng.id_number][0]() >= 0.0)
347345
self.assertTrue(Ng.simulation.inter_arrival_times[Ng.id_number][0]() >= 0.0)
348346

@@ -389,7 +387,7 @@ def test_sampling_lognormal_dist_hypothesis(self, lm, lsd, rm):
389387
}
390388
Q = ciw.Simulation(ciw.create_network(params))
391389
Nl = Q.transitive_nodes[0]
392-
for itr in xrange(10): # Because repition happens in the simulation
390+
for itr in range(10): # Because repition happens in the simulation
393391
self.assertTrue(Nl.simulation.service_times[Nl.id_number][0]() >= 0.0)
394392
self.assertTrue(Nl.simulation.inter_arrival_times[Nl.id_number][0]() >= 0.0)
395393

@@ -436,7 +434,7 @@ def test_sampling_weibull_dist_hypothesis(self, wa, wb, rm):
436434
}
437435
Q = ciw.Simulation(ciw.create_network(params))
438436
Nw = Q.transitive_nodes[0]
439-
for itr in xrange(10): # Because repition happens in the simulation
437+
for itr in range(10): # Because repition happens in the simulation
440438
self.assertTrue(Nw.simulation.service_times[Nw.id_number][0]() >= 0.0)
441439
self.assertTrue(Nw.simulation.inter_arrival_times[Nw.id_number][0]() >= 0.0)
442440

@@ -488,7 +486,7 @@ def test_sampling_empirical_dist_hypothesis(self, dist, rm):
488486
}
489487
Q = ciw.Simulation(ciw.create_network(params))
490488
Nem = Q.transitive_nodes[0]
491-
for itr in xrange(10): # Because repition happens in the simulation
489+
for itr in range(10): # Because repition happens in the simulation
492490
self.assertTrue(Nem.simulation.service_times[
493491
Nem.id_number][0]() in set([7.0, 7.1, 7.2, 7.3, 7.7, 7.8]))
494492
self.assertTrue(Nem.simulation.inter_arrival_times[
@@ -554,7 +552,7 @@ def test_sampling_custom_dist(self):
554552
def test_sampling_custom_dist_hypothesis(self, custs, rm):
555553
cust_vals = [round(i, 10) for i in custs]
556554
numprobs = len(cust_vals)
557-
probs = [1.0/numprobs for i in xrange(numprobs)]
555+
probs = [1.0/numprobs for i in range(numprobs)]
558556
my_custom_dist = [list(i) for i in (zip(probs, cust_vals))]
559557
params = {
560558
'Arrival_distributions': [['Custom', my_custom_dist]],
@@ -564,7 +562,7 @@ def test_sampling_custom_dist_hypothesis(self, custs, rm):
564562
}
565563
Q = ciw.Simulation(ciw.create_network(params))
566564
Nc = Q.transitive_nodes[0]
567-
for itr in xrange(10): # Because repition happens in the simulation
565+
for itr in range(10): # Because repition happens in the simulation
568566
self.assertTrue(Nc.simulation.service_times[
569567
Nc.id_number][0]() in set(cust_vals))
570568
self.assertTrue(Nc.simulation.inter_arrival_times[
@@ -678,7 +676,7 @@ def test_sampling_function_dist_hypothesis(self, const, dist, rm):
678676
N1 = Q.transitive_nodes[0]
679677
N2 = Q.transitive_nodes[1]
680678
set_seed(5)
681-
for itr in xrange(10): # Because repition happens in the simulation
679+
for itr in range(10): # Because repition happens in the simulation
682680
self.assertTrue(N1.simulation.inter_arrival_times[N1.id_number][0]()
683681
in set(my_empirical_dist))
684682
self.assertTrue(N2.simulation.inter_arrival_times[N2.id_number][0]() == const)

‎ciw/tests/test_simulation.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from random import seed
44
from hypothesis import given
55
from hypothesis.strategies import floats, integers, lists, random_module
6-
from past.builtins import xrange
76
import os
87
from numpy import random as nprandom
98
from decimal import Decimal
@@ -281,7 +280,7 @@ def test_simultaneous_events_example(self):
281280
self.assertTrue(all([x[6] == 5.0 for x in recs[1:]]))
282281

283282
completed_inds = []
284-
for _ in xrange(1000):
283+
for _ in range(1000):
285284
Q = ciw.Simulation(ciw.create_network(params))
286285
Q.simulate_until_max_time(36)
287286
inds = Q.get_all_individuals()

‎ciw/tests/test_state_tracker.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from past.builtins import xrange
21
import unittest
32
import ciw
43

@@ -46,7 +45,7 @@ def test_base_release_method_within_simulation(self):
4645
'ciw/tests/testing_parameters/params.yml')
4746
Q = ciw.Simulation(Net)
4847
N = Q.transitive_nodes[2]
49-
inds = [ciw.Individual(i) for i in xrange(5)]
48+
inds = [ciw.Individual(i) for i in range(5)]
5049
N.individuals = inds
5150
for ind in N.individuals:
5251
srvr = N.find_free_server()
@@ -128,7 +127,7 @@ def test_naive_release_method_within_simulation(self):
128127
'ciw/tests/testing_parameters/params.yml')
129128
Q = ciw.Simulation(params, tracker='Naive')
130129
N = Q.transitive_nodes[2]
131-
inds = [ciw.Individual(i) for i in xrange(5)]
130+
inds = [ciw.Individual(i) for i in range(5)]
132131
N.individuals = inds
133132
for ind in N.individuals:
134133
srvr = N.find_free_server()
@@ -264,7 +263,7 @@ def test_matrix_release_method_within_simulation(self):
264263
'ciw/tests/testing_parameters/params.yml')
265264
Q = ciw.Simulation(params, tracker='Matrix')
266265
N = Q.transitive_nodes[2]
267-
inds = [ciw.Individual(i) for i in xrange(5)]
266+
inds = [ciw.Individual(i) for i in range(5)]
268267
N.individuals = inds
269268
for ind in N.individuals:
270269
srvr = N.find_free_server()

0 commit comments

Comments
 (0)