Browse Source

分支19完成

master
linyongji 4 years ago
parent
commit
c23f65a455
11 changed files with 87 additions and 4 deletions
  1. +4
    -0
      .gitignore
  2. BIN
      Alogrithm/.vs/Alogrithm/v16/.suo
  3. +3
    -0
      Alogrithm/Alogrithm/Alogrithm.vcxproj
  4. +9
    -0
      Alogrithm/Alogrithm/Alogrithm.vcxproj.filters
  5. +24
    -0
      Alogrithm/Alogrithm/config/19_MySqrt.ini
  6. +2
    -0
      Alogrithm/Alogrithm/include/19_MySqrt.h
  7. +25
    -0
      Alogrithm/Alogrithm/src/19_MySqrt.cpp
  8. +2
    -2
      Alogrithm/Alogrithm/src/main.cpp
  9. +16
    -1
      Alogrithm/UnitTest/UnitTest.cpp
  10. +1
    -1
      Alogrithm/UnitTest/UnitTest.vcxproj
  11. +1
    -0
      Alogrithm/UnitTest/pch.h

+ 4
- 0
.gitignore View File

@@ -162,3 +162,7 @@ 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
Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/1a1702b241b62b26/19_MYSQRT.ipch
Alogrithm/.vs/Alogrithm/v16/TestStore/0/005.testlog
Alogrithm/Alogrithm/Debug/19_MySqrt.obj
Alogrithm/UnitTest/Debug/UnitTest.tlog/link.16016.delete.1.tlog

BIN
Alogrithm/.vs/Alogrithm/v16/.suo View File


+ 3
- 0
Alogrithm/Alogrithm/Alogrithm.vcxproj View File

@@ -149,6 +149,7 @@
<ClCompile Include="src\15_WordPattern.cpp" />
<ClCompile Include="src\16_ReverseBits.cpp" />
<ClCompile Include="src\18_PlusOne.cpp" />
<ClCompile Include="src\19_MySqrt.cpp" />
<ClCompile Include="src\1_ContainsNearbyDuplicate.cpp" />
<ClCompile Include="src\2_ExcelSheetColumnTitle.cpp" />
<ClCompile Include="src\3_bool IsUgly.cpp" />
@@ -169,6 +170,7 @@
<ClInclude Include="include\15_WordPattern.h" />
<ClInclude Include="include\16_ReverseBits.h" />
<ClInclude Include="include\18_PlusOne.h" />
<ClInclude Include="include\19_MySqrt.h" />
<ClInclude Include="include\1_ContainsNearbyDuplicate.h" />
<ClInclude Include="include\2_ExcelSheetColumnTitle.h" />
<ClInclude Include="include\3_bool IsUgly.h" />
@@ -188,6 +190,7 @@
<None Include="config\15_WordPattern.ini" />
<None Include="config\16_ReverseBits.ini" />
<None Include="config\18_PlusOne.ini" />
<None Include="config\19_MySqrt.ini" />
<None Include="config\1_ContainsNearbyDuplicate.ini" />
<None Include="config\2_ExcelSheetColumnTiTle.ini" />
<None Include="config\3_bool IsUgly.ini" />


+ 9
- 0
Alogrithm/Alogrithm/Alogrithm.vcxproj.filters View File

@@ -78,6 +78,9 @@
<ClCompile Include="src\18_PlusOne.cpp">
<Filter>源文件\src</Filter>
</ClCompile>
<ClCompile Include="src\19_MySqrt.cpp">
<Filter>源文件\src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\2_ExcelSheetColumnTitle.h">
@@ -131,6 +134,9 @@
<ClInclude Include="include\18_PlusOne.h">
<Filter>头文件\include</Filter>
</ClInclude>
<ClInclude Include="include\19_MySqrt.h">
<Filter>头文件\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="config\3_bool IsUgly.ini">
@@ -184,5 +190,8 @@
<None Include="config\18_PlusOne.ini">
<Filter>资源文件\config</Filter>
</None>
<None Include="config\19_MySqrt.ini">
<Filter>资源文件\config</Filter>
</None>
</ItemGroup>
</Project>

+ 24
- 0
Alogrithm/Alogrithm/config/19_MySqrt.ini View File

