diff --git a/src/clients.py b/src/clients.py index 2326836..2f55d48 100644 --- a/src/clients.py +++ b/src/clients.py @@ -4,5 +4,5 @@ from apps import Application class Client: def __init__(self): self.startSlices: list[int] = [] - self.lengthOfTransmission:int = 0 - self.application: Application = Application() \ No newline at end of file + self.lengthOfTransmission: int = 0 + self.application: Application = Application() diff --git a/src/main.py b/src/main.py index b416c1b..fc11552 100644 --- a/src/main.py +++ b/src/main.py @@ -1,7 +1,6 @@ from pprint import pprint from scenarioplanner import Scenarioplanner -from src import scenarioplanner def preparesimulation() -> Scenarioplanner: @@ -9,6 +8,8 @@ def preparesimulation() -> Scenarioplanner: scenarioplanner.simulationLength = 120 scenarioplanner.createapplications() scenarioplanner.createclients(1000) + print("Number of Birbnetes clients: " + str(scenarioplanner.statsModule.birbnetesClients)) + print("Number of Videochat clients: " + str(scenarioplanner.statsModule.videochatClients)) return scenarioplanner diff --git a/src/scenarioplanner.py b/src/scenarioplanner.py index 2a5bbaf..9cdc995 100644 --- a/src/scenarioplanner.py +++ b/src/scenarioplanner.py @@ -56,6 +56,7 @@ class Scenarioplanner: currentclient: Client = Client() currentclient.lengthOfTransmission = random.randint(1, self.maxLengthofTransmission) numoftransmissions: int = random.randint(1, 10) + currentclient.application = self.pickapplicationforclient() for j in range(numoftransmissions): currentclient.startSlices.append( random.randint(1, self.simulationLength - self.maxLengthofTransmission))