From fdc8e91408fd1458448ed6031c8cfd8d63710018 Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Mon, 18 Nov 2019 14:43:50 +0300 Subject: [PATCH] [search] Tools and documentation now correctly use .jsonl instead of .json. --- search/search_quality/README.txt | 6 +++--- search/search_quality/assessment_tool/main_view.cpp | 2 +- .../booking_dataset_generator/booking_dataset_generator.cpp | 2 +- .../samples_generation_tool/samples_generation_tool.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/search/search_quality/README.txt b/search/search_quality/README.txt index 551819904e..cdcd2f3d91 100644 --- a/search/search_quality/README.txt +++ b/search/search_quality/README.txt @@ -27,17 +27,17 @@ This document describes how to use the tools for search quality analysis. i) Run gen-samples.lisp script to get search queries with lists of vital or relevant responses in JSON format. For example: - ./gen-samples.lisp < samples.lisp > samples.json + ./gen-samples.lisp < samples.lisp > samples.jsonl ii) Run features_collector_tool from the build directory. For example: features_collector_tool --mwm_path path-to-downloaded-maps \ - --json_in samples.json \ + --json_in samples.jsonl \ --stats_path /tmp/stats.txt \ 2>/dev/null >samples.csv - runs search engine on all queries from samples.json, prints + runs search engine on all queries from samples.jsonl, prints useful info to /tmp/stats.txt and generates a CSV file with search engine output on each query. diff --git a/search/search_quality/assessment_tool/main_view.cpp b/search/search_quality/assessment_tool/main_view.cpp index ba9ebfbd9b..6238402c93 100644 --- a/search/search_quality/assessment_tool/main_view.cpp +++ b/search/search_quality/assessment_tool/main_view.cpp @@ -45,7 +45,7 @@ using Relevance = search::Sample::Result::Relevance; namespace { -char const kJSON[] = "JSON files (*.json)"; +char const kJSON[] = "JSON Lines files (*.jsonl)"; } // namespace MainView::MainView(Framework & framework) : m_framework(framework) diff --git a/search/search_quality/booking_dataset_generator/booking_dataset_generator.cpp b/search/search_quality/booking_dataset_generator/booking_dataset_generator.cpp index 2e401a3535..0de3db64bf 100644 --- a/search/search_quality/booking_dataset_generator/booking_dataset_generator.cpp +++ b/search/search_quality/booking_dataset_generator/booking_dataset_generator.cpp @@ -44,7 +44,7 @@ using namespace storage; DEFINE_string(data_path, "", "Path to data directory (resources dir)."); DEFINE_string(mwm_path, "", "Path to mwm files (writable dir)."); -DEFINE_string(out_path, "samples.json", "Path to output samples file."); +DEFINE_string(out_path, "samples.jsonl", "Path to output samples file."); DEFINE_string(dataset_type, "name", "Dataset type: name (search hotel by name) or address (search hotel by address)."); DEFINE_string(address_dataset_path, "", "Path to address dataset."); diff --git a/search/search_quality/samples_generation_tool/samples_generation_tool.cpp b/search/search_quality/samples_generation_tool/samples_generation_tool.cpp index 7e58d7818c..828d304d4e 100644 --- a/search/search_quality/samples_generation_tool/samples_generation_tool.cpp +++ b/search/search_quality/samples_generation_tool/samples_generation_tool.cpp @@ -46,8 +46,8 @@ size_t constexpr kMaxSamplesPerMwm = 20; DEFINE_string(data_path, "", "Path to data directory (resources dir)."); DEFINE_string(mwm_path, "", "Path to mwm files (writable dir)."); -DEFINE_string(out_buildings_path, "buildings.json", "Path to output file for buildings samples."); -DEFINE_string(out_cafes_path, "cafes.json", "Path to output file for cafes samples."); +DEFINE_string(out_buildings_path, "buildings.jsonl", "Path to output file for buildings samples."); +DEFINE_string(out_cafes_path, "cafes.jsonl", "Path to output file for cafes samples."); DEFINE_double(max_distance_to_object, kMaxDistanceToObjectM, "Maximal distance from user position to object (meters)."); DEFINE_double(min_viewport_size, kMinViewportSizeM, "Minimal size of viewport (meters).");