Removing the random_seed parameter, as is no longer necessary, thanks to the working synchronization mechanism

Author: afmurillo

dhalsim/network_attacks/synced_attack.py

@@ -72,14 +72,7 @@ def __init__(self, intermediate_yaml_path: Path, yaml_index: int):
             self.direction = 'None'
 
         self.state = 0
-
-        if 'random_seed' in self.intermediate_yaml:
-            self.logger.debug("Random seed is: " + str(self.intermediate_yaml['random_seed']))
-            random.seed(self.intermediate_yaml['random_seed'])
-            self.db_sleep_time = random.uniform(0.01, 0.1)
-        else:
-            self.logger.debug("No Random seed configured is: " + str(self.intermediate_yaml['random_seed']))
-            self.db_sleep_time = random.uniform(0.01, 0.1)
+        self.db_sleep_time = random.uniform(0.01, 0.1)
 
 
     def sigint_handler(self, sig, frame):

dhalsim/network_events/synced_event.py

@@ -63,14 +63,7 @@ def __init__(self, intermediate_yaml_path: Path, yaml_index: int):
         self.intermediate_event = self.intermediate_yaml["network_events"][self.yaml_index]
 
         self.state = 0
-
-        if 'random_seed' in self.intermediate_yaml:
-            self.logger.debug("Random seed is: " + str(self.intermediate_yaml['random_seed']))
-            random.seed(self.intermediate_yaml['random_seed'])
-            self.db_sleep_time = random.uniform(0.01, 0.1)
-        else:
-            self.logger.debug("No Random seed configured is: " + str(self.intermediate_yaml['random_seed']))
-            self.db_sleep_time = random.uniform(0.01, 0.1)
+        self.db_sleep_time = random.uniform(0.01, 0.1)
 
 
     def main_loop(self):

dhalsim/parser/config_parser.py

@@ -423,10 +423,6 @@ def validate_schema(data: dict) -> dict:
             Optional('noise_scale', default=0.0): And(
                 float,
                 Schema(lambda i: i >= 0, error="'noise_scale' must be positive.")),
-            Optional('random_seed'): Or(
-                float,
-                int
-            ),
             Optional('attacks'): {
                 Optional('device_attacks'): [SchemaParser.device_attacks],
                 Optional('network_attacks'): [SchemaParser.network_attacks],
@@ -714,9 +710,6 @@ def generate_intermediate_yaml(self):
         # Write gaussian noise scale value to intermediate yaml
         if 'noise_scale' in self.data:
             yaml_data['noise_scale'] = self.data['noise_scale']
-        if 'random_seed' in self.data:
-            yaml_data['random_seed'] = self.data['random_seed']
-
 
         # Demand
         yaml_data['demand'] = self.data['demand']

dhalsim/physical_process.py

@@ -120,14 +120,7 @@ def __init__(self, intermediate_yaml):
             self.master_time = -1
 
         self.db_update_string = "UPDATE plant SET value = ? WHERE name = ?"
-
-        if 'random_seed' in self.data:
-            self.logger.info("Random seed is: " + str(self.data['random_seed']))
-            random.seed(self.data['random_seed'])
-            self.db_sleep_time = random.uniform(0.01, 0.1)
-        else:
-            self.logger.info("No Random seed configured is: " + str(self.data['random_seed']))
-            self.db_sleep_time = random.uniform(0.01, 0.1)
+        self.db_sleep_time = random.uniform(0.01, 0.1)
 
         self.logger.info("DB Sleep time: " + str(self.db_sleep_time))
 

dhalsim/python2/generic_plc.py

@@ -230,14 +230,7 @@ def pre_loop(self, sleep=0.5):
         :param sleep:  (Default value = 0.5) The time to sleep after setting everything up
         """
         self.logger.debug(self.intermediate_plc['name'] + ' enters pre_loop')
-
-        if 'random_seed' in self.intermediate_yaml:
-            self.logger.debug("Random seed is: " + str(self.intermediate_yaml['random_seed']))
-            random.seed(self.intermediate_yaml['random_seed'])
-            self.db_sleep_time = random.uniform(0.01, 0.1)
-        else:
-            self.logger.debug("No Random seed configured is: " + str(self.intermediate_yaml['random_seed']))
-            self.db_sleep_time = random.uniform(0.01, 0.1)
+        self.db_sleep_time = random.uniform(0.01, 0.1)
 
         reader = True
 

dhalsim/python2/generic_scada.py

@@ -154,14 +154,7 @@ def pre_loop(self, sleep=0.5):
         :param sleep:  (Default value = 0.5) The time to sleep after setting everything up
         """
         self.logger.debug('SCADA enters pre_loop')
-
-        if 'random_seed' in self.intermediate_yaml:
-            self.logger.debug("Random seed is: " + str(self.intermediate_yaml['random_seed']))
-            random.seed(self.intermediate_yaml['random_seed'])
-            self.db_sleep_time = random.uniform(0.01, 0.1)
-        else:
-            self.logger.debug("No Random seed configured is: " + str(self.intermediate_yaml['random_seed']))
-            self.db_sleep_time = random.uniform(0.01, 0.1)
+        self.db_sleep_time = random.uniform(0.01, 0.1)
 
 
         signal.signal(signal.SIGINT, self.sigint_handler)

examples/anytown_topology/anytown_config.yaml

@@ -8,7 +8,6 @@ simulator: epynet
 demand: pdd
 demand_patterns: demands_anytown_small.csv
 #demand_patterns: demands_anytown_very_small.csv
-random_seed: 42
 #noise_scale: 0.5
 log_level: debug