From 30c428474f6d00e2025d844983ded28526ce3190 Mon Sep 17 00:00:00 2001 From: MinyazevR Date: Sat, 9 Oct 2021 20:16:43 +0500 Subject: [PATCH 01/10] fixed bugs --- mostElemenInArray/mostElemenInArray/main.c | 9 ++-- .../mostElemenInArray.vcxproj | 4 +- .../mostElemenInArray.vcxproj.filters | 4 +- mostElemenInArray/mostElemenInArray/qsort.c | 32 ++++++++----- mostElemenInArray/mostElemenInArray/qsort.h | 2 +- .../mostElemenInArray/qsortTest.c | 48 ------------------- .../mostElemenInArray/qsortTest.h | 5 -- .../mostElemenInArray/qwerty.txt | 1 - 8 files changed, 30 insertions(+), 75 deletions(-) delete mode 100644 mostElemenInArray/mostElemenInArray/qsortTest.c delete mode 100644 mostElemenInArray/mostElemenInArray/qsortTest.h delete mode 100644 mostElemenInArray/mostElemenInArray/qwerty.txt diff --git a/mostElemenInArray/mostElemenInArray/main.c b/mostElemenInArray/mostElemenInArray/main.c index f33fde8..f63eccc 100644 --- a/mostElemenInArray/mostElemenInArray/main.c +++ b/mostElemenInArray/mostElemenInArray/main.c @@ -1,5 +1,5 @@ #include -#include "qsortTest.h" +#include "testQSort.h" #include "testTheMostCommonElement.h" #include "theMostCommonElement.h" #include "qsort.h" @@ -13,7 +13,7 @@ int main() return -1; } FILE* file = NULL; - errno_t err = fopen_s(&file, "qwerty.txt", "r"); + errno_t err = fopen_s(&file, "number.txt", "r"); if (file == NULL || err != 0) { printf("file not found!"); @@ -27,7 +27,7 @@ int main() counter++; } fclose(file); - err = fopen_s(&file, "qwerty.txt", "r"); + err = fopen_s(&file, "number.txt", "r"); if (file == NULL || err != 0) { printf("file not found!"); @@ -38,6 +38,7 @@ int main() { printf("memory is not allocated"); // Can be used return as we are in main() + fclose(file); return -1; } int readNumber = 0; @@ -46,7 +47,7 @@ int main() readNumber++; } fclose(file); - QSort(arrayOfNumber, counter); + qSort(arrayOfNumber, counter); for (int i = 0; i < counter; i++) { printf("%d ", arrayOfNumber[i]); diff --git a/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj b/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj index 1b61ab2..db98dbe 100644 --- a/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj +++ b/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj @@ -141,13 +141,13 @@ - + - + diff --git a/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj.filters b/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj.filters index b509232..55aebe7 100644 --- a/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj.filters +++ b/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj.filters @@ -21,7 +21,7 @@ Исходные файлы - + Исходные файлы @@ -38,7 +38,7 @@ Файлы заголовков - + Файлы заголовков diff --git a/mostElemenInArray/mostElemenInArray/qsort.c b/mostElemenInArray/mostElemenInArray/qsort.c index fe96f42..251e227 100644 --- a/mostElemenInArray/mostElemenInArray/qsort.c +++ b/mostElemenInArray/mostElemenInArray/qsort.c @@ -1,6 +1,6 @@ #include "qsort.h" -// function for sorting by inserts +// Function for sorting by inserts void sortByInserts(int* arrayOfNumber, int initialElement, int endElement) { for (int i = initialElement + 1; i <= endElement; i++) @@ -16,14 +16,9 @@ void sortByInserts(int* arrayOfNumber, int initialElement, int endElement) } } -// function for sorting an array -int smartQSort(int* arrayOfNumber, int initialElement, int endElement) +// Function for sorting an array +void smartQSort(int* arrayOfNumber, int initialElement, int endElement) { - if (endElement - initialElement + 1 < 10) - { - sortByInserts(arrayOfNumber, initialElement, endElement); - return 0; - } int leftBorderOfSegment = initialElement; int rightBorderOfSegment = endElement; int supportElement = 0; @@ -54,12 +49,25 @@ int smartQSort(int* arrayOfNumber, int initialElement, int endElement) rightBorderOfSegment--; } } - smartQSort(arrayOfNumber, initialElement, rightBorderOfSegment); - smartQSort(arrayOfNumber, leftBorderOfSegment, endElement); - return 0; + if (endElement - leftBorderOfSegment + 1 < 10) + { + sortByInserts(arrayOfNumber, leftBorderOfSegment, endElement); + } + else + { + smartQSort(arrayOfNumber, leftBorderOfSegment, endElement); + } + if (rightBorderOfSegment - initialElement + 1 < 10) + { + sortByInserts(arrayOfNumber, initialElement, rightBorderOfSegment); + } + else + { + smartQSort(arrayOfNumber, initialElement, rightBorderOfSegment); + } } -void QSort(int* arrayOfNumber, int numberOfElement) +void qSort(int* arrayOfNumber, int numberOfElement) { smartQSort(arrayOfNumber, 0, numberOfElement - 1); } \ No newline at end of file diff --git a/mostElemenInArray/mostElemenInArray/qsort.h b/mostElemenInArray/mostElemenInArray/qsort.h index 8c8697e..9ed4ddc 100644 --- a/mostElemenInArray/mostElemenInArray/qsort.h +++ b/mostElemenInArray/mostElemenInArray/qsort.h @@ -1,4 +1,4 @@ #pragma once // function for sorting an array -void QSort(int* arrayOfNumber, int numberOfElements); \ No newline at end of file +void qSort(int* arrayOfNumber, int numberOfElements); \ No newline at end of file diff --git a/mostElemenInArray/mostElemenInArray/qsortTest.c b/mostElemenInArray/mostElemenInArray/qsortTest.c deleted file mode 100644 index 40e53c6..0000000 --- a/mostElemenInArray/mostElemenInArray/qsortTest.c +++ /dev/null @@ -1,48 +0,0 @@ -#include "qsortTest.h" -#include "qsort.h" - -// function for checking the sorting of an array -bool sortingCheck(int* arrayOfNumber, int numberOfElements) -{ - for (int i = 0; i < numberOfElements - 1; i++) - { - if (arrayOfNumber[i] > arrayOfNumber[i + 1]) - { - return false; - } - } - return true; -} - -// function for testing sorting QSort -bool testCorrectQSort() -{ - // Array of random numbers - int arrayOfNumber[10] = { 9, 7, 8, 6, 3, 1, 7, 0, 3, 2 }; - QSort(arrayOfNumber, 10); - - // Array of equal numbers - int arrayOfEqualValues[100] = { 0 }; - for (int i = 0; i < 100; i++) - { - arrayOfEqualValues[i] = 12; - } - QSort(arrayOfEqualValues, 100); - - // Sorted array - int sortedArray[100] = { 0 }; - for (int i = 0; i < 100; i++) - { - sortedArray[i] = i; - } - QSort(sortedArray, 100); - - // Array of one element - int arrayOfOneElement[1] = { 109 }; - QSort(arrayOfEqualValues, 1); - - return sortingCheck(arrayOfNumber, 10) - && sortingCheck(arrayOfEqualValues, 100) - && sortingCheck(sortedArray, 100) - && sortingCheck(arrayOfOneElement, 1); -} \ No newline at end of file diff --git a/mostElemenInArray/mostElemenInArray/qsortTest.h b/mostElemenInArray/mostElemenInArray/qsortTest.h deleted file mode 100644 index ab53687..0000000 --- a/mostElemenInArray/mostElemenInArray/qsortTest.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once -#include - -// function for testing sorting QSort -bool testCorrectQSort(); diff --git a/mostElemenInArray/mostElemenInArray/qwerty.txt b/mostElemenInArray/mostElemenInArray/qwerty.txt deleted file mode 100644 index ef51204..0000000 --- a/mostElemenInArray/mostElemenInArray/qwerty.txt +++ /dev/null @@ -1 +0,0 @@ -9 9 1 7 5 5 10 1 0 7 7 5 8 6 7 3 7 9 2 7 7 8 10 6 7 8 5 6 7 2 1 9 10 10 2 4 9 7 5 4 7 5 14 28 34 00 8 5 4 234 1 2 6 \ No newline at end of file From 3d28159ec167990cb4dfec20db0b7f47013f0a96 Mon Sep 17 00:00:00 2001 From: MinyazevR Date: Sat, 9 Oct 2021 20:19:01 +0500 Subject: [PATCH 02/10] fixed bugs --- .../mostElemenInArray/number.txt | 1 + .../mostElemenInArray/testQSort.c | 48 +++++++++++++++++++ .../mostElemenInArray/testQSort.h | 5 ++ 3 files changed, 54 insertions(+) create mode 100644 mostElemenInArray/mostElemenInArray/number.txt create mode 100644 mostElemenInArray/mostElemenInArray/testQSort.c create mode 100644 mostElemenInArray/mostElemenInArray/testQSort.h diff --git a/mostElemenInArray/mostElemenInArray/number.txt b/mostElemenInArray/mostElemenInArray/number.txt new file mode 100644 index 0000000..1778c07 --- /dev/null +++ b/mostElemenInArray/mostElemenInArray/number.txt @@ -0,0 +1 @@ +9 9 1 7 5 5 10 1 0 7 7 5 8 6 7 3 7 9 2 7 7 8 10 6 7 8 5 6 7 2 1 9 10 10 2 4 9 7 5 4 7 5 14 28 34 00 8 5 4 234 1 2 6 -5 42 13 8 5 4 6 7 5 3 78 96 87 67 45 45 234 56 \ No newline at end of file diff --git a/mostElemenInArray/mostElemenInArray/testQSort.c b/mostElemenInArray/mostElemenInArray/testQSort.c new file mode 100644 index 0000000..7e89886 --- /dev/null +++ b/mostElemenInArray/mostElemenInArray/testQSort.c @@ -0,0 +1,48 @@ +#include "testQSort.h" +#include "qsort.h" + +// function for checking the sorting of an array +bool sortingCheck(int* arrayOfNumber, int numberOfElements) +{ + for (int i = 0; i < numberOfElements - 1; i++) + { + if (arrayOfNumber[i] > arrayOfNumber[i + 1]) + { + return false; + } + } + return true; +} + +// function for testing sorting QSort +bool testCorrectQSort() +{ + // Array of random numbers + int arrayOfNumber[10] = { 9, 7, 8, 6, 3, 1, 7, 0, 3, 2 }; + qSort(arrayOfNumber, 10); + + // Array of equal numbers + int arrayOfEqualValues[100] = { 0 }; + for (int i = 0; i < 100; i++) + { + arrayOfEqualValues[i] = 12; + } + qSort(arrayOfEqualValues, 100); + + // Sorted array + int sortedArray[100] = { 0 }; + for (int i = 0; i < 100; i++) + { + sortedArray[i] = i; + } + qSort(sortedArray, 100); + + // Array of one element + int arrayOfOneElement[1] = { 109 }; + qSort(arrayOfEqualValues, 1); + + return sortingCheck(arrayOfNumber, 10) + && sortingCheck(arrayOfEqualValues, 100) + && sortingCheck(sortedArray, 100) + && sortingCheck(arrayOfOneElement, 1); +} \ No newline at end of file diff --git a/mostElemenInArray/mostElemenInArray/testQSort.h b/mostElemenInArray/mostElemenInArray/testQSort.h new file mode 100644 index 0000000..ab53687 --- /dev/null +++ b/mostElemenInArray/mostElemenInArray/testQSort.h @@ -0,0 +1,5 @@ +#pragma once +#include + +// function for testing sorting QSort +bool testCorrectQSort(); From a62f3a23cb8ddebf0b6b6106395d94ef25e3f413 Mon Sep 17 00:00:00 2001 From: MinyazevR Date: Tue, 19 Oct 2021 17:02:01 +0500 Subject: [PATCH 03/10] writing all functions, tests and comments --- Numbers/Numbers.sln | 31 +++++ Numbers/Numbers/Main.c | 47 ++++++++ Numbers/Numbers/Numbers.c | 52 ++++++++ Numbers/Numbers/Numbers.h | 7 ++ Numbers/Numbers/Numbers.vcxproj | 153 ++++++++++++++++++++++++ Numbers/Numbers/Numbers.vcxproj.filters | 36 ++++++ Numbers/Numbers/NumbersTest.c | 72 +++++++++++ Numbers/Numbers/NumbersTest.h | 5 + Numbers/Numbers/f.txt | 1 + Numbers/Numbers/g.txt | 1 + Numbers/Numbers/h.txt | 1 + 11 files changed, 406 insertions(+) create mode 100644 Numbers/Numbers.sln create mode 100644 Numbers/Numbers/Main.c create mode 100644 Numbers/Numbers/Numbers.c create mode 100644 Numbers/Numbers/Numbers.h create mode 100644 Numbers/Numbers/Numbers.vcxproj create mode 100644 Numbers/Numbers/Numbers.vcxproj.filters create mode 100644 Numbers/Numbers/NumbersTest.c create mode 100644 Numbers/Numbers/NumbersTest.h create mode 100644 Numbers/Numbers/f.txt create mode 100644 Numbers/Numbers/g.txt create mode 100644 Numbers/Numbers/h.txt diff --git a/Numbers/Numbers.sln b/Numbers/Numbers.sln new file mode 100644 index 0000000..3280f94 --- /dev/null +++ b/Numbers/Numbers.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31410.357 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Numbers", "Numbers\Numbers.vcxproj", "{5BC3DF9F-5706-481E-9A77-5C8008E0645B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5BC3DF9F-5706-481E-9A77-5C8008E0645B}.Debug|x64.ActiveCfg = Debug|x64 + {5BC3DF9F-5706-481E-9A77-5C8008E0645B}.Debug|x64.Build.0 = Debug|x64 + {5BC3DF9F-5706-481E-9A77-5C8008E0645B}.Debug|x86.ActiveCfg = Debug|Win32 + {5BC3DF9F-5706-481E-9A77-5C8008E0645B}.Debug|x86.Build.0 = Debug|Win32 + {5BC3DF9F-5706-481E-9A77-5C8008E0645B}.Release|x64.ActiveCfg = Release|x64 + {5BC3DF9F-5706-481E-9A77-5C8008E0645B}.Release|x64.Build.0 = Release|x64 + {5BC3DF9F-5706-481E-9A77-5C8008E0645B}.Release|x86.ActiveCfg = Release|Win32 + {5BC3DF9F-5706-481E-9A77-5C8008E0645B}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {94186265-65DB-4CDF-94F1-044C60F94747} + EndGlobalSection +EndGlobal diff --git a/Numbers/Numbers/Main.c b/Numbers/Numbers/Main.c new file mode 100644 index 0000000..cc6d6e4 --- /dev/null +++ b/Numbers/Numbers/Main.c @@ -0,0 +1,47 @@ +#include "Numbers.h" +#include "NumbersTest.h" +#include + +int main() +{ + if (!numbersTest()) + { + printf("Test failed"); + return -1; + } + FILE* file = fopen("g.txt", "r"); + if (file == NULL) + { + printf("File not found"); + return 0; + } + int number = 0; + int numberToCompare = 0; + while (!feof(file)) + { + const int readBytes = fscanf(file, "%d", &number); + if (readBytes < 0) { + break; + } + numberToCompare = number; + } + fclose(file); + int data[100] = { 0 }; + int counter = readNumbersSmallerSelected(data, numberToCompare, "f.txt"); + if (counter == -2) + { + printf("file f.txt not found"); + return 0; + } + if (counter == -1) + { + printf("memory allocation error"); + return 0; + } + int result = outputOfNumbers(data, counter, "g.txt"); + if (result == -2) + { + printf("failed to create a file"); + } + printf("the numbers are written to the file in order h.txt"); +} \ No newline at end of file diff --git a/Numbers/Numbers/Numbers.c b/Numbers/Numbers/Numbers.c new file mode 100644 index 0000000..310cb5c --- /dev/null +++ b/Numbers/Numbers/Numbers.c @@ -0,0 +1,52 @@ +#include "Numbers.h" +#include +#include + +int readNumbersSmallerSelected(int* data, int numberToCompare, const char* filename) +{ + FILE* file = fopen(filename, "r"); + if (file == NULL) + { + return -2; + } + int counter = 0; + while (!feof(file)) + { + int* buffer = (int*)malloc(sizeof(int)*100); + { + if (buffer == NULL) + { + return -1; + } + } + const int readBytes = fscanf(file, "%d", buffer); + if (readBytes < 0) + { + break; + } + if (*buffer < numberToCompare) + { + data[counter] = *buffer; + counter++; + } + } + fclose(file); + return counter; +} + +int outputOfNumbers(int* data, int counter, const char* filename) +{ + FILE* file = fopen("h.txt", "w"); + if (file == NULL) + { + printf("File not found"); + return -2; + } + int linesRead = 0; + for (int i = 0; i < counter; i++) + { + fprintf(file, "%d ", data[i]); + } + fclose(file); + return 0; +} diff --git a/Numbers/Numbers/Numbers.h b/Numbers/Numbers/Numbers.h new file mode 100644 index 0000000..51258e7 --- /dev/null +++ b/Numbers/Numbers/Numbers.h @@ -0,0 +1,7 @@ +#pragma once + +// Reading numbers smaller than a number(numberToCompare) from a file g.txt and writing these numbers to the data array +int readNumbersSmallerSelected(int* data, int numberToCompare, const char* filename); + +// Output of numbers less than a given number to a file h.txt +int outputOfNumbers(int* data, int counter, const char* filename); \ No newline at end of file diff --git a/Numbers/Numbers/Numbers.vcxproj b/Numbers/Numbers/Numbers.vcxproj new file mode 100644 index 0000000..5350ca3 --- /dev/null +++ b/Numbers/Numbers/Numbers.vcxproj @@ -0,0 +1,153 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {5bc3df9f-5706-481e-9a77-5c8008e0645b} + Numbers + 10.0 + + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Level3 + true + WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Numbers/Numbers/Numbers.vcxproj.filters b/Numbers/Numbers/Numbers.vcxproj.filters new file mode 100644 index 0000000..aaa63c4 --- /dev/null +++ b/Numbers/Numbers/Numbers.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Исходные файлы + + + Исходные файлы + + + Исходные файлы + + + + + Файлы заголовков + + + Файлы заголовков + + + \ No newline at end of file diff --git a/Numbers/Numbers/NumbersTest.c b/Numbers/Numbers/NumbersTest.c new file mode 100644 index 0000000..266a50f --- /dev/null +++ b/Numbers/Numbers/NumbersTest.c @@ -0,0 +1,72 @@ +#include "NumbersTest.h" +#include "Numbers.h" +#include +#include + +bool checkTheReadNumbers(int* data, int* arrayOfCorrectNumbers, int counter) +{ + for (int i = 0; i < counter; i++) + { + if (data[i] != arrayOfCorrectNumbers[i]) + { + return false; + } + } + return true; +} + +bool checkTheOutputOfNumbersToFile(int counter, int secondCounter, int* data, int* arrayOfNumbers) +{ + return checkTheReadNumbers(data, arrayOfNumbers, counter) && counter == secondCounter; +} + +bool numbersTest() +{ + FILE* file = fopen("g.txt", "r"); + if (file == NULL) + { + printf("File not found"); + return false; + } + int number = 0; + int numberToCompare = 0; + while (!feof(file)) + { + const int readBytes = fscanf(file, "%d", &number); + if (readBytes < 0) { + break; + } + numberToCompare = number; + } + fclose(file); + int data[100] = { 0 }; + int arrayOforrectNumbers[12] = { 5, 12, 12, 12, 3, 4, 5, 6, 7, 7, 12, 13 }; + int counter = readNumbersSmallerSelected(data, numberToCompare, "f.txt"); + int arrayOfNumbers[100] = {0}; + file = fopen("h.txt", "r"); + if (file == NULL) + { + return false; + } + int secondCounter = 0; + while (!feof(file)) + { + int* buffer = (int*)malloc(sizeof(int) * 100); + { + if (buffer == NULL) + { + return false; + } + } + const int readBytes = fscanf(file, "%d", buffer); + if (readBytes < 0) + { + break; + } + arrayOfNumbers[secondCounter] = *buffer; + secondCounter++; + } + fclose(file); + return checkTheReadNumbers(data, arrayOforrectNumbers, counter) + && checkTheOutputOfNumbersToFile(counter, secondCounter, data, arrayOfNumbers); +} \ No newline at end of file diff --git a/Numbers/Numbers/NumbersTest.h b/Numbers/Numbers/NumbersTest.h new file mode 100644 index 0000000..c34ed20 --- /dev/null +++ b/Numbers/Numbers/NumbersTest.h @@ -0,0 +1,5 @@ +#pragma once +#include + +// Function for checking the input of numbers into a file, as well as the correct output of numbers smaller than a number from another file +bool numbersTest(); \ No newline at end of file diff --git a/Numbers/Numbers/f.txt b/Numbers/Numbers/f.txt new file mode 100644 index 0000000..c101883 --- /dev/null +++ b/Numbers/Numbers/f.txt @@ -0,0 +1 @@ +5 12 12 14 45 23 12 14 3 4 5 6 7 7 12 13 14 44 45 46 47 48 49 134 \ No newline at end of file diff --git a/Numbers/Numbers/g.txt b/Numbers/Numbers/g.txt new file mode 100644 index 0000000..da2d398 --- /dev/null +++ b/Numbers/Numbers/g.txt @@ -0,0 +1 @@ +14 \ No newline at end of file diff --git a/Numbers/Numbers/h.txt b/Numbers/Numbers/h.txt new file mode 100644 index 0000000..66041cc --- /dev/null +++ b/Numbers/Numbers/h.txt @@ -0,0 +1 @@ +5 12 12 12 3 4 5 6 7 7 12 13 \ No newline at end of file From 0b11ba4b37f182870199d431678d4ce85b35f1f3 Mon Sep 17 00:00:00 2001 From: MinyazevR Date: Tue, 19 Oct 2021 17:09:18 +0500 Subject: [PATCH 04/10] fixed bugs --- Numbers/Numbers/Numbers.c | 2 +- Numbers/Numbers/NumbersTest.c | 9 +++++---- Numbers/Numbers/g.txt | 2 +- Numbers/Numbers/h.txt | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Numbers/Numbers/Numbers.c b/Numbers/Numbers/Numbers.c index 310cb5c..46ed017 100644 --- a/Numbers/Numbers/Numbers.c +++ b/Numbers/Numbers/Numbers.c @@ -36,7 +36,7 @@ int readNumbersSmallerSelected(int* data, int numberToCompare, const char* filen int outputOfNumbers(int* data, int counter, const char* filename) { - FILE* file = fopen("h.txt", "w"); + FILE* file = fopen(filename, "w"); if (file == NULL) { printf("File not found"); diff --git a/Numbers/Numbers/NumbersTest.c b/Numbers/Numbers/NumbersTest.c index 266a50f..78d1cc8 100644 --- a/Numbers/Numbers/NumbersTest.c +++ b/Numbers/Numbers/NumbersTest.c @@ -15,9 +15,9 @@ bool checkTheReadNumbers(int* data, int* arrayOfCorrectNumbers, int counter) return true; } -bool checkTheOutputOfNumbersToFile(int counter, int secondCounter, int* data, int* arrayOfNumbers) +bool checkTheOutputOfNumbersToFile(int counter, int secondCounter, int* arrayOfCorrectNumbers, int* arrayOfNumbers) { - return checkTheReadNumbers(data, arrayOfNumbers, counter) && counter == secondCounter; + return checkTheReadNumbers(arrayOfCorrectNumbers, arrayOfNumbers, counter) && counter == secondCounter; } bool numbersTest() @@ -42,6 +42,7 @@ bool numbersTest() int data[100] = { 0 }; int arrayOforrectNumbers[12] = { 5, 12, 12, 12, 3, 4, 5, 6, 7, 7, 12, 13 }; int counter = readNumbersSmallerSelected(data, numberToCompare, "f.txt"); + outputOfNumbers(data, counter, "h.txt"); int arrayOfNumbers[100] = {0}; file = fopen("h.txt", "r"); if (file == NULL) @@ -51,7 +52,7 @@ bool numbersTest() int secondCounter = 0; while (!feof(file)) { - int* buffer = (int*)malloc(sizeof(int) * 100); + int* buffer = (int*)malloc(sizeof(int) * 10); { if (buffer == NULL) { @@ -68,5 +69,5 @@ bool numbersTest() } fclose(file); return checkTheReadNumbers(data, arrayOforrectNumbers, counter) - && checkTheOutputOfNumbersToFile(counter, secondCounter, data, arrayOfNumbers); + && checkTheOutputOfNumbersToFile(counter, secondCounter, arrayOforrectNumbers, arrayOfNumbers); } \ No newline at end of file diff --git a/Numbers/Numbers/g.txt b/Numbers/Numbers/g.txt index da2d398..e8efced 100644 --- a/Numbers/Numbers/g.txt +++ b/Numbers/Numbers/g.txt @@ -1 +1 @@ -14 \ No newline at end of file +5 12 12 12 3 4 5 6 7 7 12 \ No newline at end of file diff --git a/Numbers/Numbers/h.txt b/Numbers/Numbers/h.txt index 66041cc..e8efced 100644 --- a/Numbers/Numbers/h.txt +++ b/Numbers/Numbers/h.txt @@ -1 +1 @@ -5 12 12 12 3 4 5 6 7 7 12 13 \ No newline at end of file +5 12 12 12 3 4 5 6 7 7 12 \ No newline at end of file From 50b5d8403e89c37f40c0b798c04255eb1fb5dcbf Mon Sep 17 00:00:00 2001 From: MinyazevR Date: Tue, 19 Oct 2021 17:15:37 +0500 Subject: [PATCH 05/10] writing all functions, tests and comments --- Palindrome/Palindrome.sln | 31 ++++ Palindrome/Palindrome/Palindrome.c | 87 ++++++++++ Palindrome/Palindrome/Palindrome.h | 4 + Palindrome/Palindrome/Palindrome.vcxproj | 152 ++++++++++++++++++ .../Palindrome/Palindrome.vcxproj.filters | 33 ++++ Palindrome/Palindrome/PalindromeTest.c | 18 +++ Palindrome/Palindrome/PalindromeTest.h | 5 + 7 files changed, 330 insertions(+) create mode 100644 Palindrome/Palindrome.sln create mode 100644 Palindrome/Palindrome/Palindrome.c create mode 100644 Palindrome/Palindrome/Palindrome.h create mode 100644 Palindrome/Palindrome/Palindrome.vcxproj create mode 100644 Palindrome/Palindrome/Palindrome.vcxproj.filters create mode 100644 Palindrome/Palindrome/PalindromeTest.c create mode 100644 Palindrome/Palindrome/PalindromeTest.h diff --git a/Palindrome/Palindrome.sln b/Palindrome/Palindrome.sln new file mode 100644 index 0000000..5539196 --- /dev/null +++ b/Palindrome/Palindrome.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31410.357 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Palindrome", "Palindrome\Palindrome.vcxproj", "{FE78EDE8-EB77-4096-B9F3-28DB2727133C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FE78EDE8-EB77-4096-B9F3-28DB2727133C}.Debug|x64.ActiveCfg = Debug|x64 + {FE78EDE8-EB77-4096-B9F3-28DB2727133C}.Debug|x64.Build.0 = Debug|x64 + {FE78EDE8-EB77-4096-B9F3-28DB2727133C}.Debug|x86.ActiveCfg = Debug|Win32 + {FE78EDE8-EB77-4096-B9F3-28DB2727133C}.Debug|x86.Build.0 = Debug|Win32 + {FE78EDE8-EB77-4096-B9F3-28DB2727133C}.Release|x64.ActiveCfg = Release|x64 + {FE78EDE8-EB77-4096-B9F3-28DB2727133C}.Release|x64.Build.0 = Release|x64 + {FE78EDE8-EB77-4096-B9F3-28DB2727133C}.Release|x86.ActiveCfg = Release|Win32 + {FE78EDE8-EB77-4096-B9F3-28DB2727133C}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {59331552-2F53-4979-9880-DCDD8F01D3C3} + EndGlobalSection +EndGlobal diff --git a/Palindrome/Palindrome/Palindrome.c b/Palindrome/Palindrome/Palindrome.c new file mode 100644 index 0000000..a847898 --- /dev/null +++ b/Palindrome/Palindrome/Palindrome.c @@ -0,0 +1,87 @@ +#include "Palindrome.h" +#include "PalindromeTest.h" +#include +#include +#include + +int palindrom(char* stringToCheckForPalindrome) +{ + int noSpacesounter = 0; + int counter = 0; + while (stringToCheckForPalindrome[counter] != '\0') + { + if (stringToCheckForPalindrome[counter] != ' ') + { + noSpacesounter++; + } + counter++; + } + char* arrayForPalindromeWithoutSpaces = (char*)calloc((noSpacesounter), sizeof(char)); + if (arrayForPalindromeWithoutSpaces == NULL) + { + return -1; + } + counter = 0; + int j = 0; + while (stringToCheckForPalindrome[counter] != '\0' && j < noSpacesounter) + { + if (stringToCheckForPalindrome[counter] != ' ') + { + arrayForPalindromeWithoutSpaces[j] = stringToCheckForPalindrome[counter]; + j++; + } + counter++; + } + char* copyArrayForPalindromeWithoutSpaces = (char*)calloc((noSpacesounter), sizeof(char)); + if (copyArrayForPalindromeWithoutSpaces == NULL) + { + free(arrayForPalindromeWithoutSpaces); + return -1; + } + for (int i = 0; i < noSpacesounter; i++) + { + copyArrayForPalindromeWithoutSpaces[i] = arrayForPalindromeWithoutSpaces[i]; + } + for (int i = 0; i < noSpacesounter / 2; i++) + { + const int temporary = arrayForPalindromeWithoutSpaces[i]; + arrayForPalindromeWithoutSpaces[i] = arrayForPalindromeWithoutSpaces[noSpacesounter - 1 - i]; + arrayForPalindromeWithoutSpaces[noSpacesounter - 1 - i] = temporary; + } + for (int i = 0; i < noSpacesounter; i++) + { + if (copyArrayForPalindromeWithoutSpaces[i] != arrayForPalindromeWithoutSpaces[i]) + { + free(arrayForPalindromeWithoutSpaces); + free(copyArrayForPalindromeWithoutSpaces); + return 1; + } + } + free(arrayForPalindromeWithoutSpaces); + free(copyArrayForPalindromeWithoutSpaces); + return 0; +} + +int main() +{ + if (!palindromeTest()) + { + printf("Test failed"); + return 0; + } + printf("enter the line\n"); + char stringToCheckForPalindrome[200] = { '\0' }; + scanf_s("%[^\n]s", stringToCheckForPalindrome, _countof(stringToCheckForPalindrome)); + int result = palindrom(stringToCheckForPalindrome); + if (result == -1) + { + printf("Error"); + return 0; + } + else if (result == 1) + { + printf("the string is not a palindrome"); + return 0; + } + printf("string is a palindrome"); +} \ No newline at end of file diff --git a/Palindrome/Palindrome/Palindrome.h b/Palindrome/Palindrome/Palindrome.h new file mode 100644 index 0000000..f07724a --- /dev/null +++ b/Palindrome/Palindrome/Palindrome.h @@ -0,0 +1,4 @@ +#pragma once + +// Function for determining the palindrome +int palindrom(char* stringToCheckForPalindrome); diff --git a/Palindrome/Palindrome/Palindrome.vcxproj b/Palindrome/Palindrome/Palindrome.vcxproj new file mode 100644 index 0000000..93ec11c --- /dev/null +++ b/Palindrome/Palindrome/Palindrome.vcxproj @@ -0,0 +1,152 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {fe78ede8-eb77-4096-b9f3-28db2727133c} + Palindrome + 10.0 + + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Palindrome/Palindrome/Palindrome.vcxproj.filters b/Palindrome/Palindrome/Palindrome.vcxproj.filters new file mode 100644 index 0000000..8a10ab4 --- /dev/null +++ b/Palindrome/Palindrome/Palindrome.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Исходные файлы + + + Исходные файлы + + + + + Файлы заголовков + + + Файлы заголовков + + + \ No newline at end of file diff --git a/Palindrome/Palindrome/PalindromeTest.c b/Palindrome/Palindrome/PalindromeTest.c new file mode 100644 index 0000000..21910ba --- /dev/null +++ b/Palindrome/Palindrome/PalindromeTest.c @@ -0,0 +1,18 @@ +#include "PalindromeTest.h" +#include "Palindrome.h" + +bool palindromeTest() +{ + char firstCorrectString[100] = "a roza upala na lapu azora"; + char secondCorrectString[100] = "NaGibAtOr 666 rOtAbiGaN"; + char thirdCorrectString[100] = "palindro m o rdnilap"; + char firstIncorrectString[100] = "qwertyuiop"; + char secondInorrectString[100] = "Natan"; + char thirdIncorrectString[100] = "aszxxzzxzewf"; + return palindrom(firstCorrectString) == 0 + && palindrom(firstIncorrectString) == 1 + && palindrom(secondCorrectString) == 0 + && palindrom(secondInorrectString) == 1 + && palindrom(thirdCorrectString) == 0 + && palindrom(thirdIncorrectString) == 1; +} \ No newline at end of file diff --git a/Palindrome/Palindrome/PalindromeTest.h b/Palindrome/Palindrome/PalindromeTest.h new file mode 100644 index 0000000..b1f7207 --- /dev/null +++ b/Palindrome/Palindrome/PalindromeTest.h @@ -0,0 +1,5 @@ +#pragma once +#include + +// Function for checking a function that determines whether a string is a palindrome +bool palindromeTest(); \ No newline at end of file From 1b2f0d9d1b067657b69b4c2f323140dd10c69d33 Mon Sep 17 00:00:00 2001 From: MinyazevR <89993880+MinyazevR@users.noreply.github.com> Date: Tue, 19 Oct 2021 17:19:00 +0500 Subject: [PATCH 06/10] Delete main.c --- mostElemenInArray/mostElemenInArray/main.c | 58 ---------------------- 1 file changed, 58 deletions(-) delete mode 100644 mostElemenInArray/mostElemenInArray/main.c diff --git a/mostElemenInArray/mostElemenInArray/main.c b/mostElemenInArray/mostElemenInArray/main.c deleted file mode 100644 index f63eccc..0000000 --- a/mostElemenInArray/mostElemenInArray/main.c +++ /dev/null @@ -1,58 +0,0 @@ -#include -#include "testQSort.h" -#include "testTheMostCommonElement.h" -#include "theMostCommonElement.h" -#include "qsort.h" -#include - -int main() -{ - if (!testCorrectQSort() || !testSearchMostCommonElement()) - { - printf("test failed"); - return -1; - } - FILE* file = NULL; - errno_t err = fopen_s(&file, "number.txt", "r"); - if (file == NULL || err != 0) - { - printf("file not found!"); - return -1; - } - int counter = 0; - int variable = 0; - while (!feof(file)) - { - fscanf_s(file, "%d", &variable); - counter++; - } - fclose(file); - err = fopen_s(&file, "number.txt", "r"); - if (file == NULL || err != 0) - { - printf("file not found!"); - return -1; - } - int* arrayOfNumber = (int*)calloc(counter, sizeof(int)); - if (arrayOfNumber == NULL) - { - printf("memory is not allocated"); - // Can be used return as we are in main() - fclose(file); - return -1; - } - int readNumber = 0; - while (fscanf_s(file, "%d", &arrayOfNumber[readNumber]) > 0) - { - readNumber++; - } - fclose(file); - qSort(arrayOfNumber, counter); - for (int i = 0; i < counter; i++) - { - printf("%d ", arrayOfNumber[i]); - } - printf("\n"); - printf("most common element in an array : %d\n", searchMostCommonElementInArray(arrayOfNumber, counter)); - free(arrayOfNumber); -} \ No newline at end of file From 29740677bc37609416cc52535bc25b08dfdbf8cd Mon Sep 17 00:00:00 2001 From: MinyazevR <89993880+MinyazevR@users.noreply.github.com> Date: Tue, 19 Oct 2021 17:19:17 +0500 Subject: [PATCH 07/10] Delete mostElemenInArray.vcxproj --- .../mostElemenInArray.vcxproj | 157 ------------------ 1 file changed, 157 deletions(-) delete mode 100644 mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj diff --git a/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj b/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj deleted file mode 100644 index db98dbe..0000000 --- a/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj +++ /dev/null @@ -1,157 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {6e9504ef-fe83-4873-ac76-e0bd32d16fb9} - mostElemenInArray - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - - - false - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 95eb5d037aa37c3ba5cfa823fb208c98264a1044 Mon Sep 17 00:00:00 2001 From: MinyazevR <89993880+MinyazevR@users.noreply.github.com> Date: Tue, 19 Oct 2021 17:19:33 +0500 Subject: [PATCH 08/10] Delete testQSort.c --- .../mostElemenInArray/testQSort.c | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 mostElemenInArray/mostElemenInArray/testQSort.c diff --git a/mostElemenInArray/mostElemenInArray/testQSort.c b/mostElemenInArray/mostElemenInArray/testQSort.c deleted file mode 100644 index 7e89886..0000000 --- a/mostElemenInArray/mostElemenInArray/testQSort.c +++ /dev/null @@ -1,48 +0,0 @@ -#include "testQSort.h" -#include "qsort.h" - -// function for checking the sorting of an array -bool sortingCheck(int* arrayOfNumber, int numberOfElements) -{ - for (int i = 0; i < numberOfElements - 1; i++) - { - if (arrayOfNumber[i] > arrayOfNumber[i + 1]) - { - return false; - } - } - return true; -} - -// function for testing sorting QSort -bool testCorrectQSort() -{ - // Array of random numbers - int arrayOfNumber[10] = { 9, 7, 8, 6, 3, 1, 7, 0, 3, 2 }; - qSort(arrayOfNumber, 10); - - // Array of equal numbers - int arrayOfEqualValues[100] = { 0 }; - for (int i = 0; i < 100; i++) - { - arrayOfEqualValues[i] = 12; - } - qSort(arrayOfEqualValues, 100); - - // Sorted array - int sortedArray[100] = { 0 }; - for (int i = 0; i < 100; i++) - { - sortedArray[i] = i; - } - qSort(sortedArray, 100); - - // Array of one element - int arrayOfOneElement[1] = { 109 }; - qSort(arrayOfEqualValues, 1); - - return sortingCheck(arrayOfNumber, 10) - && sortingCheck(arrayOfEqualValues, 100) - && sortingCheck(sortedArray, 100) - && sortingCheck(arrayOfOneElement, 1); -} \ No newline at end of file From 05e25b581a68a4411282aef2f70d8891bb893c74 Mon Sep 17 00:00:00 2001 From: MinyazevR <89993880+MinyazevR@users.noreply.github.com> Date: Tue, 19 Oct 2021 17:20:22 +0500 Subject: [PATCH 09/10] Delete mostElemenInArray.vcxproj.filters --- .../mostElemenInArray.vcxproj.filters | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj.filters diff --git a/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj.filters b/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj.filters deleted file mode 100644 index 55aebe7..0000000 --- a/mostElemenInArray/mostElemenInArray/mostElemenInArray.vcxproj.filters +++ /dev/null @@ -1,48 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Исходные файлы - - - Исходные файлы - - - Исходные файлы - - - Исходные файлы - - - Исходные файлы - - - - - Файлы заголовков - - - Файлы заголовков - - - Файлы заголовков - - - Файлы заголовков - - - \ No newline at end of file From 16b9f23cb7edda96c839daeb9f2aa31101e98211 Mon Sep 17 00:00:00 2001 From: MinyazevR Date: Tue, 19 Oct 2021 18:01:50 +0500 Subject: [PATCH 10/10] =?UTF-8?q?=D1=8F=20=D0=BD=D0=B5=20=20=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=8F=D0=BB=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83?= =?UTF-8?q?=D1=80=D1=83=20=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D1=8F,=20?= =?UTF-8?q?=D1=83=20=D0=BC=D0=B5=D0=BD=D1=8F=20=D0=BF=D0=BE=D1=85=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=20=D1=81=D0=BB=D1=83=D1=87=D0=B8=D0=BB=D1=81=D1=8F?= =?UTF-8?q?=20=D0=BA=D0=B0=D0=BA=D0=BE=D0=B9=20=D1=82=D0=BE=20=D0=B1=D0=B0?= =?UTF-8?q?=D0=B3=20=D0=B8=D0=B7=20=D0=B7=D0=B0=20=D0=BD=D0=B5=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=BE=D1=82=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=82?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Numbers/Numbers/Main.c | 2 +- Numbers/Numbers/Numbers.vcxproj | 2 +- Numbers/Numbers/g.txt | 2 +- Numbers/Numbers/h.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Numbers/Numbers/Main.c b/Numbers/Numbers/Main.c index cc6d6e4..9e333c0 100644 --- a/Numbers/Numbers/Main.c +++ b/Numbers/Numbers/Main.c @@ -38,7 +38,7 @@ int main() printf("memory allocation error"); return 0; } - int result = outputOfNumbers(data, counter, "g.txt"); + int result = outputOfNumbers(data, counter, "h.txt"); if (result == -2) { printf("failed to create a file"); diff --git a/Numbers/Numbers/Numbers.vcxproj b/Numbers/Numbers/Numbers.vcxproj index 5350ca3..3296995 100644 --- a/Numbers/Numbers/Numbers.vcxproj +++ b/Numbers/Numbers/Numbers.vcxproj @@ -114,7 +114,7 @@ Level3 true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true diff --git a/Numbers/Numbers/g.txt b/Numbers/Numbers/g.txt index e8efced..da2d398 100644 --- a/Numbers/Numbers/g.txt +++ b/Numbers/Numbers/g.txt @@ -1 +1 @@ -5 12 12 12 3 4 5 6 7 7 12 \ No newline at end of file +14 \ No newline at end of file diff --git a/Numbers/Numbers/h.txt b/Numbers/Numbers/h.txt index e8efced..66041cc 100644 --- a/Numbers/Numbers/h.txt +++ b/Numbers/Numbers/h.txt @@ -1 +1 @@ -5 12 12 12 3 4 5 6 7 7 12 \ No newline at end of file +5 12 12 12 3 4 5 6 7 7 12 13 \ No newline at end of file