Skip to content

Commit 98e8252

Browse files
geraintpalmergeraintpalmer
committed
shorten test cases, tidy up tests
1 parent 93dbcd5 commit 98e8252

6 files changed

Lines changed: 265 additions & 262 deletions

File tree

‎ciw/tests/datafortesting/logs_test_for_simulation/parameters.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Service_distributions:
7070
- 8.0
7171
- - Exponential
7272
- 9.0
73-
Simulation_time: 2500
73+
Simulation_time: 150
7474
Transition_matrices:
7575
Class 0:
7676
- - 0.1

‎ciw/tests/test_arrival_node.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_init_method(self):
2222
2: {0: 0.1218825551, 1: 0.0044003133, 2: 0.2442775601},
2323
3: {0: 0.0819463473, 1: 0.4135097542, 2: 0.7256307839},
2424
4: {0: 0.1738823223, 1: 0.3988184145, 2: 0.2987813628}}
25-
self.assertEqual({nd:{obs:round(N.event_dates_dict[nd][obs], 10)
25+
self.assertEqual({nd: {obs: round(N.event_dates_dict[nd][obs], 10)
2626
for obs in N.event_dates_dict[nd]} for nd in N.event_dates_dict},
2727
dates_dict)
2828

@@ -39,11 +39,11 @@ def test_initialise_event_dates_dict_method(self):
3939
2: {0: 0.0841671381, 1: 0.0328245299, 2: 0.2196023847},
4040
3: {0: 0.2519089068, 1: 0.0573597814, 2: 1.5117882121},
4141
4: {0: 0.8881158889, 1: 0.0560592622, 2: 2.1307650868}}
42-
self.assertEqual({nd:{obs:round(N.event_dates_dict[nd][obs], 10)
42+
self.assertEqual({nd: {obs: round(N.event_dates_dict[nd][obs], 10)
4343
for obs in N.event_dates_dict[nd]} for nd in N.event_dates_dict},
4444
dates_dict_1)
4545
N.initialise_event_dates_dict()
46-
self.assertEqual({nd:{obs:round(N.event_dates_dict[nd][obs], 10)
46+
self.assertEqual({nd: {obs: round(N.event_dates_dict[nd][obs], 10)
4747
for obs in N.event_dates_dict[nd]} for nd in N.event_dates_dict},
4848
dates_dict_2)
4949

@@ -128,7 +128,7 @@ def test_rejection_dict(self):
128128
'Number_of_servers':[1, 1],
129129
'Queue_capacities':[1, 1]}
130130
Q = ciw.Simulation(params)
131-
self.assertEqual(Q.rejection_dict, {1:{0:[]}, 2:{0:[]}})
131+
self.assertEqual(Q.rejection_dict, {1: {0: []}, 2: {0:[]}})
132132
Q.simulate_until_max_time()
133-
self.assertEqual(Q.rejection_dict, {1:{0:[9.0, 12.0, 18.0]}, 2:{0:[12.0, 16.0]}})
133+
self.assertEqual(Q.rejection_dict, {1: {0: [9.0, 12.0, 18.0]}, 2: {0:[12.0, 16.0]}})
134134

‎ciw/tests/test_data_record.py‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ def test_init_method(self):
3636
self.assertEqual(r.queue_size_at_departure, 21)
3737
self.assertEqual(str(r), 'Data Record')
3838

39-
@given(arrival_date=floats(min_value=0.0, max_value=99999.99),
40-
service_time=floats(min_value=0.0, max_value=99999.99),
41-
inter_service_start_date=floats(min_value=0.0, max_value=99999.99),
42-
inter_exit_date=floats(min_value=0.0, max_value=99999.99),
43-
node=integers(),
39+
@given(arrival_date = floats(min_value = 0.0, max_value = 99999.99),
40+
service_time = floats(min_value = 0.0, max_value = 99999.99),
41+
inter_service_start_date = floats(min_value = 0.0, max_value = 99999.99),
42+
inter_exit_date = floats(min_value = 0.0, max_value = 99999.99),
43+
node = integers(),
4444
destination = integers(),
45-
customer_class=integers(),
46-
queue_size_at_arrival=integers(),
47-
queue_size_at_departure=integers())
45+
customer_class = integers(),
46+
queue_size_at_arrival = integers(),
47+
queue_size_at_departure = integers())
4848
def test_init_methodh(self,
4949
arrival_date,
5050
service_time,
@@ -56,9 +56,17 @@ def test_init_methodh(self,
5656
queue_size_at_arrival,
5757
queue_size_at_departure):
5858
# Define parameters
59-
service_start_date = arrival_date+inter_service_start_date
60-
exit_date = service_start_date+inter_exit_date+service_time
61-
r = ciw.DataRecord(arrival_date, service_time, service_start_date, exit_date, node, destination, customer_class, queue_size_at_arrival, queue_size_at_departure)
59+
service_start_date = arrival_date + inter_service_start_date
60+
exit_date = service_start_date + inter_exit_date + service_time
61+
r = ciw.DataRecord(arrival_date,
62+
service_time,
63+
service_start_date,
64+
exit_date,
65+
node,
66+
destination,
67+
customer_class,
68+
queue_size_at_arrival,
69+
queue_size_at_departure)
6270

6371
# The tests
6472
self.assertEqual(r.arrival_date, arrival_date)

‎ciw/tests/test_individual.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def test_repr_method(self):
3838
i = ciw.Individual(3, 6)
3939
self.assertEqual(str(i), 'Individual 3')
4040

41-
@given(id_num=integers(),
42-
customer_class=integers())
41+
@given(id_num = integers(),
42+
customer_class = integers())
4343
def test_init_method_1h(self, id_num, customer_class):
4444
i = ciw.Individual(id_num, customer_class)
4545
self.assertEqual(i.customer_class, customer_class)
@@ -54,7 +54,7 @@ def test_init_method_1h(self, id_num, customer_class):
5454
self.assertEqual(i.queue_size_at_departure, False)
5555
self.assertEqual(i.data_records, {})
5656

57-
@given(id_num=integers())
57+
@given(id_num = integers())
5858
def test_init_method_2h(self, id_num):
5959
i = ciw.Individual(id_num)
6060
self.assertEqual(i.customer_class, 0)
@@ -69,8 +69,8 @@ def test_init_method_2h(self, id_num):
6969
self.assertEqual(i.queue_size_at_departure, False)
7070
self.assertEqual(i.data_records, {})
7171

72-
@given(id_num=integers(),
73-
customer_class=integers())
72+
@given(id_num = integers(),
73+
customer_class = integers())
7474
def test_repr_methodh(self, id_num, customer_class):
7575
i = ciw.Individual(id_num, customer_class)
7676
self.assertEqual(str(i), 'Individual ' + str(id_num))

‎ciw/tests/test_node.py‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def test_finish_service_method(self):
127127
Q = ciw.Simulation(ciw.load_parameters(
128128
'ciw/tests/datafortesting/logs_test_for_simulation/parameters.yml'))
129129
N = Q.transitive_nodes[0]
130-
inds = [ciw.Individual(i+1) for i in xrange(3)]
130+
inds = [ciw.Individual(i + 1) for i in xrange(3)]
131131
for current_time in [0.01, 0.02, 0.03]:
132132
N.accept(inds[int(current_time*100 - 1)], current_time)
133133
self.assertEqual([str(obs) for obs in N.individuals],
@@ -163,7 +163,7 @@ def test_block_individual_method(self):
163163
set_seed(4)
164164
Q = ciw.Simulation(ciw.load_parameters(
165165
'ciw/tests/datafortesting/logs_test_for_deadlock_sim/parameters.yml'))
166-
inds = [ciw.Individual(i+1) for i in xrange(7)]
166+
inds = [ciw.Individual(i + 1) for i in xrange(7)]
167167
N1 = Q.transitive_nodes[0]
168168
N1.individuals = inds[:6]
169169
N2 = Q.transitive_nodes[1]
@@ -194,12 +194,12 @@ def test_release_method(self):
194194
N.update_next_event_date(0.03)
195195
self.assertEqual(round(N.next_event_date, 5), 0.03604)
196196
N.individuals[1].exit_date = 0.04
197-
N.update_next_event_date(N.next_event_date+0.00001)
197+
N.update_next_event_date(N.next_event_date + 0.00001)
198198
self.assertEqual(round(N.next_event_date, 5), 0.03708)
199199
N.release(1, Q.transitive_nodes[1], N.next_event_date)
200200
self.assertEqual([str(obs) for obs in N.individuals],
201201
['Individual 1', 'Individual 3'])
202-
N.update_next_event_date(N.next_event_date+0.00001)
202+
N.update_next_event_date(N.next_event_date + 0.00001)
203203
self.assertEqual(round(N.next_event_date, 5), 0.06447)
204204

205205
def test_begin_service_if_possible_release_method(self):
@@ -228,9 +228,9 @@ def test_begin_service_if_possible_release_method(self):
228228
self.assertEqual(ind.service_end_date, False)
229229
Q.transitive_nodes[0].begin_service_if_possible_release(200.0)
230230
self.assertEqual(ind.arrival_date, 100.0)
231-
self.assertEqual(round(ind.service_time,5), 3.14)
231+
self.assertEqual(round(ind.service_time ,5), 3.14)
232232
self.assertEqual(ind.service_start_date, 200.0)
233-
self.assertEqual(round(ind.service_end_date,5), 203.14)
233+
self.assertEqual(round(ind.service_end_date, 5), 203.14)
234234

235235
def test_release_blocked_individual_method(self):
236236
Q = ciw.Simulation(ciw.load_parameters(
@@ -390,9 +390,9 @@ def test_begin_service_if_possible_accept_method(self):
390390
self.assertEqual(ind.service_end_date, False)
391391
Q.transitive_nodes[0].begin_service_if_possible_accept(ind, 300)
392392
self.assertEqual(ind.arrival_date, 300)
393-
self.assertEqual(round(ind.service_time,5), 0.03382)
393+
self.assertEqual(round(ind.service_time, 5), 0.03382)
394394
self.assertEqual(ind.service_start_date, 300)
395-
self.assertEqual(round(ind.service_end_date,5), 300.03382)
395+
self.assertEqual(round(ind.service_end_date, 5), 300.03382)
396396

397397
def test_kill_server_method(self):
398398
Q = ciw.Simulation(ciw.load_parameters(
@@ -448,7 +448,7 @@ def test_update_next_event_date_method(self):
448448
ind1.service_end_date = 0.5
449449
N.next_event_date = 0.3
450450
N.individuals = [ind1]
451-
N.update_next_event_date(N.next_event_date+0.000001)
451+
N.update_next_event_date(N.next_event_date + 0.000001)
452452
self.assertEqual(N.next_event_date, 0.5)
453453

454454
ind2 = ciw.Individual(2)
@@ -458,12 +458,12 @@ def test_update_next_event_date_method(self):
458458
ind2.exit_date = False
459459

460460
N.individuals = [ind1, ind2]
461-
N.update_next_event_date(N.next_event_date+0.000001)
461+
N.update_next_event_date(N.next_event_date + 0.000001)
462462
self.assertEqual(N.next_event_date, 0.6)
463463

464464
ind2.exit_date = 0.9
465465

466-
N.update_next_event_date(N.next_event_date+0.000001)
466+
N.update_next_event_date(N.next_event_date + 0.000001)
467467
self.assertEqual(N.next_event_date, 'Inf')
468468

469469

@@ -481,10 +481,10 @@ def test_update_next_event_date_method(self):
481481
ind1.service_end_date = 0.5
482482
N.next_event_date = 0.3
483483
N.individuals = [ind1]
484-
N.update_next_event_date(N.next_event_date+0.000001)
484+
N.update_next_event_date(N.next_event_date + 0.000001)
485485
self.assertEqual(N.next_event_date, 0.5)
486486

487-
N.update_next_event_date(N.next_event_date+0.000001)
487+
N.update_next_event_date(N.next_event_date + 0.000001)
488488
self.assertEqual(N.next_event_date, 30)
489489

490490
def test_next_node_method(self):
@@ -530,5 +530,3 @@ def test_write_individual_record_method(self):
530530
self.assertEqual(round(ind.data_records[1][0].blocked, 5), 5.42106)
531531
self.assertEqual(ind.data_records[1][0].exit_date, 9)
532532
self.assertEqual(ind.data_records[1][0].customer_class, 0)
533-
534-

0 commit comments

Comments
 (0)