@@ -0,0 +1,24 @@
[Test1]
Input=4
Output=2
[Test2]
Input=8
Output=2
[Test3]
Input=0
Output=0
[Test4]
Input=1
Output=1
[Test5]
Input=2
Output=1
[Test6]
Input=66564
Output=258
[Test7]
Input=2147395600
Output=46340
[Test8]
Input=2147483647
Output=46340

+ 2
- 0
Alogrithm/Alogrithm/include/19_MySqrt.h View File

@@ -0,0 +1,2 @@
#pragma once
int MySqrt(int x);

+ 25
- 0
Alogrithm/Alogrithm/src/19_MySqrt.cpp View File

@@ -0,0 +1,25 @@
#include "../include/19_MySqrt.h"
//题目:实现 int sqrt(int x) 函数,计算并返回 x 的平方根,其中 x 是非负整数。
// 由于返回类型是整数,结果只保留整数的部分,小数部分将被舍去。
//思路:使用二分法进行查找,先确定上下限和中间值,对中间值进行平方,然后和x作比较
// 如果中间值的平方比x小,low加一缩小搜索范围;如果相等则刚好找到;否则high减一缩小搜索范围
int MySqrt(int x) {
if (x < 2) {//如果入参为0,1,直接返回原数
return x;
}//因为一个数的平方一定大于等于这个数的二倍(0,1除外),所以上限缩小为x/2
int low = 1, high = x / 2,mid = 0; //定义下限,上限,中间值
while (low <= high) //循环终止条件,当左界限比右界限大时,跳出循环
{
mid = (low + high) / 2; //取low和high的中间值mid
if (mid == x / mid) { //判断mid*nid和x是否相等,因为考虑到乘法溢出,这里写为mid == x/mid
return mid; //相等说明找到,直接返回
}
else if ( mid < x / mid) { //如果mid*mid小于x
low = mid + 1; //下限上移
}
else { //如果mid*mid大于x
high = mid - 1; //上限下移
}
} //循环结束时,low>high,也就是说 low平方>x>high平方,这里小数部分省去
return high; //所以返回的high就是需要的值
}

+ 2
- 2
Alogrithm/Alogrithm/src/main.cpp View File

@@ -1,8 +1,8 @@
#include<stdio.h>
#include "../include/19_MySqrt.h"

int main()
{
printf("%d\n", MySqrt(9));
}

+ 16
- 1
Alogrithm/UnitTest/UnitTest.cpp View File

@@ -19,7 +19,7 @@ using namespace Microsoft::VisualStudio::CppUnitTestFramework;
#define FileName_15 "../Alogrithm/config/15_WordPattern.ini"
#define FileName_16 "../Alogrithm/config/16_ReverseBits.ini"
#define FileName_18 "../Alogrithm/config/18_PlusOne.ini"
#define FileName_19 "../Alogrithm/config/19_MySqrt.ini"

namespace UnitTest
{
@@ -333,4 +333,19 @@ namespace UnitTest
}
}
};
TEST_CLASS(UnitTest_19)
{
TEST_METHOD(TestMethode1)
{
char Section_Name[100][10] = { 0 };
int Section_Count = CalcCount(100, Section_Name, FileName_19);
CString input,output;
for (int i = 0; i < Section_Count; i++) {
GetPrivateProfileString(Section_Name[i], "Input", " ", input.GetBuffer(100), 100, FileName_19);
GetPrivateProfileString(Section_Name[i], "Output", " ", output.GetBuffer(100), 100, FileName_19);
int nReal = MySqrt(_ttoi(input));
Assert::AreEqual(nReal, _ttoi(output));
}
}
};
}

+ 1
- 1
Alogrithm/UnitTest/UnitTest.vcxproj View File

@@ -103,7 +103,7 @@
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
<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)</AdditionalDependencies>
<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;../Alogrithm/Debug/19_MySqrt.obj;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">


+ 1
- 0
Alogrithm/UnitTest/pch.h View File

@@ -30,6 +30,7 @@
#include"../Alogrithm/include/15_WordPattern.h"
#include"../Alogrithm/include/16_ReverseBits.h"
#include"../Alogrithm/include/18_PlusOne.h"
#include"../Alogrithm/include/19_MySqrt.h"


int CalcCount(int n, char(*str)[10],const char *FileName);


Loading…
Cancel
Save