refactor(model): moved input validation into own method within Model

Author: amyheather

simulation/model.py

@@ -380,6 +380,9 @@ def __init__(self, param, run_number):
         self.param = param
         self.run_number = run_number
 
+        # Check validity of provided parameters
+        self.valid_inputs()
+
         # Create simpy environment and resource
         self.env = simpy.Environment()
         self.nurse = MonitoredResource(self.env,
@@ -404,6 +407,16 @@ def __init__(self, param, run_number):
         self.nurse_consult_time_dist = Exponential(
             mean=self.param.mean_n_consult_time, random_seed=seeds[1])
 
+        # Log model initialisation
+        self.param.logger.log(sim_time=self.env.now, msg='Initialise model:\n')
+        self.param.logger.log(vars(self))
+        self.param.logger.log(sim_time=self.env.now, msg='Parameters:\n ')
+        self.param.logger.log(vars(self.param))
+
+    def valid_inputs(self):
+        """
+        Checks validity of provided parameters.
+        """
         # Define validation rules for attributes
         # Doesn't include number_of_nurses as this is tested by simpy.Resource
         validation_rules = {
@@ -427,12 +440,6 @@ def __init__(self, param, run_number):
                         'equal to 0.'
                     )
 
-        # Log model initialisation
-        self.param.logger.log(sim_time=self.env.now, msg='Initialise model:\n')
-        self.param.logger.log(vars(self))
-        self.param.logger.log(sim_time=self.env.now, msg='Parameters:\n ')
-        self.param.logger.log(vars(self.param))
-
     def generate_patient_arrivals(self):
         """
         Generate patient arrivals.