From 1c99bf23be7fb9784776a097807c1fec6a1f9e5b Mon Sep 17 00:00:00 2001
From: marcheanin <marcheanin1576@gmail.com>
Date: Sun, 14 May 2023 22:09:32 +0300
Subject: [PATCH] rename and fixes

---
 metrics/CMakeLists.txt                   | 5 +++++
 metrics/metrics_headers/TextMetricsLib.h | 3 +--
 metrics/source/TextMetricImpl.cpp        | 7 +++++--
 metrics/tests/src/text_metrics_tests.cpp | 4 ++--
 src/main.cpp                             | 2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/metrics/CMakeLists.txt b/metrics/CMakeLists.txt
index 73da6de..83bc97d 100644
--- a/metrics/CMakeLists.txt
+++ b/metrics/CMakeLists.txt
@@ -3,6 +3,11 @@ add_library(MetricsLib source/TextMetricImpl.cpp source/TokenMetricImpl.cpp)
 target_include_directories(MetricsLib PUBLIC metrics_headers)
 target_link_libraries(MetricsLib PUBLIC ${Boost_LIBRARIES})
 
+add_custom_target(
+        ${PROJECT_NAME}_COVERAGE
+        COMMAND gcovr ${CMAKE_CURRENT_BINARY_DIR} -r ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 #if(BUILD_TESTS)
 add_subdirectory(tests)
 #endif()
\ No newline at end of file
diff --git a/metrics/metrics_headers/TextMetricsLib.h b/metrics/metrics_headers/TextMetricsLib.h
index 16f25d7..bae3a7e 100644
--- a/metrics/metrics_headers/TextMetricsLib.h
+++ b/metrics/metrics_headers/TextMetricsLib.h
@@ -13,7 +13,6 @@
 
 #include <boost/tokenizer.hpp>
 
-
 class ITextMetric{
     virtual void countMetric() = 0;
     virtual void setData(std::string text1, std::string text2) = 0;
@@ -33,7 +32,7 @@ private:
     static std::vector <std::string> tbmTokenizer(const std::string &text);
 };
 
-class LivDistTextMetric : public PrepareDataTextMetric{
+class LevDistTextMetric : public PrepareDataTextMetric{
 public:
     void countMetric() override;
 };
diff --git a/metrics/source/TextMetricImpl.cpp b/metrics/source/TextMetricImpl.cpp
index f9c595b..0727ad0 100644
--- a/metrics/source/TextMetricImpl.cpp
+++ b/metrics/source/TextMetricImpl.cpp
@@ -69,7 +69,7 @@ double PrepareDataTextMetric::getMetric() {
     return metric_res;
 }
 
-void LivDistTextMetric::countMetric(){
+void LevDistTextMetric::countMetric(){
     unsigned long n = tokens1.size();
     unsigned long m = tokens2.size();
     int x, y, z;
@@ -116,5 +116,8 @@ void JaccardTextMetric::countMetric() {
     set_union(s1.begin(), s1.end(), s2.begin(), s2.end(),
               std::inserter(union_sets, union_sets.begin()));
 
-    metric_res = static_cast<double> (intersect_sets.size()) / static_cast<double> (union_sets.size());
+    if (union_sets.empty())
+        metric_res = 0;
+    else
+        metric_res = static_cast<double> (intersect_sets.size()) / static_cast<double> (union_sets.size());
 }
diff --git a/metrics/tests/src/text_metrics_tests.cpp b/metrics/tests/src/text_metrics_tests.cpp
index c906aa5..e8317dd 100644
--- a/metrics/tests/src/text_metrics_tests.cpp
+++ b/metrics/tests/src/text_metrics_tests.cpp
@@ -13,9 +13,9 @@
 
 class LivDistTextMetricTest : public ::testing::Test {
 protected:
-    std::unique_ptr <LivDistTextMetric> livDistTextMetric;
+    std::unique_ptr <LevDistTextMetric> livDistTextMetric;
     void SetUp(){
-        livDistTextMetric = std::make_unique <LivDistTextMetric>();
+        livDistTextMetric = std::make_unique <LevDistTextMetric>();
     }
     void TearDown(){}
 };
diff --git a/src/main.cpp b/src/main.cpp
index b2d44b0..7caaf2e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,7 @@ int main(){
     fin1.close();
     fin2.close();
 
-    LivDistTextMetric livDistTextMetric;
+    LevDistTextMetric livDistTextMetric;
     JaccardTextMetric jaccardTextMetric;
 
     livDistTextMetric.setData(text1, text2);
-- 
GitLab