From 4f3414c4cc10963d33bcfa0e7830c19960165d67 Mon Sep 17 00:00:00 2001
From: karenzshea <karenzshea@gmail.com>
Date: Thu, 12 Oct 2017 19:12:54 +0200
Subject: [PATCH] remove core factor opt from exclude graph

---
 .../contractor/contract_excludable_graph.hpp  | 19 ++++---------------
 src/contractor/contractor.cpp                 |  5 ++---
 src/tools/contract.cpp                        | 12 ++++++------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/include/contractor/contract_excludable_graph.hpp b/include/contractor/contract_excludable_graph.hpp
index a83fd0a93..fb1d429ef 100644
--- a/include/contractor/contract_excludable_graph.hpp
+++ b/include/contractor/contract_excludable_graph.hpp
@@ -13,12 +13,11 @@ namespace contractor
 {
 
 using GraphFilterAndCore =
-    std::tuple<QueryGraph, std::vector<std::vector<bool>>, std::vector<std::vector<bool>>>;
+    std::tuple<QueryGraph, std::vector<std::vector<bool>>>;
 
 inline auto contractExcludableGraph(ContractorGraph contractor_graph_,
                                     std::vector<EdgeWeight> node_weights,
-                                    const std::vector<std::vector<bool>> &filters,
-                                    const float core_factor = 1.0)
+                                    const std::vector<std::vector<bool>> &filters)
 {
     auto num_nodes = contractor_graph_.GetNumberOfNodes();
     ContractedEdgeContainer edge_container;
@@ -42,7 +41,7 @@ inline auto contractExcludableGraph(ContractorGraph contractor_graph_,
         is_shared_core = contractGraph(contractor_graph,
                                        std::move(always_allowed),
                                        node_weights,
-                                       std::min<float>(BASE_CORE, core_factor));
+                                       BASE_CORE);
 
         // Add all non-core edges to container
         {
@@ -60,26 +59,16 @@ inline auto contractExcludableGraph(ContractorGraph contractor_graph_,
             [&is_shared_core](const NodeID node) { return is_shared_core[node]; });
     }
 
-    std::vector<std::vector<bool>> cores;
     for (const auto &filter : filters)
     {
         auto filtered_core_graph =
             shared_core_graph.Filter([&filter](const NodeID node) { return filter[node]; });
 
-        auto core = contractGraph(
-            filtered_core_graph, is_shared_core, is_shared_core, node_weights, core_factor);
-        if (core_factor == 1.0)
-        {
-            core.clear();
-        }
-        cores.push_back(std::move(core));
-
         edge_container.Merge(toEdges<QueryEdge>(std::move(filtered_core_graph)));
     }
 
     return GraphFilterAndCore{QueryGraph{num_nodes, std::move(edge_container.edges)},
-                              edge_container.MakeEdgeFilters(),
-                              std::move(cores)};
+                              edge_container.MakeEdgeFilters()};
 }
 }
 }
diff --git a/src/contractor/contractor.cpp b/src/contractor/contractor.cpp
index 5366f1e6d..1ef227f26 100644
--- a/src/contractor/contractor.cpp
+++ b/src/contractor/contractor.cpp
@@ -95,11 +95,10 @@ int Contractor::Run()
     QueryGraph query_graph;
     std::vector<std::vector<bool>> edge_filters;
     std::vector<std::vector<bool>> cores;
-    std::tie(query_graph, edge_filters, cores) = contractExcludableGraph(
+    std::tie(query_graph, edge_filters) = contractExcludableGraph(
         toContractorGraph(number_of_edge_based_nodes, std::move(edge_based_edge_list)),
         std::move(node_weights),
-        std::move(node_filters),
-        config.core_factor);
+        std::move(node_filters));
     TIMER_STOP(contraction);
     util::Log() << "Contracted graph has " << query_graph.GetNumberOfEdges() << " edges.";
     util::Log() << "Contraction took " << TIMER_SEC(contraction) << " sec";
diff --git a/src/tools/contract.cpp b/src/tools/contract.cpp
index 9d2f0644f..b1b98768a 100644
--- a/src/tools/contract.cpp
+++ b/src/tools/contract.cpp
@@ -49,12 +49,12 @@ 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),
-        "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)
-            ->composing(),
-        "Lookup files containing nodeA, nodeB, speed data to adjust edge weights")(
+        "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)
+                       ->composing(),
+                   "Lookup files containing nodeA, nodeB, speed data to adjust edge weights")(
         "turn-penalty-file",
         boost::program_options::value<std::vector<std::string>>(
             &contractor_config.updater_config.turn_penalty_lookup_paths)