deprecation notices

src/contractor/contractor.cpp

@@ -44,7 +44,8 @@ int Contractor::Run()
 {
     if (config.core_factor)
     {
-        util::Log(logWARNING) << "Using core factor is deprecated and will be ignored. Falling back to CH.";
+        util::Log(logWARNING)
+            << "Using core factor is deprecated and will be ignored. Falling back to CH.";
         config.core_factor = 1.0;
     }
 

src/tools/contract.cpp

@@ -49,7 +49,7 @@ return_code parseArguments(int argc,
         "Number of threads to use")(
         "core,k",
         boost::program_options::value<double>(&contractor_config.core_factor)->default_value(1.0),
-        "Percentage of the graph (in vertices) to contract [0..1]. Will always be 1.0")(
+        "DEPRECATED: Will always be 1.0. Percentage of the graph (in vertices) to contract [0..1].")(
         "segment-speed-file",
         boost::program_options::value<std::vector<std::string>>(
             &contractor_config.updater_config.segment_speed_lookup_paths)

src/tools/routed.cpp

@@ -62,10 +62,8 @@ std::istream &operator>>(std::istream &in, EngineConfig::Algorithm &algorithm)
     in >> token;
     boost::to_lower(token);
 
-    if (token == "ch")
+    if (token == "ch" || token == "corech")
         algorithm = EngineConfig::Algorithm::CH;
-    else if (token == "corech")
-        algorithm = EngineConfig::Algorithm::CoreCH;
     else if (token == "mld")
         algorithm = EngineConfig::Algorithm::MLD;
     else