Skip to content

v1.0 #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZfWan-Hub wants to merge 1 commit into
base: cplusplus
Choose a base branch
from
Open

v1.0 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added TheSoundWorld/Calculator/.vs/Calculator/v16/.suo
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/.vs/Calculator/v16/Browse.VC.db
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/.vs/Calculator/v16/Solution.VC.db
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/.vs/Calculator/v16/TestStore/0/000-0000.testlog
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/.vs/Calculator/v16/TestStore/0/testlog.manifest
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/.vs/Calculator/v16/ipch/63bf4949e06233c1.ipch
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/.vs/Calculator/v16/ipch/AutoPCH/7afcedcd592dcf28/CALCULATOR.ipch
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/.vs/Calculator/v16/ipch/AutoPCH/c167a2700c2eebdb/CALCULATOR.ipch
View file
Open in desktop
Binary file not shown.
41 changes: 41 additions & 0 deletions TheSoundWorld/Calculator/Calculator.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29318.209
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Calculator", "Calculator\Calculator.vcxproj", "{215586A6-9F5D-49E6-AA0C-48447C5499C2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalculatorUnitTest", "CalculatorUnitTest\CalculatorUnitTest.vcxproj", "{D8EC05A7-4941-4559-A81F-90C092D3F148}"
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
{215586A6-9F5D-49E6-AA0C-48447C5499C2}.Debug|x64.ActiveCfg = Debug|x64
{215586A6-9F5D-49E6-AA0C-48447C5499C2}.Debug|x64.Build.0 = Debug|x64
{215586A6-9F5D-49E6-AA0C-48447C5499C2}.Debug|x86.ActiveCfg = Debug|Win32
{215586A6-9F5D-49E6-AA0C-48447C5499C2}.Debug|x86.Build.0 = Debug|Win32
{215586A6-9F5D-49E6-AA0C-48447C5499C2}.Release|x64.ActiveCfg = Release|x64
{215586A6-9F5D-49E6-AA0C-48447C5499C2}.Release|x64.Build.0 = Release|x64
{215586A6-9F5D-49E6-AA0C-48447C5499C2}.Release|x86.ActiveCfg = Release|Win32
{215586A6-9F5D-49E6-AA0C-48447C5499C2}.Release|x86.Build.0 = Release|Win32
{D8EC05A7-4941-4559-A81F-90C092D3F148}.Debug|x64.ActiveCfg = Debug|x64
{D8EC05A7-4941-4559-A81F-90C092D3F148}.Debug|x64.Build.0 = Debug|x64
{D8EC05A7-4941-4559-A81F-90C092D3F148}.Debug|x86.ActiveCfg = Debug|Win32
{D8EC05A7-4941-4559-A81F-90C092D3F148}.Debug|x86.Build.0 = Debug|Win32
{D8EC05A7-4941-4559-A81F-90C092D3F148}.Release|x64.ActiveCfg = Release|x64
{D8EC05A7-4941-4559-A81F-90C092D3F148}.Release|x64.Build.0 = Release|x64
{D8EC05A7-4941-4559-A81F-90C092D3F148}.Release|x86.ActiveCfg = Release|Win32
{D8EC05A7-4941-4559-A81F-90C092D3F148}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D1F7D850-A09C-4087-9B04-AF761EBEF144}
EndGlobalSection
EndGlobal
Binary file renamed src/Calculator.cpp → ...orld/Calculator/Calculator/Calculator.cpp
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion src/Calculator.h → ...dWorld/Calculator/Calculator/Calculator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
#pragma once
#include "stdafx.h"
//#include "stdafx.h"
#include <stack>
#include <vector>
#include <iostream>
#include "stdlib.h"
#include <ctime>
#include <string>

using namespace std;

class Calculator {
private:
string op[4] = { "+", "-", "*", "/" };

public:
Calculator();
string MakeFormula();
Expand Down
162 changes: 162 additions & 0 deletions TheSoundWorld/Calculator/Calculator/Calculator.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{215586A6-9F5D-49E6-AA0C-48447C5499C2}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Calculator</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Calculator.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Calculator.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
27 changes: 27 additions & 0 deletions TheSoundWorld/Calculator/Calculator/Calculator.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="源文件">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="头文件">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="资源文件">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Calculator.cpp">
<Filter>源文件</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Calculator.h">
<Filter>头文件</Filter>
</ClInclude>
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions TheSoundWorld/Calculator/Calculator/Calculator.vcxproj.user
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ShowAllFiles>false</ShowAllFiles>
</PropertyGroup>
</Project>
3 changes: 3 additions & 0 deletions TheSoundWorld/Calculator/Calculator/Debug/Calculator.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
 Calculator.cpp
D:\Repos\Calculator\TheSoundWorld\Calculator\Calculator\Calculator.cpp(75,20): warning C4018: “<”: 有符号/无符号不匹配
Calculator.vcxproj -> D:\Repos\Calculator\TheSoundWorld\Calculator\Debug\Calculator.exe
Binary file added TheSoundWorld/Calculator/Calculator/Debug/Calculator.tlog/CL.command.1.tlog
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/Calculator/Debug/Calculator.tlog/CL.read.1.tlog
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/Calculator/Debug/Calculator.tlog/CL.write.1.tlog
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions TheSoundWorld/Calculator/Calculator/Debug/Calculator.tlog/Calculator.lastbuildstate
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0
Debug|Win32|D:\Repos\Calculator\TheSoundWorld\Calculator\|
Binary file added TheSoundWorld/Calculator/Calculator/Debug/Calculator.tlog/link.command.1.tlog
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/Calculator/Debug/Calculator.tlog/link.read.1.tlog
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/Calculator/Debug/Calculator.tlog/link.write.1.tlog
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/Calculator/Debug/vc142.idb
View file
Open in desktop
Binary file not shown.
Binary file added TheSoundWorld/Calculator/Calculator/Debug/vc142.pdb
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions TheSoundWorld/Calculator/Calculator/subject.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
74+2*26*80=3386
99/44*65/36=1
95*22+87=129
30*13+100=142
22-30-36*53=-1863
20-70=-50
87*67=5829
57*47=2679
23/66=0
94-48=46
20 changes: 20 additions & 0 deletions TheSoundWorld/Calculator/CalculatorUnitTest/CalculatorUnitTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#include "pch.h"
#include "CppUnitTest.h"
#include "../Calculator/calculator.h"

using namespace Microsoft::VisualStudio::CppUnitTestFramework;

namespace CalculatorUnitTest
{
TEST_CLASS(CalculatorUnitTest)
{
public:

TEST_METHOD(TestMethod1)
{
Calculator* calc = new Calculator();
string ret = calc->Solve("2/4");
Assert::AreEqual(ret, (string)"2/4=1/2");
}
};
}
Loading