Анастасия Петуненкова 2 роки тому
батько
коміт
d48bc6ab9b
7 змінених файлів з 208 додано та 2 видалено
  1. 6 0
      Moduln.sln
  2. 21 0
      Moduln/Otlad.cs
  3. 68 2
      Moduln/Program.cs
  4. 20 0
      Test/Properties/AssemblyInfo.cs
  5. 74 0
      Test/Test.csproj
  6. 14 0
      Test/UnitTest1.cs
  7. 5 0
      Test/packages.config

+ 6 - 0
Moduln.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 17.2.32526.322
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moduln", "\main\RDP\31П\ПетуненковаАП\Desktop\Moduln\Moduln\Moduln\Moduln.csproj", "{56892D64-FB15-4954-95E2-F099FB0867A7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "\main\RDP\31П\ПетуненковаАП\Desktop\Moduln\Moduln\Test\Test.csproj", "{B2640ABF-6F39-45B8-92EF-F6A3ECC24DD0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{56892D64-FB15-4954-95E2-F099FB0867A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{56892D64-FB15-4954-95E2-F099FB0867A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56892D64-FB15-4954-95E2-F099FB0867A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2640ABF-6F39-45B8-92EF-F6A3ECC24DD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2640ABF-6F39-45B8-92EF-F6A3ECC24DD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2640ABF-6F39-45B8-92EF-F6A3ECC24DD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2640ABF-6F39-45B8-92EF-F6A3ECC24DD0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 21 - 0
Moduln/Otlad.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Diagnostics;
+
+namespace Moduln
+{
+    class Otlad
+    {
+        public static void otla()
+        {
+          Trace.Listeners.Add(new TextWriterTraceListener("Debug.txt"));
+          Debug.Indent();
+          Console.WriteLine("Дата запуска программы{0}",DateTime.Today);
+          Trace.Flush();
+        }
+        
+    }
+}

+ 68 - 2
Moduln/Program.cs

@@ -6,9 +6,75 @@ namespace Moduln
     {
         static void Main(string[] args)
         {
-
+            Console.WriteLine("Введите артикул труб в партии, если PN10 - введите 1,если PN16 - 2,если PN20 - 3, PN25 -4");
+            string v = Convert.ToString(Console.ReadLine());
+            Console.WriteLine("Введите значение длины трубы");
+            int dlina = Convert.ToInt32(Console.ReadLine());
+            Console.WriteLine("Введите значение внешнего диаметра трубы");
+            int vnesh_d = Convert.ToInt32(Console.ReadLine());
+            Console.WriteLine("Введите значение толщины стенки трубы");
+            int tol_sten = Convert.ToInt32(Console.ReadLine());
+            brak(v, dlina, vnesh_d, tol_sten);
+      
         }
 
-        
+        public static void brak(string v, int dlina,int vnesh_d, int tol_sten)
+        {
+            bool d = false;
+            bool v_d = false;
+            bool t_s = false;
+            switch (v)
+            {
+                case "1":
+                    if ((dlina > 3059) && (dlina < 4041))
+                    {
+                        d = true;
+                    }
+                    else { Console.WriteLine("Длина изделия вышла за границы допустимой погрешности"); };
+                    if ((vnesh_d == 20) && (vnesh_d == 25) && (vnesh_d == 32) && (vnesh_d == 40) && (vnesh_d == 50) && (vnesh_d == 63))
+                    {
+                        v_d = true;
+                    }
+                    else {Console.WriteLine("Данный внешний диаметр не указан в таблице"); };
+                    if ((tol_sten > 2) && (tol_sten < 2.2))
+                    {
+                        t_s = true;
+                    }
+                    else if((tol_sten > 2.7) && (tol_sten < 2.8))
+                    {
+                        t_s = true;
+                    }
+                    else if ((tol_sten > 2.5) && (tol_sten < 2.75))
+                    {
+                        t_s = true;
+                    }
+                    else if ((tol_sten > 3.2) && (tol_sten < 3.52))
+                    {
+                        t_s = true;
+                    }
+                    else if ((tol_sten > 4) && (tol_sten < 4.4))
+                    {
+                        t_s = true;
+                    }
+                    else if ((tol_sten > 6.3) && (tol_sten < 6.93))
+                    {
+                        t_s = true;
+                    }
+                    else { Console.WriteLine("Данная толщина стенки выходит за границы допустимой погрешности"); };
+                    if ((d = true) || (v_d = true) || (t_s = true))
+                    {
+                        Console.WriteLine("Изделиее соответствует");
+                    }
+                    else { Console.WriteLine("Изделие не соответсвтует"); }
+                    break;
+               
+                    
+              
+
+
+            }
+            
+        }
+       
     }
 }

+ 20 - 0
Test/Properties/AssemblyInfo.cs

@@ -0,0 +1,20 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Test")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Test")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("b2640abf-6f39-45b8-92ef-f6a3ecc24dd0")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 74 - 0
Test/Test.csproj

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{B2640ABF-6F39-45B8-92EF-F6A3ECC24DD0}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Test</RootNamespace>
+    <AssemblyName>Test</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="UnitTest1.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Moduln\Moduln.csproj">
+      <Project>{56892d64-fb15-4954-95e2-f099fb0867a7}</Project>
+      <Name>Moduln</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их.  Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets'))" />
+  </Target>
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets')" />
+</Project>

+ 14 - 0
Test/UnitTest1.cs

@@ -0,0 +1,14 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+
+namespace Test
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        [TestMethod]
+        public void TestMethod1()
+        {
+        }
+    }
+}

+ 5 - 0
Test/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MSTest.TestAdapter" version="2.2.7" targetFramework="net472" />
+  <package id="MSTest.TestFramework" version="2.2.7" targetFramework="net472" />
+</packages>