Merge remote-tracking branch 'origin/main' into funnel_method

uno/tools/Options.cpp

@@ -147,7 +147,7 @@ void find_preset(const std::string& preset_name, Options& options) {
  options["LS_scale_duals_with_step_length"] = "no";
  options["protect_actual_reduction_against_roundoff"] = "no";
  }
-  else if (preset_name == "funnelsqp") {
+ else if (preset_name == "funnelsqp") {
  options["constraint_relaxation_strategy"] = "feasibility_restoration";
  options["subproblem"] = "QP";
  options["globalization_mechanism"] = "TR";
@@ -171,6 +171,9 @@ void find_preset(const std::string& preset_name, Options& options) {
  options["funnel_fact"] = "1.25";
  options["funnel_switching_infeasibility_exponent"] = "2";
  }
+ else {
+ throw std::runtime_error("The preset " + preset_name + " is not known.");
+ }
 }
 
 void get_command_line_arguments(int argc, char* argv[], Options& options) {