From 6d12797995185e15f39a6fddcd0de5ae68db8f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20S=C3=B6derlind?= Date: Tue, 24 Jun 2025 11:14:31 +0200 Subject: [PATCH] Fix threading bug and clean Triss class --- Triss.py | 7 ++----- TrissSimulator.py | 5 ++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Triss.py b/Triss.py index 4c6c50e..7b50dd0 100644 --- a/Triss.py +++ b/Triss.py @@ -2,11 +2,8 @@ class Triss(object): prize = -1 - def __init__(self, newPrize): - self.prize = newPrize - - def __init__(self): - self.prize = -1 + def __init__(self, prize=-1): + self.prize = prize def setPrize(self, newPrize): self.prize = newPrize diff --git a/TrissSimulator.py b/TrissSimulator.py index fbba626..2f1f8f7 100644 --- a/TrissSimulator.py +++ b/TrissSimulator.py @@ -166,15 +166,18 @@ def generate_ticket_list(): # Length of each interval part_lengths = int(end_index / number_of_threads) + threads = [] + for intervalNumber in range(start_index, number_of_threads): temp_start_interval = part_lengths * intervalNumber temp_end_interval = part_lengths + (part_lengths * intervalNumber) thread = Thread(target=createTrissList, args=(temp_start_interval, temp_end_interval)) thread.start() + threads.append(thread) # Wait for all threads - for intervalNumber in range(0, number_of_threads): + for thread in threads: thread.join() # ------ Threading ------