insurancesimulation: Simplify riskmodel_config input

Author: rht

agents/metainsuranceorg.py

@@ -55,17 +55,7 @@ def init(self, simulation_parameters, agent_parameters):
         self.cash_last_periods = list(np.zeros(4, dtype=int)*self.cash)
 
         rm_config = agent_parameters['riskmodel_config']
-        self.riskmodel = RiskModel(damage_distribution=rm_config["damage_distribution"], \
-                                     expire_immediately=rm_config["expire_immediately"], \
-                                     cat_separation_distribution=rm_config["cat_separation_distribution"], \
-                                     norm_premium=rm_config["norm_premium"], \
-                                     category_number=rm_config["no_categories"], \
-                                     init_average_exposure=rm_config["risk_value_mean"], \
-                                     init_average_risk_factor=rm_config["risk_factor_mean"], \
-                                     init_profit_estimate=rm_config["norm_profit_markup"], \
-                                     margin_of_safety=rm_config["margin_of_safety"], \
-                                     var_tail_prob=rm_config["var_tail_prob"], \
-                                     inaccuracy=rm_config["inaccuracy_by_categ"])
+        self.riskmodel = RiskModel(**rm_config)
 
         self.category_reinsurance = [None for i in range(self.simulation_no_risk_categories)]
         if self.simulation_reinsurance_type == 'non-proportional':

insurancesimulation.py

@@ -123,18 +123,19 @@ def __init__(self, override_no_riskmodels, replic_ID, simulation_parameters, rc_
 
         self.inaccuracy = random.sample(self.inaccuracy, self.simulation_parameters["no_riskmodels"])
 
-        risk_model_configurations = [{"damage_distribution": self.damage_distribution,
-                                      "expire_immediately": self.simulation_parameters["expire_immediately"],
-                                      "cat_separation_distribution": self.cat_separation_distribution,
-                                      "norm_premium": self.norm_premium,
-                                      "no_categories": self.simulation_parameters["no_categories"],
-                                      "risk_value_mean": risk_value_mean,
-                                      "risk_factor_mean": risk_factor_mean,
-                                      "norm_profit_markup": self.simulation_parameters["norm_profit_markup"],
-                                      "margin_of_safety": self.simulation_parameters["riskmodel_margin_of_safety"],
-                                      "var_tail_prob": self.simulation_parameters["value_at_risk_tail_probability"],
-                                      "inaccuracy_by_categ": self.inaccuracy[i]} \
-                                      for i in range(self.simulation_parameters["no_riskmodels"])]
+        risk_model_configurations = [
+            {"damage_distribution": self.damage_distribution,
+             "expire_immediately": self.simulation_parameters["expire_immediately"],
+             "cat_separation_distribution": self.cat_separation_distribution,
+             "norm_premium": self.norm_premium,
+             "category_number": self.simulation_parameters["no_categories"],
+             "init_average_exposure": risk_value_mean,
+             "init_average_risk_factor": risk_factor_mean,
+             "init_profit_estimate": self.simulation_parameters["norm_profit_markup"],
+             "margin_of_safety": self.simulation_parameters["riskmodel_margin_of_safety"],
+             "var_tail_prob": self.simulation_parameters["value_at_risk_tail_probability"],
+             "inaccuracy": self.inaccuracy[i]}
+             for i in range(self.simulation_parameters["no_riskmodels"])]
 
         # prepare setting up agents (to be done from start.py)
         self.agent_parameters = {"insurancefirm": [], "reinsurance": []}    # TODO: rename reinsurance -> reinsurancefirm (also in start.py and below in method accept_agents