diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps index f48a94f51614eec8875fb4e67349c32f287ef5ef..4deb030f4fff6f707d1f13ddd2449a38cb5698a7 100644 Binary files a/cmake-build-debug/.ninja_deps and b/cmake-build-debug/.ninja_deps differ diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log index 83ca145268720630459e0d914d8514f1d31c4d14..d84a253170f3e8eec34cea355bbe18721aaed602 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -21,3 +21,10 @@ 1705 5721 7338580934332570 bin/ExampleTests.exe e524054f521ed215 5 1461 7338581194451650 CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.obj e28e202807b1bd82 1462 4949 7338581229232871 bin/ExampleTests.exe e524054f521ed215 +13 199 7338584889609558 CMakeFiles/ExampleTests.dir/src/compt_frequence.c.obj 88329e948dd6858a +6 1398 7338584901610282 CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.obj e28e202807b1bd82 +1398 5008 7338584937578553 bin/ExampleTests.exe e524054f521ed215 +5 1754 7338585540411418 CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.obj e28e202807b1bd82 +1754 5405 7338585576788163 bin/ExampleTests.exe e524054f521ed215 +5 1682 7338586413110088 CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.obj e28e202807b1bd82 +1683 5827 7338586454469850 bin/ExampleTests.exe e524054f521ed215 diff --git a/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.gcda b/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.gcda index 374a7ef35d03e8b0f4a2911346c2f9e4781b526a..21339278fd22430ed400f71cbfcc2e695f299ef8 100644 Binary files a/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.gcda and b/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.gcda differ diff --git a/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.gcno b/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.gcno index 3fbc5dc7d05170331a4c9ca68f8171ef63ec4d61..80d48f4e5180c1171c2d871446f26a978da08429 100644 Binary files a/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.gcno and b/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.gcno differ diff --git a/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.obj b/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.obj index c2ac29df5ef3b5d95035615a5e85aefc58ec4927..b907ba593ee84e5bf6c1826c1697830fefe75aab 100644 Binary files a/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.obj and b/cmake-build-debug/CMakeFiles/ExampleTests.dir/src/compt_frequence.c.obj differ diff --git a/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.gcda b/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.gcda index 272a974469fad903a105526ed3e5790f6fb8c436..7c67050e67d15cca03b70111d93846a857fcf326 100644 Binary files a/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.gcda and b/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.gcda differ diff --git a/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.gcno b/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.gcno index 0119a1ce70f2926669068571243c79cb49707381..7944cf0bb9cd54291a5711dad06d66f2d072c3c4 100644 Binary files a/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.gcno and b/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.gcno differ diff --git a/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.obj b/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.obj index e65713cf2087b4a49c846a1358e43956ba88dabc..1e5cc57ee4f93f73b58b53c581ff77200ab83cf9 100644 Binary files a/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.obj and b/cmake-build-debug/CMakeFiles/ExampleTests.dir/tests/ExampleTests.cpp.obj differ diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index 28bb3da3a9743229ca1af628798a060d7724e239..f8bea588ea5f854ebe0e3fb942ec62073c06b0e8 100644 --- a/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Apr 03 16:35 Romance Daylight Time +Start testing: Apr 03 16:44 Romance Daylight Time ---------------------------------------------------------- -End testing: Apr 03 16:35 Romance Daylight Time +End testing: Apr 03 16:44 Romance Daylight Time diff --git a/cmake-build-debug/bin/ExampleTests.exe b/cmake-build-debug/bin/ExampleTests.exe index 0f3565db156f4ad6b756aadffbc6a865c458ff1e..630807de27ff08813e17dcb3a5449196c10c310e 100644 Binary files a/cmake-build-debug/bin/ExampleTests.exe and b/cmake-build-debug/bin/ExampleTests.exe differ diff --git a/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/src/gtest-all.cc.gcda b/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/src/gtest-all.cc.gcda index 268dba257b01151669340ed1d4bc885a760d6045..0fd7ec19c8ebd00524704102debe6e41a7254d76 100644 Binary files a/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/src/gtest-all.cc.gcda and b/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/src/gtest-all.cc.gcda differ diff --git a/include/compt_frequence.h b/include/compt_frequence.h index dbae499caaae6b08660f8c8ec4326ff5297c8637..b4a46ec577c36eb6e8a34cdaf9f6ef4965c4f1e2 100644 --- a/include/compt_frequence.h +++ b/include/compt_frequence.h @@ -40,5 +40,7 @@ int count_words_in_file(const char *filename); void concatenate_strings(const char *strings[], int num_strings, char *result); void read_and_count_ngrams(FrequencyCounter *counter, const char *filename, int ngram_size); +int compare_word_frequency(const void *a, const void *b); + void mode_interactive(); #endif /* FREQUENCY_COUNTER_H */ diff --git a/tests/ExampleTests.cpp b/tests/ExampleTests.cpp index 4efe77d77bac375e41f585f7ea4ce42f54c08e21..c98708e3eec6a73582d5f988da020e73cd05568f 100644 --- a/tests/ExampleTests.cpp +++ b/tests/ExampleTests.cpp @@ -97,6 +97,19 @@ TEST(ExampleTests, test_concatenate_strings) { EXPECT_STREQ("This is an array of strings ", result); } +TEST(ExampleTests, test_compare_word_frequency) { + WordFrequency a = {"hello", 3}; + WordFrequency b = {"world", 1}; + EXPECT_TRUE(compare_word_frequency(&a, &b) < 0); +} + +TEST(ExampleTests, test_compare_word_frequency_when_equal) { + WordFrequency a = {"hello", 3}; + WordFrequency b = {"world", 3}; + EXPECT_TRUE(compare_word_frequency(&a, &b) < 0); +} + + //TEST(ExampleTests, test_read_and_count_ngrams) { // FrequencyCounter counter; // init_frequency_counter(&counter);