diff --git a/.gitignore b/.gitignore index 348e7e4..4d061b2 100644 --- a/.gitignore +++ b/.gitignore @@ -154,3 +154,11 @@ Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/5ccdb9c64312b2ee/16_REVERSEBITS.ipch Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/969dd2cbf6a00d1b/16_REVERSEBITS.ipch Alogrithm/.vs/Alogrithm/v16/TestStore/0/003.testlog Alogrithm/Alogrithm/Debug/16_ReverseBits.obj +Alogrithm/TestResults/0850ae84-7979-49f9-8ba5-b749ab8d4aa5/林_MI-1 2021-01-25 15_17_29.coverage +Alogrithm/TestResults/ebfec9da-5725-4b9b-ae27-dbbecbce3f2d/林_MI-1 2021-01-25 15_16_21.coverage +Alogrithm/UnitTest/Debug/UnitTest.tlog/link.10456.delete.1.tlog +Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/13d1a063a12e2911/17_WORDBREAK.ipch +Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/314d19c9f4445d9e/18_PLUSONE.ipch +Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/a71bf0a3ca35e643/18_PLUSONE.ipch +Alogrithm/.vs/Alogrithm/v16/TestStore/0/004.testlog +Alogrithm/Alogrithm/Debug/18_PlusOne.obj diff --git a/Alogrithm/.vs/Alogrithm/v16/.suo b/Alogrithm/.vs/Alogrithm/v16/.suo index 644a4f6..83b29f1 100644 Binary files a/Alogrithm/.vs/Alogrithm/v16/.suo and b/Alogrithm/.vs/Alogrithm/v16/.suo differ diff --git a/Alogrithm/Alogrithm/Alogrithm.vcxproj b/Alogrithm/Alogrithm/Alogrithm.vcxproj index e5c3a6e..80bab78 100644 --- a/Alogrithm/Alogrithm/Alogrithm.vcxproj +++ b/Alogrithm/Alogrithm/Alogrithm.vcxproj @@ -92,7 +92,7 @@ Console - true + DebugFull ../Alogrithm/Debug/2_ExcelSheetColumnTitle.obj;%(AdditionalDependencies) @@ -148,6 +148,7 @@ + @@ -167,6 +168,7 @@ + @@ -185,6 +187,7 @@ + diff --git a/Alogrithm/Alogrithm/Alogrithm.vcxproj.filters b/Alogrithm/Alogrithm/Alogrithm.vcxproj.filters index 97af554..459def8 100644 --- a/Alogrithm/Alogrithm/Alogrithm.vcxproj.filters +++ b/Alogrithm/Alogrithm/Alogrithm.vcxproj.filters @@ -75,6 +75,9 @@ 源文件\src + + 源文件\src + @@ -125,6 +128,9 @@ 头文件\include + + 头文件\include + @@ -175,5 +181,8 @@ 资源文件\config + + 资源文件\config + \ No newline at end of file diff --git a/Alogrithm/Alogrithm/config/18_PlusOne.ini b/Alogrithm/Alogrithm/config/18_PlusOne.ini new file mode 100644 index 0000000..0e0f0f6 --- /dev/null +++ b/Alogrithm/Alogrithm/config/18_PlusOne.ini @@ -0,0 +1,24 @@ +[Test1] +Input=1,2,3 +Output=1,2,4 +[Test2] +Input=1,2,9 +Output=1,3,0 +[Test3] +Input=1,9,9,9 +Output=2,0,0,0 +[Test4] +Input=9,9,9,9 +Output=1,0,0,0,0 +[Test5] +Input=1,9,8,8 +Output=1,9,8,9 +[Test6] +Input=1,9,8,9 +Output=1,9,9,0 +[Test7] +Input=0 +Output=1 +[Test8] +Input=2,0,1,1,2,4,1,9,9,9 +Output=2,0,1,1,2,4,2,0,0,0 \ No newline at end of file diff --git a/Alogrithm/Alogrithm/include/18_PlusOne.h b/Alogrithm/Alogrithm/include/18_PlusOne.h new file mode 100644 index 0000000..9e5d30e --- /dev/null +++ b/Alogrithm/Alogrithm/include/18_PlusOne.h @@ -0,0 +1,6 @@ +#pragma once + +#include +#include +#include +int* PlusOne(int* digits, int digitsSize, int* returnSize); \ No newline at end of file diff --git a/Alogrithm/Alogrithm/src/18_PlusOne.cpp b/Alogrithm/Alogrithm/src/18_PlusOne.cpp new file mode 100644 index 0000000..2c51771 --- /dev/null +++ b/Alogrithm/Alogrithm/src/18_PlusOne.cpp @@ -0,0 +1,24 @@ +#include "../include/18_PlusOne.h" +//ĿһɵķǿʾķǸڸĻϼһ +// λִλ ÿԪֻ洢֡ +// Լ 0 ֮⣬㿪ͷ +//˼·ӺǰΪ9λ0ǰһλ1Ϊ9λ1ԭ +// 磺999,9999999ȣdigitsSize+1ռ䣬λ1λ0鳤ΪdigitsSize+1 +int* PlusOne(int* digits, int digitsSize, int* returnSize) { + for (int i = digitsSize - 1; i >= 0; --i) {//Ӻǰʼ + if (digits[i] == 9) { //жDz9 + digits[i] = 0; //90 + } + else { + digits[i]++; //99ǰһλ1 + *returnSize = digitsSize; //鳤Ȼԭij + return digits; //صdigitsҪĵ + } + } + //㣬˵λλˣ99,999,9999 + int* result = (int*)malloc(sizeof(int) * (digitsSize + 1));//һint *digitsSize+1ռ + memset(result, 0, sizeof(int) * (digitsSize + 1));//飬ÿһλ0 + result[0] = 1; //λΪ1λΪ0 + *returnSize = digitsSize + 1;//ijΪԭ鳤ȼ1 + return result; +} \ No newline at end of file diff --git a/Alogrithm/Alogrithm/src/main.cpp b/Alogrithm/Alogrithm/src/main.cpp index 6fb3c89..14b0731 100644 --- a/Alogrithm/Alogrithm/src/main.cpp +++ b/Alogrithm/Alogrithm/src/main.cpp @@ -1,9 +1,8 @@ #include -#include "../include/16_ReverseBits.h" int main() { - printf("%ld\n", ReverseBits(1)); - return 0; + + } diff --git a/Alogrithm/UnitTest/UnitTest.cpp b/Alogrithm/UnitTest/UnitTest.cpp index 8b0fe93..302c323 100644 --- a/Alogrithm/UnitTest/UnitTest.cpp +++ b/Alogrithm/UnitTest/UnitTest.cpp @@ -18,6 +18,7 @@ using namespace Microsoft::VisualStudio::CppUnitTestFramework; #define FileName_14 "../Alogrithm/config/14_SingleNumber.ini" #define FileName_15 "../Alogrithm/config/15_WordPattern.ini" #define FileName_16 "../Alogrithm/config/16_ReverseBits.ini" +#define FileName_18 "../Alogrithm/config/18_PlusOne.ini" namespace UnitTest @@ -310,4 +311,26 @@ namespace UnitTest } } }; + TEST_CLASS(UnitTest_18) + { + TEST_METHOD(TestMethode1) + { + char Section_Name[100][10] = { 0 }; + int Section_Count = CalcCount(100, Section_Name, FileName_18); + int input_count = 0, output_count = 0, returnSize = 0; + int* input_value; + int* output_value; + CString input,output; + for (int i = 0; i < Section_Count; i++) { + GetPrivateProfileString(Section_Name[i], "Input", " ", input.GetBuffer(200), 200, FileName_18); + GetPrivateProfileString(Section_Name[i], "Output", " ", output.GetBuffer(200), 200, FileName_18); + input_value = str_device(input, &input_count); + output_value = str_device(output, &output_count); + int* nReal = PlusOne(input_value, input_count, &returnSize); + for (int i = 0; i < input_count; i++) { + Assert::AreEqual(nReal[i], output_value[i]); + } + } + } + }; } diff --git a/Alogrithm/UnitTest/UnitTest.vcxproj b/Alogrithm/UnitTest/UnitTest.vcxproj index 1e9fecc..0ea3f5e 100644 --- a/Alogrithm/UnitTest/UnitTest.vcxproj +++ b/Alogrithm/UnitTest/UnitTest.vcxproj @@ -103,7 +103,7 @@ Windows $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) DebugFull - ../Alogrithm/Debug/1_ContainsNearbyDuplicate.obj;../Alogrithm/Debug/2_ExcelSheetColumnTitle.obj;../Alogrithm/Debug/3_bool IsUgly.obj;../Alogrithm/Debug/4_IsPalindrome.obj;../Alogrithm/Debug/5_MinDepth.obj;../Alogrithm/Debug/6_ContainsDuplicate.obj;../Alogrithm/Debug/7_MaxDepth.obj;../Alogrithm/Debug/8_HammingWeight.obj;../Alogrithm/Debug/9_AddBinary.obj;../Alogrithm/Debug/10_BinaryTreePaths.obj;../Alogrithm/Debug/11_CanWinNim.obj;../Alogrithm/Debug/12_IsValid.obj;../Alogrithm/Debug/13_MyAtoi.obj;../Alogrithm/Debug/14_SingleNumber.obj;../Alogrithm/Debug/15_WordPattern.obj;../Alogrithm/Debug/16_ReverseBits.obj;%(AdditionalDependencies) + ../Alogrithm/Debug/1_ContainsNearbyDuplicate.obj;../Alogrithm/Debug/2_ExcelSheetColumnTitle.obj;../Alogrithm/Debug/3_bool IsUgly.obj;../Alogrithm/Debug/4_IsPalindrome.obj;../Alogrithm/Debug/5_MinDepth.obj;../Alogrithm/Debug/6_ContainsDuplicate.obj;../Alogrithm/Debug/7_MaxDepth.obj;../Alogrithm/Debug/8_HammingWeight.obj;../Alogrithm/Debug/9_AddBinary.obj;../Alogrithm/Debug/10_BinaryTreePaths.obj;../Alogrithm/Debug/11_CanWinNim.obj;../Alogrithm/Debug/12_IsValid.obj;../Alogrithm/Debug/13_MyAtoi.obj;../Alogrithm/Debug/14_SingleNumber.obj;../Alogrithm/Debug/15_WordPattern.obj;../Alogrithm/Debug/16_ReverseBits.obj;../Alogrithm/Debug/18_PlusOne.obj;%(AdditionalDependencies) diff --git a/Alogrithm/UnitTest/pch.cpp b/Alogrithm/UnitTest/pch.cpp index 39c05ed..0ecc6af 100644 --- a/Alogrithm/UnitTest/pch.cpp +++ b/Alogrithm/UnitTest/pch.cpp @@ -54,7 +54,7 @@ int CalcCount(int n, char(*str)[10],const char *FileName) int* str_device(CString str, int* value_count) { char* token; //存放被切割后的第一个子串 - static int Section_devide[500];//存放字符切割完成以后的数组元素值 + int* Section_devide = (int*)malloc(sizeof(int) * 200);//存放字符切割完成以后的数组元素值 char Section_value[500] = { 0 };//存放nums转换成string类型的结果 memset(Section_value, 0, sizeof(char) * 500); *value_count = 0; diff --git a/Alogrithm/UnitTest/pch.h b/Alogrithm/UnitTest/pch.h index 4c93404..e008b78 100644 --- a/Alogrithm/UnitTest/pch.h +++ b/Alogrithm/UnitTest/pch.h @@ -29,6 +29,7 @@ #include"../Alogrithm/include/14_SingleNumber.h" #include"../Alogrithm/include/15_WordPattern.h" #include"../Alogrithm/include/16_ReverseBits.h" +#include"../Alogrithm/include/18_PlusOne.h" int CalcCount(int n, char(*str)[10],const char *FileName);