diff --git a/.gitignore b/.gitignore index e566a52..d96f1cc 100644 --- a/.gitignore +++ b/.gitignore @@ -185,3 +185,5 @@ Alogrithm/Alogrithm/Debug/22_Rotate.obj Alogrithm/UnitTest/Debug/UnitTest.tlog/link.15328.delete.1.tlog *.tlog *.obj +*.testlog +*.coverage diff --git a/Alogrithm/.vs/Alogrithm/v16/.suo b/Alogrithm/.vs/Alogrithm/v16/.suo index f8ee011..3c63209 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 06841ac..92b69b2 100644 --- a/Alogrithm/Alogrithm/Alogrithm.vcxproj +++ b/Alogrithm/Alogrithm/Alogrithm.vcxproj @@ -148,6 +148,7 @@ + @@ -172,6 +173,7 @@ + @@ -195,6 +197,7 @@ + diff --git a/Alogrithm/Alogrithm/Alogrithm.vcxproj.filters b/Alogrithm/Alogrithm/Alogrithm.vcxproj.filters index 468f922..a09d990 100644 --- a/Alogrithm/Alogrithm/Alogrithm.vcxproj.filters +++ b/Alogrithm/Alogrithm/Alogrithm.vcxproj.filters @@ -90,6 +90,9 @@ 源文件\src + + 源文件\src + @@ -155,6 +158,9 @@ 头文件\include + + 头文件\include + @@ -220,5 +226,8 @@ 资源文件\config + + 资源文件\config + \ No newline at end of file diff --git a/Alogrithm/Alogrithm/config/17_WordBreak.ini b/Alogrithm/Alogrithm/config/17_WordBreak.ini index a68ed95..9e2e29d 100644 --- a/Alogrithm/Alogrithm/config/17_WordBreak.ini +++ b/Alogrithm/Alogrithm/config/17_WordBreak.ini @@ -13,4 +13,20 @@ Output=1 [Test4] Input1=catsanddog Input2=cats,and,dog -Output=1 \ No newline at end of file +Output=1 +[Test5] +Input1=aaaaaaa +Input2=aaa,aaaa +Output=1 +[Test6] +Input1=aaaaaaa +Input2=aaa,aaa +Output=0 +[Test7] +Input1=leetcode +Input2=leet,code +Output=1 +[Test8] +Input1= +Input2= +Output=0 \ No newline at end of file diff --git a/Alogrithm/UnitTest/UnitTest.cpp b/Alogrithm/UnitTest/UnitTest.cpp index 36f6e1d..a193300 100644 --- a/Alogrithm/UnitTest/UnitTest.cpp +++ b/Alogrithm/UnitTest/UnitTest.cpp @@ -324,20 +324,20 @@ namespace UnitTest { char Section_Name[100][10] = { 0 }; int Section_Count = CalcCount(100, Section_Name, FileName_17); - CString Input1, Input2,Output; + CString Input1, Input2, Output; char Str_char[1024] = { 0 }; - char *WordDic[100]; + char* WordDic[100]; for (int i = 0; i < Section_Count; i++) { GetPrivateProfileString(Section_Name[i], "Input1", " ", Input1.GetBuffer(200), 200, FileName_17); GetPrivateProfileString(Section_Name[i], "Input2", " ", Input2.GetBuffer(500), 500, FileName_17); - GetPrivateProfileString(Section_Name[i], "Output", " ", Output.GetBuffer(20), 20, FileName_17); + GetPrivateProfileString(Section_Name[i], "Output", " ", Output.GetBuffer(20), 20, FileName_17); strcpy(Str_char, Input1); int Wordic_count = str_device3(Input2, WordDic); bool nReal = WordBreak(Str_char, WordDic, Wordic_count); Assert::AreEqual(nReal, CstrToBool(Output)); } } - } + }; TEST_CLASS(UnitTest_18) { TEST_METHOD(TestMethode1) diff --git a/Alogrithm/UnitTest/UnitTest.vcxproj b/Alogrithm/UnitTest/UnitTest.vcxproj index b1ba7a6..d9f9aff 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;../Alogrithm/Debug/18_PlusOne.obj;../Alogrithm/Debug/19_MySqrt.obj;../Alogrithm/Debug/20_MoveZeroes.obj;../Alogrithm/Debug/21_Reverse.obj;../Alogrithm/Debug/22_Rotate.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/17_WordBreak.obj;../Alogrithm/Debug/18_PlusOne.obj;../Alogrithm/Debug/19_MySqrt.obj;../Alogrithm/Debug/20_MoveZeroes.obj;../Alogrithm/Debug/21_Reverse.obj;../Alogrithm/Debug/22_Rotate.obj;%(AdditionalDependencies)