From 998db5c144bb0edddae0adaad4f1d9bcf1cbc154 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Thu, 3 Sep 2015 17:04:34 +0200 Subject: [PATCH] preprocessor: make ramsey_policy/ramsey_model and discretionary_policy mutually exclusive. closes #1047 --- ModFile.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ModFile.cc b/ModFile.cc index f14c7b47..6b376764 100644 --- a/ModFile.cc +++ b/ModFile.cc @@ -141,6 +141,13 @@ ModFile::checkPass() exit(EXIT_FAILURE); } + if ((mod_file_struct.ramsey_model_present || mod_file_struct.ramsey_policy_present) + && mod_file_struct.discretionary_policy_present) + { + cerr << "ERROR: You cannot use the discretionary_policy command when you use either rasmey_model or ramsey_policy and vice versa" << endl; + exit(EXIT_FAILURE); + } + if (((mod_file_struct.ramsey_model_present || mod_file_struct.discretionary_policy_present) && !mod_file_struct.planner_objective_present) || (!(mod_file_struct.ramsey_model_present || mod_file_struct.discretionary_policy_present)