Compare commits

..

No commits in common. "Ветка-1" and "main" have entirely different histories.

44 changed files with 0 additions and 401 deletions

Binary file not shown.

View File

@ -1,53 +0,0 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\Maksim\\source\\repos\\Project1\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}|Project1\\Project1.vcxproj|C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\main.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
"RelativeMoniker": "D:0:0:{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}|Project1\\Project1.vcxproj|solutionrelative:Project1\\main.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
},
{
"AbsoluteMoniker": "D:0:0:{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}|Project1\\Project1.vcxproj|C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\math.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
"RelativeMoniker": "D:0:0:{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}|Project1\\Project1.vcxproj|solutionrelative:Project1\\math.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
}
],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "math.cpp",
"DocumentMoniker": "C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\math.cpp",
"RelativeDocumentMoniker": "Project1\\math.cpp",
"ToolTip": "C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\math.cpp",
"RelativeToolTip": "Project1\\math.cpp",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
"WhenOpened": "2024-09-05T14:48:31.4Z"
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "main.cpp",
"DocumentMoniker": "C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\main.cpp",
"RelativeDocumentMoniker": "Project1\\main.cpp",
"ToolTip": "C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\main.cpp",
"RelativeToolTip": "Project1\\main.cpp",
"ViewState": "AgIAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
"WhenOpened": "2024-09-05T08:55:09.331Z",
"EditorCaption": ""
}
]
}
]
}
]
}

View File

@ -1,53 +0,0 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\Maksim\\source\\repos\\Project1\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}|Project1\\Project1.vcxproj|C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\main.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
"RelativeMoniker": "D:0:0:{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}|Project1\\Project1.vcxproj|solutionrelative:Project1\\main.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
},
{
"AbsoluteMoniker": "D:0:0:{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}|Project1\\Project1.vcxproj|C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\math.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
"RelativeMoniker": "D:0:0:{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}|Project1\\Project1.vcxproj|solutionrelative:Project1\\math.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
}
],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "math.cpp",
"DocumentMoniker": "C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\math.cpp",
"RelativeDocumentMoniker": "Project1\\math.cpp",
"ToolTip": "C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\math.cpp",
"RelativeToolTip": "Project1\\math.cpp",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
"WhenOpened": "2024-09-05T14:48:31.4Z"
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "main.cpp",
"DocumentMoniker": "C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\main.cpp",
"RelativeDocumentMoniker": "Project1\\main.cpp",
"ToolTip": "C:\\Users\\Maksim\\source\\repos\\Project1\\Project1\\main.cpp",
"RelativeToolTip": "Project1\\main.cpp",
"ViewState": "AgIAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|",
"WhenOpened": "2024-09-05T08:55:09.331Z",
"EditorCaption": ""
}
]
}
]
}
]
}

View File

@ -1,31 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.11.35222.181
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project1", "Project1\Project1.vcxproj", "{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}"
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
{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}.Debug|x64.ActiveCfg = Debug|x64
{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}.Debug|x64.Build.0 = Debug|x64
{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}.Debug|x86.ActiveCfg = Debug|Win32
{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}.Debug|x86.Build.0 = Debug|Win32
{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}.Release|x64.ActiveCfg = Release|x64
{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}.Release|x64.Build.0 = Release|x64
{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}.Release|x86.ActiveCfg = Release|Win32
{57C2E2D1-E835-40C3-954C-9CFB9EAE45E4}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C7241289-5224-42E0-9AD1-D19D00CD469B}
EndGlobalSection
EndGlobal

View File

@ -1,136 +0,0 @@
<?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>17.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{57c2e2d1-e835-40c3-954c-9cfb9eae45e4}</ProjectGuid>
<RootNamespace>Project1</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>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</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" />
<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>
<ClCompile Include="main.cpp" />
<ClCompile Include="math.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,25 +0,0 @@
<?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++;cppm;ixx;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>
<ClCompile Include="main.cpp">
<Filter>Исходные файлы</Filter>
</ClCompile>
<ClCompile Include="math.cpp">
<Filter>Исходные файлы</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>

View File

@ -1,38 +0,0 @@
#include <stdio.h>
#include <Windows.h>
#include <math.h>
int main()
{
SetConsoleCP(1251);
SetConsoleOutputCP(1251);
printf(" * * \n");
printf("* *\n");
printf(" * *\n");
printf(" * *\n");
printf(" ***** \n");
formula();
return 0;
}
void formula();
void formula()
{
float side1, side2;
printf("Ňĺîđĺěŕ Ďčôŕăîđŕ\n");
printf("Ââĺäčňĺ ďĺđâűé ęŕňĺň - ");
scanf_s("%f", &side1);
printf("Enter second side: ");
scanf_s("%f", &side2);
float sumOfTwo = side1 * side1 + side2 * side2;
float hypotenuse = sqrtf(sumOfTwo);
printf("Hypotenuse: %f\n", hypotenuse);
}

View File

@ -1,26 +0,0 @@
#include <stdio.h>
#include <Windows.h>
#include <math.h>
void formula();
void math()
{
formula();
}
void formula()
{
int a1, a2;
printf("Òåîðåìà Ïèôàãîðà, ââåäè 2 áîêîâûå ñòîðîíû äëÿ íàõîæäåíèÿ ãèïîòèíóçû");
printf("Ââåäèòå ïåðâûé êàòåò = ");
scanf_s("%d", &a1);
printf("Ââåäèòå âòîðîé êàòåò = ");
scanf_s("%d", &a2);
int result, together;
together = a1 * a1 + a2 * a2;
result = sqrt(together);
printf("Ãèïîòèíóçà = %d", result);
}

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ProjectOutputs>
<ProjectOutput>
<FullPath>C:\Users\Maksim\source\repos\Project1\x64\Debug\Project1.exe</FullPath>
</ProjectOutput>
</ProjectOutputs>
<ContentFiles />
<SatelliteDlls />
<NonRecipeFileRefs />
</Project>

View File

@ -1,2 +0,0 @@
 main.cpp
C:\Users\Maksim\source\repos\Project1\Project1\main.cpp(15,2): error C3861: formula: идентификатор не найден

View File

@ -1,2 +0,0 @@
C:\Users\Maksim\source\repos\Project1\Project1\main.cpp;C:\Users\Maksim\source\repos\Project1\Project1\x64\Debug\main.obj
C:\Users\Maksim\source\repos\Project1\Project1\math.cpp;C:\Users\Maksim\source\repos\Project1\Project1\x64\Debug\math.obj

View File

@ -1,2 +0,0 @@
PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.41.34120:TargetPlatformVersion=10.0.22621.0:
Debug|x64|C:\Users\Maksim\source\repos\Project1\|

View File

@ -1,2 +0,0 @@
^C:\USERS\MAKSIM\SOURCE\REPOS\PROJECT1\PROJECT1\X64\DEBUG\MAIN.OBJ|C:\USERS\MAKSIM\SOURCE\REPOS\PROJECT1\PROJECT1\X64\DEBUG\MATH.OBJ
C:\Users\Maksim\source\repos\Project1\Project1\x64\Debug\Project1.ilk

Binary file not shown.

Binary file not shown.