diff --git a/TODO.md b/TODO.md index 9f1ef035168bdaab417a4730d36690a176471efb..da2b46cdf41792699585469ba65c22f7e99e5abb 100644 --- a/TODO.md +++ b/TODO.md @@ -4,8 +4,9 @@ Aplikace by mÄ›la obsahovat: * [X] Stemming/lematizace. * [x] VĂ˝poÄŤet vah termĹŻ. * [x] Implementace indexovacĂ struktury. -* [ ] VyhodnocenĂ dotazu oproti indexovacĂ struktuĹ™e. +* [x] VyhodnocenĂ dotazu oproti indexovacĂ struktuĹ™e. +* [ ] VyhledávánĂ sekvenÄŤnĂm prĹŻchodem (bez vyuĹľitĂ indexovacĂ struktury; [link](https://moodle-vyuka.cvut.cz/mod/page/view.php?id=71690)). * [ ] WebovĂ˝ interface (zadánĂ dotazu a vizualizace vĂ˝sledku). Work to do: -*[ ] Structure repository according to these guidelines: https://github.com/navdeep-G/samplemod +* [ ] Structure repository according to these guidelines: https://github.com/navdeep-G/samplemod diff --git a/querying/CMakeLists.txt b/querying/CMakeLists.txt index 4b101ac81a1aa739a3f9c06af8098a5e3ad2fc44..60147b6e0381832752a1e21fa6e804f0289ffcb6 100644 --- a/querying/CMakeLists.txt +++ b/querying/CMakeLists.txt @@ -35,19 +35,20 @@ add_subdirectory(lib/SQLiteCpp) # Source files set(SOURCES - src/main.cpp - src/ui_wt/MainPage.cpp + src/calculation/Computor.cpp src/calculation/Computor.h src/calculation/InvertedIndex.cpp src/calculation/InvertedIndex.h - src/util/InvertedIndexJSONParser.cpp src/util/InvertedIndexJSONParser.h - src/calculation/Space.cpp src/calculation/Space.h src/calculation/Query.cpp src/calculation/Query.h - src/calculation/Computor.cpp src/calculation/Computor.h + src/calculation/Space.cpp src/calculation/Space.h src/calculation/WeightedDocument.cpp src/calculation/WeightedDocument.h - src/util/QueryJSONParser.cpp src/util/QueryJSONParser.h - src/exceptions/Exceptions.h src/database/Database.cpp src/database/Database.h + src/database/Document.cpp src/database/Document.h + src/exceptions/Exceptions.h + src/ui/MainPage.cpp src/ui/MainPage.h src/util/ArgumentParser.cpp src/util/ArgumentParser.h - src/database/Document.cpp src/database/Document.h) + src/util/InvertedIndexJSONParser.cpp src/util/InvertedIndexJSONParser.h + src/util/QueryJSONParser.cpp src/util/QueryJSONParser.h + src/main.cpp + ) # Shared libraries set(LIBRARIES @@ -57,7 +58,7 @@ set(LIBRARIES ) # Set target -add_executable(${TARGET_NAME} ${SOURCES} ${HEADERS}) +add_executable(${TARGET_NAME} ${SOURCES}) # Link with libraries target_link_libraries(${TARGET_NAME} ${LIBRARIES}) diff --git a/querying/REQUIREMENTS.md b/querying/REQUIREMENTS.md index 5073eb2234fa498839bb5e18f0b5d38d8b25a2a2..31d2c26922c13cbcba8a38c0405f2e4197d79f30 100644 --- a/querying/REQUIREMENTS.md +++ b/querying/REQUIREMENTS.md @@ -1,7 +1,16 @@ -nlohmann::json - JSON operations - -SQLiteCPP - Database access abstraction - -Qt - UI - -cxxopts - Command line arguments parsing \ No newline at end of file +# PoĹľadavky +- kompilátor podporujĂcĂ minimálnÄ› C++ 17 +- vytvoĹ™it adresář ```lib``` v tomto adresáři pro následujĂcĂ knihovny +- knihovna pro práci s databázĂ SQLite: + - ke staĹľenĂ [ZDE](https://github.com/SRombauts/SQLiteCpp/releases) + - rozbalit do adresáře ```lib``` a sloĹľku pĹ™ejmenovat na ```SQLiteCpp``` +- knihovna pro práci s JSON soubory: + - ke staĹľenĂ [ZDE](https://github.com/nlohmann/json/releases) + - staÄŤĂ stáhnout hlaviÄŤkovĂ˝ soubor ```json.hpp``` a umĂstit ho do adresáře ```lib``` +- knihovna Wt pro webovĂ© GUI: + - ke staĹľenĂ [ZDE](https://www.webtoolkit.eu/wt/download) + - pro nÄ›jakĂ© linuxovĂ© distibuce jsou dostupnĂ© balĂÄŤky, pĹ™ĂpadnÄ› stáhnout z výše uvedenĂ©ho odkazu a nainstalovat +- knihovna pro parsovánĂ argumentĹŻ z pĹ™ĂkazovĂ© řádky: + - ke staĹľenĂ [ZDE](https://github.com/jarro2783/cxxopts/releases) + - staÄŤĂ umĂstit hlaviÄŤkovĂ˝ soubor ```cxxopts.hpp``` do adresáře ```lib``` +- pro sestavenĂ a spuštÄ›nĂ aplikace lze vyuĹľĂt skript ```run.sh``` diff --git a/querying/src/main.cpp b/querying/src/main.cpp index b8d1949920ae78384d79aa9585be16c8d91b5b7c..e5019e46d40435aa7fa2dd37e4b21f680e785dfe 100644 --- a/querying/src/main.cpp +++ b/querying/src/main.cpp @@ -8,7 +8,7 @@ #include "calculation/Computor.h" #include "util/QueryJSONParser.h" #include "util/InvertedIndexJSONParser.h" -#include "src/ui_wt/MainPage.h" +#include "src/ui/MainPage.h" #include "src/database/Database.h" #include "src/database/Document.h" diff --git a/querying/src/ui_wt/MainPage.cpp b/querying/src/ui/MainPage.cpp similarity index 100% rename from querying/src/ui_wt/MainPage.cpp rename to querying/src/ui/MainPage.cpp diff --git a/querying/src/ui_wt/MainPage.h b/querying/src/ui/MainPage.h similarity index 100% rename from querying/src/ui_wt/MainPage.h rename to querying/src/ui/MainPage.h diff --git a/requirements.md b/weight_calculation/REQUIREMENTS.md similarity index 81% rename from requirements.md rename to weight_calculation/REQUIREMENTS.md index 6f34f8f4009895dc1c2e0697786feb5ecea8ad9c..0523af6c47dc3f2751b2baa45907db6802333fe5 100644 --- a/requirements.md +++ b/weight_calculation/REQUIREMENTS.md @@ -1,7 +1,7 @@ # PoĹľadavky - kompilátor podporujĂcĂ minimálnÄ› C++ 11 -- vytvoĹ™it adresář ```lib``` v koĹ™enovĂ©m adresáři projektu pro následujĂcĂ knihovny -- knihovna pro práci s SQLite: +- vytvoĹ™it adresář ```lib``` v tomto adresáři pro následujĂcĂ knihovny +- knihovna pro práci s databázĂ SQLite: - ke staĹľenĂ [ZDE](https://github.com/SRombauts/SQLiteCpp/releases) - rozbalit do adresáře ```lib``` a sloĹľku pĹ™ejmenovat na ```SQLiteCpp``` - knihovna pro práci s JSON soubory: