pm87ix5ws
/
phfpcjwu5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

First commit

Browse Source
master
罗梓端 5 years ago
parent 6e4319d5bd
commit fa64ca4c8a
29 changed files with 305 additions and 0 deletions
Show Stats Download Patch File Download Diff File

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

Binary file not shown.

BIN
teammerger/.vs/teammerger/v16/Browse.VC.db
View File

Binary file not shown.

BIN
teammerger/.vs/teammerger/v16/ipch/AutoPCH/2eca2b8263599408/D.ipch
View File

Binary file not shown.

BIN
teammerger/.vs/teammerger/v16/ipch/AutoPCH/50358754ae4e0aea/A.ipch
View File

Binary file not shown.

BIN
teammerger/.vs/teammerger/v16/ipch/AutoPCH/b0cf379fc99f0a9f/MERGER.ipch
View File

Binary file not shown.

BIN
teammerger/Debug/merger.obj
View File

Binary file not shown.

BIN
teammerger/Debug/teammerger.exe
View File

Binary file not shown.

BIN
teammerger/Debug/teammerger.ilk
View File

Binary file not shown.

3
teammerger/Debug/teammerger.log
Unescape View File

@ -0,0 +1,3 @@
 merger.cpp
D:\VSC++\C++wen jian\teammerger\c.h(34): warning C4715: “compute”: 不是所有的控件路径都返回值
teammerger.vcxproj -> D:\VSC++\C++wen jian\teammerger\Debug\teammerger.exe

BIN
teammerger/Debug/teammerger.pdb
View File

Binary file not shown.

BIN
teammerger/Debug/teammerger.tlog/CL.command.1.tlog
View File

Binary file not shown.

BIN
teammerger/Debug/teammerger.tlog/CL.read.1.tlog
View File

Binary file not shown.

BIN
teammerger/Debug/teammerger.tlog/CL.write.1.tlog
View File

Binary file not shown.

BIN
teammerger/Debug/teammerger.tlog/link.command.1.tlog
View File

Binary file not shown.

BIN
teammerger/Debug/teammerger.tlog/link.read.1.tlog
View File

Binary file not shown.

BIN
teammerger/Debug/teammerger.tlog/link.write.1.tlog
View File

Binary file not shown.

2
teammerger/Debug/teammerger.tlog/teammerger.lastbuildstate
Unescape View File

@ -0,0 +1,2 @@
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.26.28801:TargetPlatformVersion=10.0.18362.0:
Debug|Win32|D:\VSC++\C++wen jian\teammerger\|

2
teammerger/Debug/teammerger.vcxproj.FileListAbsolute.txt
Unescape View File

@ -0,0 +1,2 @@
D:\VSC++\C++wen jian\teammerger\Debug\teammerger.exe
D:\VSC++\C++wen jian\teammerger\Debug\teammerger.pdb

BIN
teammerger/Debug/vc142.idb
View File

Binary file not shown.

BIN
teammerger/Debug/vc142.pdb
View File

Binary file not shown.

8
teammerger/a.h
Unescape View File

@ -0,0 +1,8 @@
#pragma once
#include<iostream>
#include<cmath>
using namespace std;
double powe(int x)
{
return exp(x);
}

7
teammerger/b.h
Unescape View File

@ -0,0 +1,7 @@
#include<iostream>
#include<cmath>
using namespace std;
double coun(double a,double x)
{
return log(x)/log(a); //logax = log(x)/log(a)
}

35
teammerger/c.h
Unescape View File

@ -0,0 +1,35 @@
#pragma once
#include<iostream>
#include<stack>
#include<string.h>
#include<iomanip>
#include<map>
#include<algorithm>
using namespace std;
stack<char> opr;
stack<double> in;
std::map<char, int> m;
double compute(double a, double b, char c)
{
if (c == '+') return a + b;
else if (c == '-') return a - b;
else if (c == '*') return a * b;
else if (c == '/') return a / b;
}

4
teammerger/d.h
Unescape View File

@ -0,0 +1,4 @@
#pragma once
#include<iostream>
#include<cmath>
using namespace std;

16
teammerger/merger.cpp
Unescape View File

@ -0,0 +1,16 @@
#include<iostream>
#include<string.h>
#include "a.h"
#include "b.h"
#include "c.h"
#include "d.h"
using namespace std;
int main()
{
cout << powe(2) << "测试_A编写一个可以运算e^x运算的a.hpp"<<endl;
cout << coun(2, 8) << "测试_B编写一个可以运算logax的b.hpp"<<endl;
cout << compute(2, 5, '+') << "测试_C编写一个可以运算加减乘除的c.hpp"<<endl;
cout << sin(90) << "测试_D编写一个可以运算三角函数的d.hpp"<<endl;
return 0;
}

31
teammerger/teammerger.sln
Unescape View File

@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30320.27
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "teammerger", "teammerger.vcxproj", "{1CFA0810-FCDD-461D-A45C-C427DE9542B6}"
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
{1CFA0810-FCDD-461D-A45C-C427DE9542B6}.Debug|x64.ActiveCfg = Debug|x64
{1CFA0810-FCDD-461D-A45C-C427DE9542B6}.Debug|x64.Build.0 = Debug|x64
{1CFA0810-FCDD-461D-A45C-C427DE9542B6}.Debug|x86.ActiveCfg = Debug|Win32
{1CFA0810-FCDD-461D-A45C-C427DE9542B6}.Debug|x86.Build.0 = Debug|Win32
{1CFA0810-FCDD-461D-A45C-C427DE9542B6}.Release|x64.ActiveCfg = Release|x64
{1CFA0810-FCDD-461D-A45C-C427DE9542B6}.Release|x64.Build.0 = Release|x64
{1CFA0810-FCDD-461D-A45C-C427DE9542B6}.Release|x86.ActiveCfg = Release|Win32
{1CFA0810-FCDD-461D-A45C-C427DE9542B6}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {99035B9F-EB43-4732-83E0-6CC8C2962060}
EndGlobalSection
EndGlobal

154
teammerger/teammerger.vcxproj
Unescape View File

@ -0,0 +1,154 @@
<?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>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{1cfa0810-fcdd-461d-a45c-c427de9542b6}</ProjectGuid>
<RootNamespace>teammerger</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)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<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)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<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)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<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|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<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>
<ClInclude Include="..\a.h" />
<ClInclude Include="a.h" />
<ClInclude Include="b.h" />
<ClInclude Include="c.h" />
<ClInclude Include="d.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="merger.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

39
teammerger/teammerger.vcxproj.filters
Unescape View File

@ -0,0 +1,39 @@
<?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;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="头文件">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;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>
<ClInclude Include="..\a.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="d.h">
<Filter>源文件</Filter>
</ClInclude>
<ClInclude Include="a.h">
<Filter>源文件</Filter>
</ClInclude>
<ClInclude Include="b.h">
<Filter>源文件</Filter>
</ClInclude>
<ClInclude Include="c.h">
<Filter>源文件</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="merger.cpp">
<Filter>源文件</Filter>
</ClCompile>
</ItemGroup>
</Project>

4
teammerger/teammerger.vcxproj.user
Unescape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>
Write Preview
Loading…
Cancel
Save