From 941ec3c87e5ca0aea94304eba5b6c9e9463310fd Mon Sep 17 00:00:00 2001 From: jskonst Date: Fri, 28 Sep 2018 14:15:51 +0300 Subject: [PATCH 1/8] Made first lab --- CourseApp/Program.cs | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index 3f81738..73ed3e2 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -6,7 +6,7 @@ class Program { static void Main(string[] args) { - Console.WriteLine("Hello World!"); + Console.WriteLine("Konstantinov Eugeny Sergeevich"); } } } diff --git a/README.md b/README.md index ee1aa8c..370a89a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Course of c# -Please write your name and surname here \ No newline at end of file +Konstantinov Eugeny Sergeevich \ No newline at end of file From 24e7ad47efab86f3cf7aa3f8bad19f3aac744791 Mon Sep 17 00:00:00 2001 From: jskonst Date: Fri, 28 Sep 2018 14:20:33 +0300 Subject: [PATCH 2/8] Added blank line --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 370a89a..8e5c1f7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Course of c# -Konstantinov Eugeny Sergeevich \ No newline at end of file +Konstantinov Eugeny Sergeevich From 08a2f62ec0a6de936b2cbda1d4e94a0972bd2bb1 Mon Sep 17 00:00:00 2001 From: genyn <43672276+genyn@users.noreply.github.com> Date: Fri, 28 Sep 2018 16:32:34 +0300 Subject: [PATCH 3/8] Patch 1 (#8) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * я выполнил лабораторную работу (#3) * Delete CourseApp.sln --- CourseApp/CourseApp.csproj | 2 +- CourseApp/Program.cs | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CourseApp/CourseApp.csproj b/CourseApp/CourseApp.csproj index 23df604..ce1697a 100644 --- a/CourseApp/CourseApp.csproj +++ b/CourseApp/CourseApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + netcoreapp2.0 diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index 3f81738..36781e9 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -6,7 +6,7 @@ class Program { static void Main(string[] args) { - Console.WriteLine("Hello World!"); + Console.WriteLine("Evgenij_Novozhilov"); } } } diff --git a/README.md b/README.md index ee1aa8c..159830c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Course of c# -Please write your name and surname here \ No newline at end of file +Evgenij_Novozhilov \ No newline at end of file From 8ed62ec0c03231a5ca5db704d29dccaa028a1933 Mon Sep 17 00:00:00 2001 From: jskonst Date: Tue, 23 Oct 2018 13:49:54 +0300 Subject: [PATCH 4/8] no-issue Added sample --- CourseApp.Tests/CourseApp.Tests.csproj | 20 ++++++++++++++++ CourseApp.Tests/UnitTest1.cs | 33 ++++++++++++++++++++++++++ CourseApp/Program.cs | 25 ++++++++++++++++--- 3 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 CourseApp.Tests/CourseApp.Tests.csproj create mode 100644 CourseApp.Tests/UnitTest1.cs diff --git a/CourseApp.Tests/CourseApp.Tests.csproj b/CourseApp.Tests/CourseApp.Tests.csproj new file mode 100644 index 0000000..1631e30 --- /dev/null +++ b/CourseApp.Tests/CourseApp.Tests.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp2.1 + + false + + + + + + + + + + + + + + diff --git a/CourseApp.Tests/UnitTest1.cs b/CourseApp.Tests/UnitTest1.cs new file mode 100644 index 0000000..77f6d4f --- /dev/null +++ b/CourseApp.Tests/UnitTest1.cs @@ -0,0 +1,33 @@ +using System; +using Xunit; +using CourseApp; + +namespace CourseApp.Tests +{ + public class UnitTest1 + { + [Fact] + public void Test1() + { + var res = Program.summ(2,7); + Assert.Equal(9,res); + + } + + [Fact] + public void Test2() + { + var res = Program.summ(-2,7); + Assert.Equal(5,res); + + } + + [Fact] + public void TestMySimple() + { + var res = Program.myCalc(0,0, 0); + Assert.Equal(0,res); + + } + } +} diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index 73ed3e2..d85f84c 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -2,11 +2,30 @@ namespace CourseApp { - class Program + /** + 27 Variant + */ + public class Program { + public static int summ(int a, int b){ + return (a) + (b); + } + public static double myCalc(double a, double b, double x){ + var chisl = Math.Pow(a, 1.0/3.0) + Math.Pow(Math.Tan(b*x),4.5); + var znam = Math.Pow(b, 1/5.0) + 1/Math.Pow(Math.Tan(a*x), 2.7); + return chisl/znam; + } + static void Main(string[] args) { - Console.WriteLine("Konstantinov Eugeny Sergeevich"); + var a = 2; + var b = 4.1; + var xn = 0.77; + var xk = 1.77; + var dx = 0.2; + + double[] xs = {1.24, 1.38, 2.38, 3.21, 0.68}; + } } -} +} \ No newline at end of file From 70c8fe15fea73a59fb0e992091dc1d1962b7cb9a Mon Sep 17 00:00:00 2001 From: KristinaMelnik <43779590+KristinaMelnik@users.noreply.github.com> Date: Fri, 26 Oct 2018 09:00:14 +0300 Subject: [PATCH 5/8] 1 laba (#14) * 1 laba * laba2 * laba2 --- CourseApp/CourseApp.sln | 25 +++++++++++++++++++++++++ CourseApp/Program.cs | 29 +++++++++++++++++++++++++++-- README.md | 2 +- 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 CourseApp/CourseApp.sln diff --git a/CourseApp/CourseApp.sln b/CourseApp/CourseApp.sln new file mode 100644 index 0000000..0e202ea --- /dev/null +++ b/CourseApp/CourseApp.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27428.2002 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CourseApp", "CourseApp.csproj", "{5DC05C7A-13A4-4390-B7F6-56A756AE9DAB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5DC05C7A-13A4-4390-B7F6-56A756AE9DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DC05C7A-13A4-4390-B7F6-56A756AE9DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5DC05C7A-13A4-4390-B7F6-56A756AE9DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5DC05C7A-13A4-4390-B7F6-56A756AE9DAB}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0E4CFCC3-83E2-4924-A074-01939C8738C2} + EndGlobalSection +EndGlobal diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index 36781e9..c3d264b 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -1,12 +1,37 @@ using System; -namespace CourseApp +namespace laba2 { class Program { + public static double y(double x, double a, double b) + { + return ((Math.Pow(b, 3) + Math.Pow(Math.Sin(a * x), 2))) / (Math.Acos(x * b) + Math.Exp(-x / 2)); + } + static void Main(string[] args) { - Console.WriteLine("Evgenij_Novozhilov"); + double a = 1.2; + double b = 0.48; + double xn = 0.7; + double xk = 2.2; + double dx = 0.3; + + double[] x = new double[5] { 4.48, 3.56, 2.78, 5.28, 3.21 }; + + Console.WriteLine("Задача A:"); + + for (double xl = xn; xl < xk; xl += dx) + { + Console.WriteLine($"Для x = {xl}\t y = {y(xl, a, b):f3}"); + } + + Console.WriteLine("Задача B:"); + + foreach (double i in x) + { + Console.WriteLine($"Для x = {i}\t y = {y(i, a, b):f3}"); + } } } } diff --git a/README.md b/README.md index 159830c..f301fc4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Course of c# -Evgenij_Novozhilov \ No newline at end of file +Kristina_Melnik From ad8ea4792bb46d98c3b469f419f14237e39ba0e2 Mon Sep 17 00:00:00 2001 From: jskonst Date: Tue, 11 Dec 2018 13:21:36 +0300 Subject: [PATCH 6/8] Added stylecop --- CourseApp.Tests/CourseApp.Tests.csproj | 50 +++++++++++++++----------- CourseApp.Tests/DemoTest.cs | 14 ++++++++ CourseApp/CourseApp.csproj | 15 ++++++++ CourseApp/Program.cs | 26 +++----------- README.md | 2 +- stylecop/stylecop.json | 15 ++++++++ stylecop/stylecop.ruleset | 22 ++++++++++++ 7 files changed, 101 insertions(+), 43 deletions(-) create mode 100644 CourseApp.Tests/DemoTest.cs create mode 100644 stylecop/stylecop.json create mode 100644 stylecop/stylecop.ruleset diff --git a/CourseApp.Tests/CourseApp.Tests.csproj b/CourseApp.Tests/CourseApp.Tests.csproj index 1631e30..dcfd1f9 100644 --- a/CourseApp.Tests/CourseApp.Tests.csproj +++ b/CourseApp.Tests/CourseApp.Tests.csproj @@ -1,20 +1,30 @@ - - - - netcoreapp2.1 - - false - - - - - - - - - - - - - - + + + + netcoreapp2.2 + True + 1573,1591,1701;1702;1705 + false + + + + + + + + + + + + + + + ../stylecop/stylecop.ruleset + true + + + + + + + diff --git a/CourseApp.Tests/DemoTest.cs b/CourseApp.Tests/DemoTest.cs new file mode 100644 index 0000000..09e415e --- /dev/null +++ b/CourseApp.Tests/DemoTest.cs @@ -0,0 +1,14 @@ +using System; +using Xunit; + +namespace CourseApp.Tests +{ + public class DemoTest + { + [Fact] + public void Test1() + { + Assert.True(true); + } + } +} diff --git a/CourseApp/CourseApp.csproj b/CourseApp/CourseApp.csproj index 23df604..cc0df39 100644 --- a/CourseApp/CourseApp.csproj +++ b/CourseApp/CourseApp.csproj @@ -3,6 +3,21 @@ Exe netcoreapp2.1 + True + 1573,1591,1701;1702;1705 + + + + + + ../stylecop/stylecop.ruleset + true + + + + + + diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index d85f84c..248bbe4 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -2,30 +2,12 @@ namespace CourseApp { - /** - 27 Variant - */ public class Program { - public static int summ(int a, int b){ - return (a) + (b); - } - public static double myCalc(double a, double b, double x){ - var chisl = Math.Pow(a, 1.0/3.0) + Math.Pow(Math.Tan(b*x),4.5); - var znam = Math.Pow(b, 1/5.0) + 1/Math.Pow(Math.Tan(a*x), 2.7); - return chisl/znam; - } - - static void Main(string[] args) + public static void Main(string[] args) { - var a = 2; - var b = 4.1; - var xn = 0.77; - var xk = 1.77; - var dx = 0.2; - - double[] xs = {1.24, 1.38, 2.38, 3.21, 0.68}; - + Console.WriteLine("Hello World!"); + Console.ReadLine(); } } -} \ No newline at end of file +} diff --git a/README.md b/README.md index 8e5c1f7..ee1aa8c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Course of c# -Konstantinov Eugeny Sergeevich +Please write your name and surname here \ No newline at end of file diff --git a/stylecop/stylecop.json b/stylecop/stylecop.json new file mode 100644 index 0000000..643b8c1 --- /dev/null +++ b/stylecop/stylecop.json @@ -0,0 +1,15 @@ +{ + "$schema": + "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", + "settings": { + "documentationRules": { + "documentExposedElements": false, + "documentInterfaces": false, + "companyName": "Test Company", + "copyrightText": + "This source code is Copyright © {companyName} and MAY NOT be copied, reproduced,\npublished, distributed or transmitted to or stored in any manner without prior\nwritten consent from {companyName} (www.yourcompany.com).", + "xmlHeader": false + } + }, + "additionalArguments": ["./stylecop.ruleset", "./stylecop.json"] +} diff --git a/stylecop/stylecop.ruleset b/stylecop/stylecop.ruleset new file mode 100644 index 0000000..3350d0e --- /dev/null +++ b/stylecop/stylecop.ruleset @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 17415aee4ecea4aa3c4b7c3179f8117d1615701a Mon Sep 17 00:00:00 2001 From: jskonst Date: Tue, 18 Dec 2018 14:13:16 +0300 Subject: [PATCH 7/8] Fixed project --- CourseApp.Tests/CourseApp.Tests.csproj | 19 -- CourseApp.Tests/PigTests.cs | 415 +++++++++++++------------ CourseApp.Tests/UnitTest1.cs | 12 +- CourseApp/Pig.cs | 38 ++- CourseApp/Program.cs | 31 +- 5 files changed, 250 insertions(+), 265 deletions(-) diff --git a/CourseApp.Tests/CourseApp.Tests.csproj b/CourseApp.Tests/CourseApp.Tests.csproj index 32ffc63..a739509 100644 --- a/CourseApp.Tests/CourseApp.Tests.csproj +++ b/CourseApp.Tests/CourseApp.Tests.csproj @@ -1,22 +1,3 @@ - - - - netcoreapp2.1 - - false - - - - - - - - - - - - - diff --git a/CourseApp.Tests/PigTests.cs b/CourseApp.Tests/PigTests.cs index 9287eef..a3f4279 100644 --- a/CourseApp.Tests/PigTests.cs +++ b/CourseApp.Tests/PigTests.cs @@ -9,218 +9,221 @@ public class UnitTest2 [Fact] public void CheckSecondKonstruktor1() { - Pig Pig12 = new pig(15, 150); - Assert.Equal(6, Pig12.Name.weight); - Assert.Equal("Noname", Pig12.Name); - Assert.Equal(15, Pig12.age); - Assert.Equal(150, Pig12.weight); + Pig pig12 = new Pig(15, 150); + Assert.Equal(6, pig12.Weight); + Assert.Equal("Noname", pig12.Name); + Assert.Equal(15, pig12.Age); + Assert.Equal(150, pig12.Weight); } [Fact] public void CheckSecondKonstruktor2() { - Pig Pig12 = new Pig(15, 150); - Assert.Equal(6, Pig12.Name.weight); - Assert.Equal("Noname", Pig12.Name); - Assert.Equal(15, Pig12.age); - Assert.Equal(150, Pig12.weight); + Pig pig12 = new Pig(15, 150); + Assert.Equal(6, pig12.Weight); + Assert.Equal("Noname", pig12.Name); + Assert.Equal(15, pig12.Age); + Assert.Equal(150, pig12.Weight); } - [Fact] - public void CheckSecondKonstruktor1() - { - Pig Pig11 = new pig(19, 180); - Assert.Equal(6, Pig11.Name.weight); - Assert.Equal("Tuka", Pig11.Name); - Assert.Equal(19, Pig11.age); - Assert.Equal(180, Pig11.weight); - } - [Fact] - public void CheckSecondKonstruktor2() - { + + // [Fact] + // public void CheckSecondKonstruktor1() + // { + // Pig Pig11 = new pig(19, 180); + // Assert.Equal(6, Pig11.Name.weight); + // Assert.Equal("Tuka", Pig11.Name); + // Assert.Equal(19, Pig11.age); + // Assert.Equal(180, Pig11.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor2() + // { - Pig Pig11 = new pig(19, 180); - Assert.Equal(6, Pig11.Name.weight); - Assert.Equal("Tuka", Pig11.Name); - Assert.Equal(19, Pig11.age); - Assert.Equal(180, Pig11.weight); - } - [Fact] - public void CheckSecondKonstruktor1() - { - Pig Pig10 = new pig(21, 215); - Assert.Equal(6, Pig10.Name.weight); - Assert.Equal("Noname", Pig10.Name); - Assert.Equal(21, Pig10.age); - Assert.Equal(215, Pig10.weight); - } - [Fact] - public void CheckSecondKonstruktor2() - { - Pig Pig10 = new pig(21, 215); - Assert.Equal(6, Pig10.Name.weight); - Assert.Equal("Noname", Pig10.Name); - Assert.Equal(21, Pig10.age); - Assert.Equal(215, Pig10.weight); - } - [Fact] - public void CheckSecondKonstruktor1() - { - Pig Pig9 = new pig(25, 350); - Assert.Equal(6, Pig9.Name.weight); - Assert.Equal("Fufa", Pig9.Name); - Assert.Equal(25, Pig9.age); - Assert.Equal(350, Pig9.weight); - } - [Fact] - public void CheckSecondKonstruktor2() - { - Pig Pig9 = new pig(25, 350); - Assert.Equal(6, Pig9.Name.weight); - Assert.Equal("Fufa", Pig9.Name); - Assert.Equal(25, Pig9.age); - Assert.Equal(350, Pig9.weight); - } - [Fact] - public void CheckSecondKonstruktor1() - { - Pig Pig8 = new pig(22, 270); - Assert.Equal(6, Pig8.Name.weight); - Assert.Equal("Lupa", Pig8.Name); - Assert.Equal(22, Pig8.age); - Assert.Equal(270, Pig8.weight); - } - [Fact] - public void CheckSecondKonstruktor2() - { - Pig Pig8 = new pig(22, 270); - Assert.Equal(6, Pig8.Name.weight); - Assert.Equal("Lupa", Pig8.Name); - Assert.Equal(22, Pig8.age); - Assert.Equal(270, Pig8.weight); - } - [Fact] - public void CheckSecondKonstruktor1() - { - Pig Pig7 = new pig(20, 200); - Assert.Equal(6, Pig7.Name.weight); - Assert.Equal("Noname", Pig7.Name); - Assert.Equal(20, Pig7.age); - Assert.Equal(200, Pig7.weight); - } - [Fact] - public void CheckSecondKonstruktor2() - { - Pig Pig7 = new pig(20, 200); - Assert.Equal(6, Pig7.Name.weight); - Assert.Equal("Noname", Pig7.Name); - Assert.Equal(20, Pig7.age); - Assert.Equal(200, Pig7.weight); - } - [Fact] - public void CheckSecondKonstruktor1() - { - Pig Pig6 = new pig(12, 120); - Assert.Equal(6, Pig6.Name.weight); - Assert.Equal("Keka", Pig6.Name); - Assert.Equal(12, Pig6.age); - Assert.Equal(120, Pig6.weight); - } - [Fact] - public void CheckSecondKonstruktor2() - { - Pig Pig6 = new pig(12, 120); - Assert.Equal(6, Pig6.Name.weight); - Assert.Equal("Keka", Pig6.Name); - Assert.Equal(12, Pig6.age); - Assert.Equal(120, Pig6.weight); - } - [Fact] - public void CheckSecondKonstruktor1() - { - Pig Pig5 = new pig(10, 100); - Assert.Equal(6, Pig5.Name.weight); - Assert.Equal("Puta", Pig5.Name); - Assert.Equal(10, Pig5.age); - Assert.Equal(100, Pig5.weight); - } - [Fact] - public void CheckSecondKonstruktor2() - { - Pig Pig5 = new pig(10, 100); - Assert.Equal(6, Pig5.Name.weight); - Assert.Equal("Puta", Pig5.Name); - Assert.Equal(10, Pig5.age); - Assert.Equal(100, Pig5.weight); - } + // Pig Pig11 = new pig(19, 180); + // Assert.Equal(6, Pig11.Name.weight); + // Assert.Equal("Tuka", Pig11.Name); + // Assert.Equal(19, Pig11.age); + // Assert.Equal(180, Pig11.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor1() + // { + // Pig Pig10 = new pig(21, 215); + // Assert.Equal(6, Pig10.Name.weight); + // Assert.Equal("Noname", Pig10.Name); + // Assert.Equal(21, Pig10.age); + // Assert.Equal(215, Pig10.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor2() + // { + // Pig Pig10 = new pig(21, 215); + // Assert.Equal(6, Pig10.Name.weight); + // Assert.Equal("Noname", Pig10.Name); + // Assert.Equal(21, Pig10.age); + // Assert.Equal(215, Pig10.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor1() + // { + // Pig Pig9 = new pig(25, 350); + // Assert.Equal(6, Pig9.Name.weight); + // Assert.Equal("Fufa", Pig9.Name); + // Assert.Equal(25, Pig9.age); + // Assert.Equal(350, Pig9.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor2() + // { + // Pig Pig9 = new pig(25, 350); + // Assert.Equal(6, Pig9.Name.weight); + // Assert.Equal("Fufa", Pig9.Name); + // Assert.Equal(25, Pig9.age); + // Assert.Equal(350, Pig9.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor1() + // { + // Pig Pig8 = new pig(22, 270); + // Assert.Equal(6, Pig8.Name.weight); + // Assert.Equal("Lupa", Pig8.Name); + // Assert.Equal(22, Pig8.age); + // Assert.Equal(270, Pig8.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor2() + // { + // Pig Pig8 = new pig(22, 270); + // Assert.Equal(6, Pig8.Name.weight); + // Assert.Equal("Lupa", Pig8.Name); + // Assert.Equal(22, Pig8.age); + // Assert.Equal(270, Pig8.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor1() + // { + // Pig Pig7 = new pig(20, 200); + // Assert.Equal(6, Pig7.Name.weight); + // Assert.Equal("Noname", Pig7.Name); + // Assert.Equal(20, Pig7.age); + // Assert.Equal(200, Pig7.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor2() + // { + // Pig Pig7 = new pig(20, 200); + // Assert.Equal(6, Pig7.Name.weight); + // Assert.Equal("Noname", Pig7.Name); + // Assert.Equal(20, Pig7.age); + // Assert.Equal(200, Pig7.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor1() + // { + // Pig Pig6 = new pig(12, 120); + // Assert.Equal(6, Pig6.Name.weight); + // Assert.Equal("Keka", Pig6.Name); + // Assert.Equal(12, Pig6.age); + // Assert.Equal(120, Pig6.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor2() + // { + // Pig Pig6 = new pig(12, 120); + // Assert.Equal(6, Pig6.Name.weight); + // Assert.Equal("Keka", Pig6.Name); + // Assert.Equal(12, Pig6.age); + // Assert.Equal(120, Pig6.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor1() + // { + // Pig Pig5 = new pig(10, 100); + // Assert.Equal(6, Pig5.Name.weight); + // Assert.Equal("Puta", Pig5.Name); + // Assert.Equal(10, Pig5.age); + // Assert.Equal(100, Pig5.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor2() + // { + // Pig Pig5 = new pig(10, 100); + // Assert.Equal(6, Pig5.Name.weight); + // Assert.Equal("Puta", Pig5.Name); + // Assert.Equal(10, Pig5.age); + // Assert.Equal(100, Pig5.weight); + // } - [Fact] - public void CheckSecondKonstruktor1() - { - Pig Pig4 = new pig(19, 150); - Assert.Equal(6, Pig4.Name.weight); - Assert.Equal("Supa", Pig4.Name); - Assert.Equal(19, Pig4.age); - Assert.Equal(150, Pig4.weight); - } - [Fact] - public void CheckSecondKonstruktor2() - { - Pig Pig4 = new pig(19, 150); - Assert.Equal(6, Pig4.Name.weight); - Assert.Equal("Supa", Pig4.Name); - Assert.Equal(19, Pig4.age); - Assert.Equal(150, Pig4.weight); - } + // [Fact] + // public void CheckSecondKonstruktor1() + // { + // Pig Pig4 = new pig(19, 150); + // Assert.Equal(6, Pig4.Name.weight); + // Assert.Equal("Supa", Pig4.Name); + // Assert.Equal(19, Pig4.age); + // Assert.Equal(150, Pig4.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor2() + // { + // Pig Pig4 = new pig(19, 150); + // Assert.Equal(6, Pig4.Name.weight); + // Assert.Equal("Supa", Pig4.Name); + // Assert.Equal(19, Pig4.age); + // Assert.Equal(150, Pig4.weight); + // } - [Fact] - public void CheckSecondKonstruktor1() - { - Pig Pig3 = new pig(9, 100); - Assert.Equal(6, Pig3.Name.weight); - Assert.Equal("Nope", Pig3.Name); - Assert.Equal(9, Pig3.age); - Assert.Equal(100, Pig3.weight); - } - [Fact] - public void CheckSecondKonstruktor2() - { - Pig Pig3 = new pig(9, 100); - Assert.Equal(6, Pig3.Name.weight); - Assert.Equal("Nope", Pig3.Name); - Assert.Equal(9, Pig3.age); - Assert.Equal(100, Pig3.weight); - } [Fact] - public void CheckSecondKonstruktor1() - { - Pig Pig2 = new pig(25, 280); - Assert.Equal(6, Pig2.Name.weight); - Assert.Equal("Luko", Pig2.Name); - Assert.Equal(25, Pig2.age); - Assert.Equal(280, Pig2.weight); - } - [Fact] - public void CheckSecondKonstruktor2() - { - Pig Pig2 = new pig(25, 280); - Assert.Equal(6, Pig2.Name.weight); - Assert.Equal("Luko", Pig2.Name); - Assert.Equal(25, Pig2.age); - Assert.Equal(280, Pig2.weight); - } [Fact] - public void CheckSecondKonstruktor1() - { - Pig Pig1 = new pig(18, 160); - Assert.Equal(6, Pig1.Name.weight); - Assert.Equal("Pepe", Pig1.Name); - Assert.Equal(18, Pig1.age); - Assert.Equal(160, Pig1.weight); - } - [Fact] - public void CheckSecondKonstruktor2() - { - Stol Pig1 = new Pig(18, 160); - Assert.Equal(6, Pig1.Name.weight); - Assert.Equal("Pepe", Pig1.Name); - Assert.Equal(18, Pig1.age); - Assert.Equal(250, Pig1.weight); - } \ No newline at end of file + // [Fact] + // public void CheckSecondKonstruktor1() + // { + // Pig Pig3 = new pig(9, 100); + // Assert.Equal(6, Pig3.Name.weight); + // Assert.Equal("Nope", Pig3.Name); + // Assert.Equal(9, Pig3.age); + // Assert.Equal(100, Pig3.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor2() + // { + // Pig Pig3 = new pig(9, 100); + // Assert.Equal(6, Pig3.Name.weight); + // Assert.Equal("Nope", Pig3.Name); + // Assert.Equal(9, Pig3.age); + // Assert.Equal(100, Pig3.weight); + // } [Fact] + // public void CheckSecondKonstruktor1() + // { + // Pig Pig2 = new pig(25, 280); + // Assert.Equal(6, Pig2.Name.weight); + // Assert.Equal("Luko", Pig2.Name); + // Assert.Equal(25, Pig2.age); + // Assert.Equal(280, Pig2.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor2() + // { + // Pig Pig2 = new pig(25, 280); + // Assert.Equal(6, Pig2.Name.weight); + // Assert.Equal("Luko", Pig2.Name); + // Assert.Equal(25, Pig2.age); + // Assert.Equal(280, Pig2.weight); + // } [Fact] + // public void CheckSecondKonstruktor1() + // { + // Pig Pig1 = new pig(18, 160); + // Assert.Equal(6, Pig1.Name.weight); + // Assert.Equal("Pepe", Pig1.Name); + // Assert.Equal(18, Pig1.age); + // Assert.Equal(160, Pig1.weight); + // } + // [Fact] + // public void CheckSecondKonstruktor2() + // { + // Stol Pig1 = new Pig(18, 160); + // Assert.Equal(6, Pig1.Name.weight); + // Assert.Equal("Pepe", Pig1.Name); + // Assert.Equal(18, Pig1.age); + // Assert.Equal(250, Pig1.weight); + // } + } + } \ No newline at end of file diff --git a/CourseApp.Tests/UnitTest1.cs b/CourseApp.Tests/UnitTest1.cs index dfe1161..fec4dc2 100644 --- a/CourseApp.Tests/UnitTest1.cs +++ b/CourseApp.Tests/UnitTest1.cs @@ -9,37 +9,37 @@ public class UnitTest1 [Fact] public void Test1() { - var res = Program.y(0, 0, 1); + var res = Program.Y(0, 0, 1); Assert.Equal(Double.NaN, res); } [Fact] public void Test2() { - var res = Program.y(2, 0, 1); + var res = Program.Y(2, 0, 1); Assert.Equal(2.39014261372843, res); } [Fact] public void Test3() { - var res = Program.y(0, 0, 0); + var res = Program.Y(0, 0, 0); Assert.Equal(Double.PositiveInfinity, res); } [Fact] public void Test4() { - var res = Program.y(1, 0, 0); + var res = Program.Y(1, 0, 0); Assert.Equal(2, res); } [Fact] public void Test5() { - var res = Program.y(1, 2, 1); + var res = Program.Y(1, 2, 1); Assert.Equal(Double.NaN, res); } [Fact] public void Test6() { - var res = Program.y(0, 1, 1); + var res = Program.Y(0, 1, 1); Assert.Equal(Double.NaN, res); } } diff --git a/CourseApp/Pig.cs b/CourseApp/Pig.cs index b17f4a0..1fe65d5 100644 --- a/CourseApp/Pig.cs +++ b/CourseApp/Pig.cs @@ -2,32 +2,34 @@ namespace ConsoleApp2 { -using System; -public class Pig -{ - private string name; - private int age; - private int weight; - public string Name; - public Pig(string name, int age, int weight) + public class Pig + { + private string name; + private int age; + private int weight; + + public Pig(string name, int age, int weight) { this.name = name; this.age = age; this.weight = weight; } + public Pig(int age, int weight) { - this.name = "Noname" ; + this.name = "Noname"; this.age = age; this.weight = weight; } - - get => name - set => name = value; + + public string Name + { + get => name; + set => name = value; } - } - public int age - { + + public int Age + { get => age; set { @@ -37,7 +39,8 @@ public int age } } } - public int weight + + public int Weight { get => weight; set @@ -53,4 +56,5 @@ public string GetInfo() { return $"Имя: {Name} возраст: {age} вес: {weight}"; } - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index bbd47fc..56fa577 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -4,36 +4,33 @@ namespace CourseApp { public class Program { - public static double y(double x, double a, double b) - { - return ((Math.Pow((Math.Pow((x - a), 2)), 1/3.0))) + ((((Math.Pow((Math.Abs(x + b)),1 / 5))) / ((Math.Pow(Math.Pow(x,2) - Math.Pow((a+b),2), 1/5.0))))); + public static double Y(double x, double a, double b) + { + return (Math.Pow(Math.Pow(x - a, 2), 1 / 3.0) + Math.Pow(Math.Abs(x + b), 1 / 5)) / Math.Pow(Math.Pow(x, 2) - Math.Pow(a + b, 2), 1 / 5.0); } - static void Main(string[] args) + + public static void Main(string[] args) { double a = 0.8; double b = 0.4; double xn = 1.23; double xk = 7.23; double dx = 1.2; - - double[] x = new double[5] {1.88, 2.26, 3.84, 4.55, -6.21 }; - + + double[] x = new double[5] { 1.88, 2.26, 3.84, 4.55, -6.21 }; + Console.WriteLine("Задача A:"); - for (double xl = xn; xl < xk; xl+=dx) + for (double xl = xn; xl < xk; xl += dx) { - Console.WriteLine($"Для x = {xl}\t y = {y(xl, a, b)}"); + Console.WriteLine($"Для x = {xl}\t y = {Y(xl, a, b)}"); } - Console.WriteLine("Задача B:"); - foreach (double i in x) - { - Console.WriteLine($"Для x = {i}\t y = {y(i, a, b)}"); - } - public static void Main(string[] args) + Console.WriteLine("Задача B:"); + + foreach (double i in x) { - Console.WriteLine("Hello World!"); - Console.ReadLine(); + Console.WriteLine($"Для x = {i}\t y = {Y(i, a, b)}"); } } } From 1962ed7f871fbf84a8324153127f90a0c726ec53 Mon Sep 17 00:00:00 2001 From: NersoOnato Date: Fri, 25 Jan 2019 16:43:37 +0300 Subject: [PATCH 8/8] lab 4 --- CourseApp.Tests/PigTests.cs | 253 ++++++------------------------------ 1 file changed, 40 insertions(+), 213 deletions(-) diff --git a/CourseApp.Tests/PigTests.cs b/CourseApp.Tests/PigTests.cs index a3f4279..fab1363 100644 --- a/CourseApp.Tests/PigTests.cs +++ b/CourseApp.Tests/PigTests.cs @@ -9,221 +9,48 @@ public class UnitTest2 [Fact] public void CheckSecondKonstruktor1() { - Pig pig12 = new Pig(15, 150); - Assert.Equal(6, pig12.Weight); - Assert.Equal("Noname", pig12.Name); - Assert.Equal(15, pig12.Age); - Assert.Equal(150, pig12.Weight); + Pig pig1 = new Pig(15, 150); + Assert.Equal(6, pig1.Weight); + Assert.Equal("Noname", pig1.Name); + Assert.Equal(15, pig1.Age); + Assert.Equal(150, pig1.Weight); } [Fact] - public void CheckSecondKonstruktor2() - { - Pig pig12 = new Pig(15, 150); - Assert.Equal(6, pig12.Weight); - Assert.Equal("Noname", pig12.Name); - Assert.Equal(15, pig12.Age); - Assert.Equal(150, pig12.Weight); - } - // [Fact] - // public void CheckSecondKonstruktor1() - // { - // Pig Pig11 = new pig(19, 180); - // Assert.Equal(6, Pig11.Name.weight); - // Assert.Equal("Tuka", Pig11.Name); - // Assert.Equal(19, Pig11.age); - // Assert.Equal(180, Pig11.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor2() - // { - - // Pig Pig11 = new pig(19, 180); - // Assert.Equal(6, Pig11.Name.weight); - // Assert.Equal("Tuka", Pig11.Name); - // Assert.Equal(19, Pig11.age); - // Assert.Equal(180, Pig11.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor1() - // { - // Pig Pig10 = new pig(21, 215); - // Assert.Equal(6, Pig10.Name.weight); - // Assert.Equal("Noname", Pig10.Name); - // Assert.Equal(21, Pig10.age); - // Assert.Equal(215, Pig10.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor2() - // { - // Pig Pig10 = new pig(21, 215); - // Assert.Equal(6, Pig10.Name.weight); - // Assert.Equal("Noname", Pig10.Name); - // Assert.Equal(21, Pig10.age); - // Assert.Equal(215, Pig10.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor1() - // { - // Pig Pig9 = new pig(25, 350); - // Assert.Equal(6, Pig9.Name.weight); - // Assert.Equal("Fufa", Pig9.Name); - // Assert.Equal(25, Pig9.age); - // Assert.Equal(350, Pig9.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor2() - // { - // Pig Pig9 = new pig(25, 350); - // Assert.Equal(6, Pig9.Name.weight); - // Assert.Equal("Fufa", Pig9.Name); - // Assert.Equal(25, Pig9.age); - // Assert.Equal(350, Pig9.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor1() - // { - // Pig Pig8 = new pig(22, 270); - // Assert.Equal(6, Pig8.Name.weight); - // Assert.Equal("Lupa", Pig8.Name); - // Assert.Equal(22, Pig8.age); - // Assert.Equal(270, Pig8.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor2() - // { - // Pig Pig8 = new pig(22, 270); - // Assert.Equal(6, Pig8.Name.weight); - // Assert.Equal("Lupa", Pig8.Name); - // Assert.Equal(22, Pig8.age); - // Assert.Equal(270, Pig8.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor1() - // { - // Pig Pig7 = new pig(20, 200); - // Assert.Equal(6, Pig7.Name.weight); - // Assert.Equal("Noname", Pig7.Name); - // Assert.Equal(20, Pig7.age); - // Assert.Equal(200, Pig7.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor2() - // { - // Pig Pig7 = new pig(20, 200); - // Assert.Equal(6, Pig7.Name.weight); - // Assert.Equal("Noname", Pig7.Name); - // Assert.Equal(20, Pig7.age); - // Assert.Equal(200, Pig7.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor1() - // { - // Pig Pig6 = new pig(12, 120); - // Assert.Equal(6, Pig6.Name.weight); - // Assert.Equal("Keka", Pig6.Name); - // Assert.Equal(12, Pig6.age); - // Assert.Equal(120, Pig6.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor2() - // { - // Pig Pig6 = new pig(12, 120); - // Assert.Equal(6, Pig6.Name.weight); - // Assert.Equal("Keka", Pig6.Name); - // Assert.Equal(12, Pig6.age); - // Assert.Equal(120, Pig6.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor1() - // { - // Pig Pig5 = new pig(10, 100); - // Assert.Equal(6, Pig5.Name.weight); - // Assert.Equal("Puta", Pig5.Name); - // Assert.Equal(10, Pig5.age); - // Assert.Equal(100, Pig5.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor2() - // { - // Pig Pig5 = new pig(10, 100); - // Assert.Equal(6, Pig5.Name.weight); - // Assert.Equal("Puta", Pig5.Name); - // Assert.Equal(10, Pig5.age); - // Assert.Equal(100, Pig5.weight); - // } - - - // [Fact] - // public void CheckSecondKonstruktor1() - // { - // Pig Pig4 = new pig(19, 150); - // Assert.Equal(6, Pig4.Name.weight); - // Assert.Equal("Supa", Pig4.Name); - // Assert.Equal(19, Pig4.age); - // Assert.Equal(150, Pig4.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor2() - // { - // Pig Pig4 = new pig(19, 150); - // Assert.Equal(6, Pig4.Name.weight); - // Assert.Equal("Supa", Pig4.Name); - // Assert.Equal(19, Pig4.age); - // Assert.Equal(150, Pig4.weight); - // } - - // [Fact] - // public void CheckSecondKonstruktor1() - // { - // Pig Pig3 = new pig(9, 100); - // Assert.Equal(6, Pig3.Name.weight); - // Assert.Equal("Nope", Pig3.Name); - // Assert.Equal(9, Pig3.age); - // Assert.Equal(100, Pig3.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor2() - // { - // Pig Pig3 = new pig(9, 100); - // Assert.Equal(6, Pig3.Name.weight); - // Assert.Equal("Nope", Pig3.Name); - // Assert.Equal(9, Pig3.age); - // Assert.Equal(100, Pig3.weight); - // } [Fact] - // public void CheckSecondKonstruktor1() - // { - // Pig Pig2 = new pig(25, 280); - // Assert.Equal(6, Pig2.Name.weight); - // Assert.Equal("Luko", Pig2.Name); - // Assert.Equal(25, Pig2.age); - // Assert.Equal(280, Pig2.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor2() - // { - // Pig Pig2 = new pig(25, 280); - // Assert.Equal(6, Pig2.Name.weight); - // Assert.Equal("Luko", Pig2.Name); - // Assert.Equal(25, Pig2.age); - // Assert.Equal(280, Pig2.weight); - // } [Fact] - // public void CheckSecondKonstruktor1() - // { - // Pig Pig1 = new pig(18, 160); - // Assert.Equal(6, Pig1.Name.weight); - // Assert.Equal("Pepe", Pig1.Name); - // Assert.Equal(18, Pig1.age); - // Assert.Equal(160, Pig1.weight); - // } - // [Fact] - // public void CheckSecondKonstruktor2() - // { - // Stol Pig1 = new Pig(18, 160); - // Assert.Equal(6, Pig1.Name.weight); - // Assert.Equal("Pepe", Pig1.Name); - // Assert.Equal(18, Pig1.age); - // Assert.Equal(250, Pig1.weight); - // } + public void CheckSecondKonstruktor2() + { + Pig Pig2 = new pig(21, 215); + Assert.Equal(9, Pig2.Name.weight); + Assert.Equal("Toto", Pig2.Name); + Assert.Equal(21, Pig2.age); + Assert.Equal(215, Pig2.weight); + } + [Fact] + public void CheckSecondKonstruktor3() + { + Pig Pig3 = new pig(20, 210); + Assert.Equal(4, Pig3.Name.weight); + Assert.Equal("Okta", Pig10.Name); + Assert.Equal(21, Pig10.age); + Assert.Equal(215, Pig10.weight); + } + [Fact] + public void CheckSecondKonstruktor4() + { + Pig Pig4 = new pig(25, 350); + Assert.Equal(5, Pig4.Name.weight); + Assert.Equal("Fufa", Pig4.Name); + Assert.Equal(25, Pig4.age); + Assert.Equal(350, Pig4.weight); + } + [Fact] + public void CheckSecondKonstruktor5() + { + Pig Pig5 = new pig(25, 350); + Assert.Equal(8, Pig5.Name.weight); + Assert.Equal("Tufa", Pig5.Name); + Assert.Equal(25, Pig5.age); + Assert.Equal(350, Pig5.weight); + } } } \ No newline at end of file