From 31a4475e7a78f2e9570d90864c57f98453ea3ead Mon Sep 17 00:00:00 2001 From: Melanie Bruns <mbruns42@mail.upb.de> Date: Thu, 17 Aug 2017 10:04:51 +0200 Subject: [PATCH 1/2] Enable runs with 3 different rngSeeds --- allocsimulation.sh | 2 +- default_settings.txt | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/allocsimulation.sh b/allocsimulation.sh index 022b2be5..1591717c 100644 --- a/allocsimulation.sh +++ b/allocsimulation.sh @@ -9,7 +9,7 @@ #CCS --stderr=err.txt #the simulation task -./one.sh -b 1 configurations/evaluation/settingsScenarioRealistic.txt +./one.sh -b 3 configurations/evaluation/settingsScenarioRealistic.txt #archive the reports and console output. Only executed successfully, if the simulation run completes #with enough time left for this to be executed. nice -n 15 tar -czf "result$(date '+%d%m%Y_%H%M%S').tar.gz" out.txt err.txt reports diff --git a/default_settings.txt b/default_settings.txt index 825236da..6dc91056 100644 --- a/default_settings.txt +++ b/default_settings.txt @@ -1,7 +1,7 @@ ## Default settings for all the scenarios we want to use for our evaluation ## For running this simulation with different seeds for the pseudo-random generators, change the prefixes of ## the different Message Generators. For the movement model the MovementModel.rngSeed can be changed -## These seeds should then be pluged-in with run indexing +## These seeds should then be plugged-in with run indexing ## Scenario settings Scenario.updateInterval = 0.1 Scenario.simulateConnections = true @@ -16,6 +16,7 @@ wInterface.transmitRange = 60 # Common settings for all groups Group.movementModel = VoluntaryHelperMovement +MovementModel.rngSeed =[1;2;3] Group.router = EpidemicRouter # Buffer size of 50 MB Group.bufferSize = 50M @@ -196,16 +197,24 @@ Report.reportDir = reports/ # length of the warm up period (simulated seconds) Report.warmup = 0 Report.report1 = ImmediateMessageDelayReport +ImmediateMessageDelayReport.output = reports/%%Scenario.name%%_ImmediateMessageDelayReport_%%MovementModel.rngSeed%%.txt Report.report2 = DeliveryProbabilityReport +DeliveryProbabilityReport.output = reports/%%Scenario.name%%_DeliveryProbabilityReport_%%MovementModel.rngSeed%%.txt Report.report3 = BroadcastDeliveryReport +BroadcastDeliveryReport.output = reports/%%Scenario.name%%_BroadcastDeliveryReport_%%MovementModel.rngSeed%%.txt Report.report4 = MulticastMessageDeliveryReport +MulticastMessageDeliveryReport.output = reports/%%Scenario.name%%_MulticastMessageDeliveryReport_%%MovementModel.rngSeed%%.txt Report.report5 = TrafficReport +TrafficReport.output = reports/%%Scenario.name%%_TrafficReport_%%MovementModel.rngSeed%%.txt Report.report6 = DataSyncReport DataSyncReport.precision=2 +DataSyncReport.output = reports/%%Scenario.name%%_DataSyncReport_%%MovementModel.rngSeed%%.txt Report.report7 = EnergyLevelReport EnergyLevelReport.granularity = 600 +EnergyLevelReport.output = reports/%%Scenario.name%%_EnergyLevelReport_%%MovementModel.rngSeed%%.txt Report.report8 = BufferOccupancyReport BufferOccupancyReport.occupancyInterval = 300 +BufferOccupancyReport.output = reports/%%Scenario.name%%_BufferOccupancyReport_%%MovementModel.rngSeed%%.txt ## Optimization settings -- these affect the speed of the simulation ## see World class for details. -- GitLab From 2960ab9749ae9101de313c565670a3e97c0f22a0 Mon Sep 17 00:00:00 2001 From: Britta Heymann <britta_hey@web.de> Date: Thu, 24 Aug 2017 14:39:31 +0200 Subject: [PATCH 2/2] Save reports in a folder per seed refs #494 --- default_settings.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/default_settings.txt b/default_settings.txt index 6dc91056..637fab6e 100644 --- a/default_settings.txt +++ b/default_settings.txt @@ -197,24 +197,24 @@ Report.reportDir = reports/ # length of the warm up period (simulated seconds) Report.warmup = 0 Report.report1 = ImmediateMessageDelayReport -ImmediateMessageDelayReport.output = reports/%%Scenario.name%%_ImmediateMessageDelayReport_%%MovementModel.rngSeed%%.txt +ImmediateMessageDelayReport.output = reports/%%MovementModel.rngSeed%%/%%Scenario.name%%_ImmediateMessageDelayReport.txt Report.report2 = DeliveryProbabilityReport -DeliveryProbabilityReport.output = reports/%%Scenario.name%%_DeliveryProbabilityReport_%%MovementModel.rngSeed%%.txt +DeliveryProbabilityReport.output = reports/%%MovementModel.rngSeed%%/%%Scenario.name%%_DeliveryProbabilityReport.txt Report.report3 = BroadcastDeliveryReport -BroadcastDeliveryReport.output = reports/%%Scenario.name%%_BroadcastDeliveryReport_%%MovementModel.rngSeed%%.txt +BroadcastDeliveryReport.output = reports/%%MovementModel.rngSeed%%/%%Scenario.name%%_BroadcastDeliveryReport.txt Report.report4 = MulticastMessageDeliveryReport -MulticastMessageDeliveryReport.output = reports/%%Scenario.name%%_MulticastMessageDeliveryReport_%%MovementModel.rngSeed%%.txt +MulticastMessageDeliveryReport.output = reports/%%MovementModel.rngSeed%%/%%Scenario.name%%_MulticastMessageDeliveryReport.txt Report.report5 = TrafficReport -TrafficReport.output = reports/%%Scenario.name%%_TrafficReport_%%MovementModel.rngSeed%%.txt +TrafficReport.output = reports/%%MovementModel.rngSeed%%/%%Scenario.name%%_TrafficReport.txt Report.report6 = DataSyncReport DataSyncReport.precision=2 -DataSyncReport.output = reports/%%Scenario.name%%_DataSyncReport_%%MovementModel.rngSeed%%.txt +DataSyncReport.output = reports/%%MovementModel.rngSeed%%/%%Scenario.name%%_DataSyncReport.txt Report.report7 = EnergyLevelReport EnergyLevelReport.granularity = 600 -EnergyLevelReport.output = reports/%%Scenario.name%%_EnergyLevelReport_%%MovementModel.rngSeed%%.txt +EnergyLevelReport.output = reports/%%MovementModel.rngSeed%%/%%Scenario.name%%_EnergyLevelReport.txt Report.report8 = BufferOccupancyReport BufferOccupancyReport.occupancyInterval = 300 -BufferOccupancyReport.output = reports/%%Scenario.name%%_BufferOccupancyReport_%%MovementModel.rngSeed%%.txt +BufferOccupancyReport.output = reports/%%MovementModel.rngSeed%%/%%Scenario.name%%_BufferOccupancyReport.txt ## Optimization settings -- these affect the speed of the simulation ## see World class for details. -- GitLab