Create public facing libraries for extractor, contractor and datastore

New libraries libosrm_extract, libosrm_contract, libosrm_store

include/contractor/contractor_config.hpp

@@ -10,17 +10,21 @@ namespace osrm
 namespace contractor
 {
 
-enum class return_code : unsigned
-{
-    ok,
-    fail,
-    exit
-};
-
 struct ContractorConfig
 {
     ContractorConfig() : requested_num_threads(0) {}
 
+    // Infer the output names from the path of the .osrm file
+    void UseDefaultOutputNames()
+    {
+        level_output_path = osrm_input_path.string() + ".level";
+        core_output_path = osrm_input_path.string() + ".core";
+        graph_output_path = osrm_input_path.string() + ".hsgr";
+        edge_based_graph_path = osrm_input_path.string() + ".ebg";
+        edge_segment_lookup_path = osrm_input_path.string() + ".edge_segment_lookup";
+        edge_penalty_path = osrm_input_path.string() + ".edge_penalties";
+    }
+
     boost::filesystem::path config_file_path;
     boost::filesystem::path osrm_input_path;
     boost::filesystem::path profile_path;
@@ -48,13 +52,6 @@ struct ContractorConfig
     std::string debug_geometry_path;
 #endif
 };
-
-struct ContractorOptions
-{
-    static return_code ParseArguments(int argc, char *argv[], ContractorConfig &extractor_config);
-
-    static void GenerateOutputFilesNames(ContractorConfig &extractor_config);
-};
 }
 }
 

include/contractor/processing_chain.hpp

@@ -1,73 +0,0 @@
-#ifndef PROCESSING_CHAIN_HPP
-#define PROCESSING_CHAIN_HPP
-
-#include "contractor/contractor.hpp"
-#include "contractor/contractor_options.hpp"
-#include "contractor/query_edge.hpp"
-#include "extractor/edge_based_edge.hpp"
-#include "util/static_graph.hpp"
-#include "util/deallocating_vector.hpp"
-#include "util/node_based_graph.hpp"
-
-#include <boost/filesystem.hpp>
-
-#include <cstddef>
-
-#include <vector>
-
-struct lua_State;
-
-namespace osrm
-{
-namespace extractor
-{
-struct SpeedProfileProperties;
-struct EdgeBasedNode;
-}
-namespace contractor
-{
-
-/**
-    \brief class of 'prepare' utility.
- */
-class Prepare
-{
-  public:
-    using EdgeData = QueryEdge::EdgeData;
-
-    explicit Prepare(ContractorConfig contractor_config) : config(std::move(contractor_config)) {}
-    Prepare(const Prepare &) = delete;
-    ~Prepare();
-
-    int Run();
-
-  protected:
-    void ContractGraph(const unsigned max_edge_id,
-                       util::DeallocatingVector<extractor::EdgeBasedEdge> &edge_based_edge_list,
-                       util::DeallocatingVector<QueryEdge> &contracted_edge_list,
-                       std::vector<EdgeWeight> &&node_weights,
-                       std::vector<bool> &is_core_node,
-                       std::vector<float> &node_levels) const;
-    void WriteCoreNodeMarker(std::vector<bool> &&is_core_node) const;
-    void WriteNodeLevels(std::vector<float> &&node_levels) const;
-    void ReadNodeLevels(std::vector<float> &contraction_order) const;
-    std::size_t
-    WriteContractedGraph(unsigned number_of_edge_based_nodes,
-                         const util::DeallocatingVector<QueryEdge> &contracted_edge_list);
-    void FindComponents(unsigned max_edge_id,
-                        const util::DeallocatingVector<extractor::EdgeBasedEdge> &edges,
-                        std::vector<extractor::EdgeBasedNode> &nodes) const;
-
-  private:
-    ContractorConfig config;
-    std::size_t
-    LoadEdgeExpandedGraph(const std::string &edge_based_graph_path,
-                          util::DeallocatingVector<extractor::EdgeBasedEdge> &edge_based_edge_list,
-                          const std::string &edge_segment_lookup_path,
-                          const std::string &edge_penalty_path,
-                          const std::string &segment_speed_path);
-};
-}
-}
-
-#endif // PROCESSING_CHAIN_HPP