From 2a2c270a38ffa93038d01f3cf26aad9aeddc226f Mon Sep 17 00:00:00 2001 From: User of DK12 Date: Fri, 5 Oct 2018 13:44:57 +0400 Subject: [PATCH 01/16] =?UTF-8?q?=D1=87=D1=82=D0=BE-=D1=82=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CourseApp/Program.cs | 2 +- README.md | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index 3f81738..81ae4be 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("Анастасия Зайцева"); } } } diff --git a/README.md b/README.md index ee1aa8c..4399d82 100644 --- a/README.md +++ b/README.md @@ -1,3 +1 @@ -# Course of c# - -Please write your name and surname here \ No newline at end of file + \ No newline at end of file From 5e51ad0753e4fa89a1cb7fd7a007e54e27405878 Mon Sep 17 00:00:00 2001 From: user 112 Date: Tue, 23 Oct 2018 11:42:25 +0400 Subject: [PATCH 02/16] First lab --- laba2/Program.cs | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 laba2/Program.cs diff --git a/laba2/Program.cs b/laba2/Program.cs new file mode 100644 index 0000000..39dffbe --- /dev/null +++ b/laba2/Program.cs @@ -0,0 +1,38 @@ +using System; + +namespace CourseApp3 +{ + class Program4 + { + + static void Main(string[] args) + { + double xn = 0.15; + double xk = 1.37; + double dx = 0.25; + double[] xx = { 0.2, 0.3, 0.44, 0.6, 0.56 }; + + Console.WriteLine("под А"); + + for (double x = xn; x < xk; x += dx) + { + Console.WriteLine(Fan(x)); + + } + Console.WriteLine("под B"); + foreach (double x in xx) + { + Console.WriteLine(Fan(x)); + } + } + static double Fan(double x) + { + double a = 0.1; + double b = 0.5; + double y; + y = ((a + (Math.Tan(b * x)) * (Math.Tan(b * x))) / (b + (1 / (Math.Tan(a * x))) * (1 / (Math.Tan(a * x))))); + return y; + } + + } +} From 57c8d90dc87addec4fcb6373e96cfa5b109ffefd Mon Sep 17 00:00:00 2001 From: user 112 Date: Fri, 16 Nov 2018 15:07:06 +0400 Subject: [PATCH 03/16] Add Lab_3 --- CourseApp/City.cs | 46 ++++++++++++++++ CourseApp/CourseApp.csproj | 2 +- CourseApp/Program.cs | 24 +++++++++ .../ConsoleApp6/ConsoleApp6.sln" | 25 +++++++++ .../ConsoleApp6/ConsoleApp6.csproj" | 8 +++ .../ConsoleApp6/ConsoleApp6/Program.cs" | 52 +++++++++++++++++++ 6 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 CourseApp/City.cs create mode 100644 "\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6.sln" create mode 100644 "\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/ConsoleApp6.csproj" create mode 100644 "\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/Program.cs" diff --git a/CourseApp/City.cs b/CourseApp/City.cs new file mode 100644 index 0000000..a4b7d2b --- /dev/null +++ b/CourseApp/City.cs @@ -0,0 +1,46 @@ +using System; + +namespace CourseApp +{ + class City + { + public string Country { get; set; } + private int population; + public string Name { get; set; } + + public int Population + { + get + { + return population; + } + set + { + if (value > 0) + { + this.population = value; + } + + } + } + + public City() { Name = "Иваново"; Country = "Россия"; population = 316; } // 1 конструктор + + public City(string n, string m) { Name = n; Country = m; population = 11000; } // 2 конструктор + + public City(string n, string m, int a) { Name = n; Country = m; population = a; } // 3 конструктор + public void GetInfo() + { + Console.WriteLine($"Название: {Name} Страна: {Country} Популяция: {population}"); + } + public void s(int pop) + { + population += pop; + } + public void Ueh() + { + Console.WriteLine($"Из-за ужасной ядерной катастрофы всё население Иванова вымерло"); + } + + } +} \ No newline at end of file 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 81ae4be..9fbce82 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -7,6 +7,30 @@ class Program static void Main(string[] args) { Console.WriteLine("Анастасия Зайцева"); + City ivanovo = new City(); // вызов 1-ого + City moscow = new City("Москва", "Россия"); // вызов 2-ого + City peter = new City("Питер", "Россия", 9000); // вызов 3-ого + + + ivanovo.GetInfo(); + + ivanovo.Population = 5; + Console.WriteLine(ivanovo.Name); + ivanovo.GetInfo(); + ivanovo.Population = -1; + + ivanovo.GetInfo(); + + moscow.GetInfo(); + peter.GetInfo(); + + + ivanovo.s(100); + ivanovo.GetInfo(); + + ivanovo.Ueh(); + + Console.Read(); } } } diff --git "a/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6.sln" "b/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6.sln" new file mode 100644 index 0000000..8b942e8 --- /dev/null +++ "b/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6.sln" @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27428.2037 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp6", "ConsoleApp6\ConsoleApp6.csproj", "{8DB91C96-3426-4D10-8352-4A179858C483}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8DB91C96-3426-4D10-8352-4A179858C483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8DB91C96-3426-4D10-8352-4A179858C483}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8DB91C96-3426-4D10-8352-4A179858C483}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8DB91C96-3426-4D10-8352-4A179858C483}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {CA85E5A4-6EF8-429A-9DCE-3C7AD673C43E} + EndGlobalSection +EndGlobal diff --git "a/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/ConsoleApp6.csproj" "b/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/ConsoleApp6.csproj" new file mode 100644 index 0000000..ce1697a --- /dev/null +++ "b/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/ConsoleApp6.csproj" @@ -0,0 +1,8 @@ + + + + Exe + netcoreapp2.0 + + + diff --git "a/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/Program.cs" "b/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/Program.cs" new file mode 100644 index 0000000..b8a6725 --- /dev/null +++ "b/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/Program.cs" @@ -0,0 +1,52 @@ +using System; + +namespace CourseApp +{ + class City + { + public string country; + public int population; + public string name; + + public City() { name = "Иваново"; country = "Россия"; population = 316 ; } // 1 конструктор + + public City(string n, string m) { name = n; country = m; population = 11000; } // 2 конструктор + + public City(string n, string m, int a) { name = n; country = m; population = a; } + public void GetInfo() + { + Console.WriteLine($"Название: {name} Страна: {country} Популяция: {population}"); + } + public void s(int pop) + { + population += pop; + } + public void Ueh() + { + Console.WriteLine($"Из-за ужасной ядерной катастрофы всё население Иванова вымерло"); + } + + } + class Program + { + static void Main(string[] args) + { + City ivanovo = new City(); // вызов 1-ого конструктора без параметров + City moscow = new City("Москва", "Россия"); //вызов 2-ого конструктора с одним параметром + City peter = new City("Питер", "Россия", 9000); + + + ivanovo.GetInfo(); + moscow.GetInfo(); + peter.GetInfo(); + + + ivanovo.s(100); + ivanovo.GetInfo(); + + ivanovo.Ueh(); + + Console.Read(); + } + } +} \ No newline at end of file From 04a280968f14e92e2498b0f0d75938ebc9a161e7 Mon Sep 17 00:00:00 2001 From: user 112 Date: Tue, 20 Nov 2018 13:09:09 +0400 Subject: [PATCH 04/16] add test --- CourseApp/City.cs | 2 +- CourseApp/CourseApp.sln | 25 +++++++++++++++++++++++++ test/UnitTest1.cs | 21 +++++++++++++++++++++ test/test.csproj | 20 ++++++++++++++++++++ test/test.sln | 25 +++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 CourseApp/CourseApp.sln create mode 100644 test/UnitTest1.cs create mode 100644 test/test.csproj create mode 100644 test/test.sln diff --git a/CourseApp/City.cs b/CourseApp/City.cs index a4b7d2b..331788d 100644 --- a/CourseApp/City.cs +++ b/CourseApp/City.cs @@ -2,7 +2,7 @@ namespace CourseApp { - class City + public class City { public string Country { get; set; } private int population; diff --git a/CourseApp/CourseApp.sln b/CourseApp/CourseApp.sln new file mode 100644 index 0000000..c6f87c2 --- /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.2037 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CourseApp", "CourseApp.csproj", "{3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0AB63177-0A3F-4523-9C64-57B9FF0F9AE0} + EndGlobalSection +EndGlobal diff --git a/test/UnitTest1.cs b/test/UnitTest1.cs new file mode 100644 index 0000000..bfc8ada --- /dev/null +++ b/test/UnitTest1.cs @@ -0,0 +1,21 @@ +using System; +using Xunit; +using CourseApp; + +namespace test +{ + public class UnitTest1 + { + [Fact] + public void Test1() + { + City ivanovo = new City(); + var res_country = ivanovo.Country; + var res_population = ivanovo.Population ; + var res_name = ivanovo.Name; + Assert.Equal("", res_country); + Assert.Equal(316, res_population); + Assert.Equal("", res_name); + } + } +} diff --git a/test/test.csproj b/test/test.csproj new file mode 100644 index 0000000..7b2ba24 --- /dev/null +++ b/test/test.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp2.0 + + false + + + + + + + + + + + + + + diff --git a/test/test.sln b/test/test.sln new file mode 100644 index 0000000..9375cd4 --- /dev/null +++ b/test/test.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27428.2037 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "test.csproj", "{54005DE3-DDA5-4054-B1E5-C615C6978944}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {54005DE3-DDA5-4054-B1E5-C615C6978944}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {54005DE3-DDA5-4054-B1E5-C615C6978944}.Debug|Any CPU.Build.0 = Debug|Any CPU + {54005DE3-DDA5-4054-B1E5-C615C6978944}.Release|Any CPU.ActiveCfg = Release|Any CPU + {54005DE3-DDA5-4054-B1E5-C615C6978944}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4F11FC6D-B967-4BB4-B687-47D6434B6F5D} + EndGlobalSection +EndGlobal From ee71a4c5728a4287b6f2c962e43b7845912c6765 Mon Sep 17 00:00:00 2001 From: user 112 Date: Fri, 30 Nov 2018 14:18:11 +0400 Subject: [PATCH 05/16] 1 laba and all tests --- CourseApp/CourseApp.sln | 6 ++++++ CourseApp/Program.cs | 27 ++++++++++++++++++++++++++- test/UnitTest1.cs | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/CourseApp/CourseApp.sln b/CourseApp/CourseApp.sln index c6f87c2..880d9eb 100644 --- a/CourseApp/CourseApp.sln +++ b/CourseApp/CourseApp.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.27428.2037 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CourseApp", "CourseApp.csproj", "{3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\test.csproj", "{F41FC357-FFB9-4654-9C10-87F548367AD4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}.Release|Any CPU.Build.0 = Release|Any CPU + {F41FC357-FFB9-4654-9C10-87F548367AD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F41FC357-FFB9-4654-9C10-87F548367AD4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F41FC357-FFB9-4654-9C10-87F548367AD4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F41FC357-FFB9-4654-9C10-87F548367AD4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index 9fbce82..07ba3b9 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -2,11 +2,36 @@ namespace CourseApp { - class Program + public class Program { + public static double formula(double x, double a, double b) + { + return (a + ((Math.Sin(b * x)) * (Math.Sin(b * x))) / ((Math.Cos(b * x)) * (Math.Cos(b * x)))) / (b + ((Math.Cos(a * x) * (Math.Cos(a * x)) / (Math.Sin(a * x) * (Math.Sin(a * x)))))); + + } static void Main(string[] args) { Console.WriteLine("Анастасия Зайцева"); + Console.WriteLine("вар 17"); + Console.WriteLine(); + Console.WriteLine("под А"); + double a = 0.1; + double b = 0.5; + double xn = 0.15; + double xk = 1.37; + double dx = 0.25; + for (double x = xn; x <= xk; x = x + dx) + { + Console.WriteLine($" x={x} y={Math.Round(formula(x, a, b), 3)}"); + } + Console.WriteLine(); + Console.WriteLine("под B"); + double[] z = new double[] { 0.2, 0.3, 0.44, 0.6, 0.56 }; + foreach (double element in z) + { + Console.WriteLine($" X={element} y={Math.Round(formula(element, a, b), 3)} "); + } + City ivanovo = new City(); // вызов 1-ого City moscow = new City("Москва", "Россия"); // вызов 2-ого City peter = new City("Питер", "Россия", 9000); // вызов 3-ого diff --git a/test/UnitTest1.cs b/test/UnitTest1.cs index bfc8ada..6e5eb58 100644 --- a/test/UnitTest1.cs +++ b/test/UnitTest1.cs @@ -17,5 +17,39 @@ public void Test1() Assert.Equal(316, res_population); Assert.Equal("", res_name); } + [Fact] + public void Test2() + { + City moscow = new City("",""); + var res_country = moscow.Country; + var res_population = moscow.Population; + var res_name = moscow.Name; + Assert.Equal("", res_country); + Assert.Equal(11000, res_population); + Assert.Equal("", res_name); + } + [Fact] + public void Test3() + { + City spb = new City("", "", 9000); + var res_country = spb.Country; + var res_population = spb.Population; + var res_name = spb.Name; + Assert.Equal("", res_country); + Assert.Equal(9000, res_population); + Assert.Equal("", res_name); + } + [Fact] + public void Test4() + { + var res = Program.formula(0.1, 0.5, 0.15); + Assert.Equal(0.001, res, 3); + } + [Fact] + public void Test5() + { + var res = Program.formula(0.0, 0.0, 0.1); + Assert.Equal(0.0, res, 3); + } } } From 9969670dd4b2216a54fb1b08f0256eef8f0799f0 Mon Sep 17 00:00:00 2001 From: jskonst Date: Sun, 9 Dec 2018 21:57:24 +0300 Subject: [PATCH 06/16] Added stylecop for project --- CourseApp/CourseApp.csproj | 15 +++++++++++++++ CourseApp/Program.cs | 5 +++-- stylecop.json | 15 +++++++++++++++ stylecop.ruleset | 21 +++++++++++++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 stylecop.json create mode 100644 stylecop.ruleset diff --git a/CourseApp/CourseApp.csproj b/CourseApp/CourseApp.csproj index 23df604..7afbee9 100644 --- a/CourseApp/CourseApp.csproj +++ b/CourseApp/CourseApp.csproj @@ -3,6 +3,21 @@ Exe netcoreapp2.1 + True + 1573,1591,1701;1702;1705 + + + + + + ../stylecop.ruleset + true + + + + + + diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index 3f81738..248bbe4 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -2,11 +2,12 @@ namespace CourseApp { - class Program + public class Program { - static void Main(string[] args) + public static void Main(string[] args) { Console.WriteLine("Hello World!"); + Console.ReadLine(); } } } diff --git a/stylecop.json b/stylecop.json new file mode 100644 index 0000000..643b8c1 --- /dev/null +++ b/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.ruleset b/stylecop.ruleset new file mode 100644 index 0000000..b36938e --- /dev/null +++ b/stylecop.ruleset @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From c4a7f5d3aa7f62afd675dbc5c4fb29d24362f97e Mon Sep 17 00:00:00 2001 From: jskonst Date: Tue, 11 Dec 2018 11:21:14 +0300 Subject: [PATCH 07/16] Added stylecop for project --- CourseApp.Tests/CourseApp.Tests.csproj | 30 +++++++++++++++++++ CourseApp.Tests/DemoTest.cs | 14 +++++++++ CourseApp/CourseApp.csproj | 6 ++-- stylecop.json => stylecop/stylecop.json | 0 stylecop.ruleset => stylecop/stylecop.ruleset | 1 + 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 CourseApp.Tests/CourseApp.Tests.csproj create mode 100644 CourseApp.Tests/DemoTest.cs rename stylecop.json => stylecop/stylecop.json (100%) rename stylecop.ruleset => stylecop/stylecop.ruleset (95%) diff --git a/CourseApp.Tests/CourseApp.Tests.csproj b/CourseApp.Tests/CourseApp.Tests.csproj new file mode 100644 index 0000000..dcfd1f9 --- /dev/null +++ b/CourseApp.Tests/CourseApp.Tests.csproj @@ -0,0 +1,30 @@ + + + + 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 7afbee9..cc0df39 100644 --- a/CourseApp/CourseApp.csproj +++ b/CourseApp/CourseApp.csproj @@ -8,16 +8,16 @@ - + - ../stylecop.ruleset + ../stylecop/stylecop.ruleset true - + diff --git a/stylecop.json b/stylecop/stylecop.json similarity index 100% rename from stylecop.json rename to stylecop/stylecop.json diff --git a/stylecop.ruleset b/stylecop/stylecop.ruleset similarity index 95% rename from stylecop.ruleset rename to stylecop/stylecop.ruleset index b36938e..3350d0e 100644 --- a/stylecop.ruleset +++ b/stylecop/stylecop.ruleset @@ -15,6 +15,7 @@ + From fab39257345272d5c887c85f5a737728a0b073e1 Mon Sep 17 00:00:00 2001 From: user 112 Date: Tue, 11 Dec 2018 12:29:46 +0400 Subject: [PATCH 08/16] Ispravila --- CourseApp/City.cs | 6 +-- laba2/Program.cs | 38 -------------- test/UnitTest1.cs | 36 ++++++------- .../ConsoleApp6/ConsoleApp6.sln" | 25 --------- .../ConsoleApp6/ConsoleApp6.csproj" | 8 --- .../ConsoleApp6/ConsoleApp6/Program.cs" | 52 ------------------- 6 files changed, 21 insertions(+), 144 deletions(-) delete mode 100644 laba2/Program.cs delete mode 100644 "\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6.sln" delete mode 100644 "\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/ConsoleApp6.csproj" delete mode 100644 "\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/Program.cs" diff --git a/CourseApp/City.cs b/CourseApp/City.cs index 331788d..33150e2 100644 --- a/CourseApp/City.cs +++ b/CourseApp/City.cs @@ -24,11 +24,11 @@ public int Population } } - public City() { Name = "Иваново"; Country = "Россия"; population = 316; } // 1 конструктор + public City() : this("Иваново", "Россия", 316) { } // 1 конструктор - public City(string n, string m) { Name = n; Country = m; population = 11000; } // 2 конструктор + public City(string name, string country) : this(name, country, 11000) { } // 2 конструктор - public City(string n, string m, int a) { Name = n; Country = m; population = a; } // 3 конструктор + public City(string name, string country, int population) { Name = name; Country = country; Population = population; } // 3 конструктор public void GetInfo() { Console.WriteLine($"Название: {Name} Страна: {Country} Популяция: {population}"); diff --git a/laba2/Program.cs b/laba2/Program.cs deleted file mode 100644 index 39dffbe..0000000 --- a/laba2/Program.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; - -namespace CourseApp3 -{ - class Program4 - { - - static void Main(string[] args) - { - double xn = 0.15; - double xk = 1.37; - double dx = 0.25; - double[] xx = { 0.2, 0.3, 0.44, 0.6, 0.56 }; - - Console.WriteLine("под А"); - - for (double x = xn; x < xk; x += dx) - { - Console.WriteLine(Fan(x)); - - } - Console.WriteLine("под B"); - foreach (double x in xx) - { - Console.WriteLine(Fan(x)); - } - } - static double Fan(double x) - { - double a = 0.1; - double b = 0.5; - double y; - y = ((a + (Math.Tan(b * x)) * (Math.Tan(b * x))) / (b + (1 / (Math.Tan(a * x))) * (1 / (Math.Tan(a * x))))); - return y; - } - - } -} diff --git a/test/UnitTest1.cs b/test/UnitTest1.cs index 6e5eb58..756aabe 100644 --- a/test/UnitTest1.cs +++ b/test/UnitTest1.cs @@ -10,34 +10,34 @@ public class UnitTest1 public void Test1() { City ivanovo = new City(); - var res_country = ivanovo.Country; - var res_population = ivanovo.Population ; - var res_name = ivanovo.Name; - Assert.Equal("", res_country); - Assert.Equal(316, res_population); - Assert.Equal("", res_name); + var rescountry = ivanovo.Country; + var respopulation = ivanovo.Population ; + var resname = ivanovo.Name; + Assert.Equal("", rescountry); + Assert.Equal(316, respopulation); + Assert.Equal("", resname); } [Fact] public void Test2() { City moscow = new City("",""); - var res_country = moscow.Country; - var res_population = moscow.Population; - var res_name = moscow.Name; - Assert.Equal("", res_country); - Assert.Equal(11000, res_population); - Assert.Equal("", res_name); + var rescountry = moscow.Country; + var respopulation = moscow.Population; + var resname = moscow.Name; + Assert.Equal("", rescountry); + Assert.Equal(11000, respopulation); + Assert.Equal("", resname); } [Fact] public void Test3() { City spb = new City("", "", 9000); - var res_country = spb.Country; - var res_population = spb.Population; - var res_name = spb.Name; - Assert.Equal("", res_country); - Assert.Equal(9000, res_population); - Assert.Equal("", res_name); + var rescountry = spb.Country; + var respopulation = spb.Population; + var resname = spb.Name; + Assert.Equal("", rescountry); + Assert.Equal(9000, respopulation); + Assert.Equal("", resname); } [Fact] public void Test4() diff --git "a/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6.sln" "b/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6.sln" deleted file mode 100644 index 8b942e8..0000000 --- "a/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6.sln" +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27428.2037 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp6", "ConsoleApp6\ConsoleApp6.csproj", "{8DB91C96-3426-4D10-8352-4A179858C483}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8DB91C96-3426-4D10-8352-4A179858C483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DB91C96-3426-4D10-8352-4A179858C483}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DB91C96-3426-4D10-8352-4A179858C483}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DB91C96-3426-4D10-8352-4A179858C483}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {CA85E5A4-6EF8-429A-9DCE-3C7AD673C43E} - EndGlobalSection -EndGlobal diff --git "a/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/ConsoleApp6.csproj" "b/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/ConsoleApp6.csproj" deleted file mode 100644 index ce1697a..0000000 --- "a/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/ConsoleApp6.csproj" +++ /dev/null @@ -1,8 +0,0 @@ - - - - Exe - netcoreapp2.0 - - - diff --git "a/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/Program.cs" "b/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/Program.cs" deleted file mode 100644 index b8a6725..0000000 --- "a/\320\276\320\273\321\206\321\203\321\200\320\260\321\210\320\264\321\203\321\206\321\200\320\260\321\206\320\264\321\210\321\200\320\260/ConsoleApp6/ConsoleApp6/Program.cs" +++ /dev/null @@ -1,52 +0,0 @@ -using System; - -namespace CourseApp -{ - class City - { - public string country; - public int population; - public string name; - - public City() { name = "Иваново"; country = "Россия"; population = 316 ; } // 1 конструктор - - public City(string n, string m) { name = n; country = m; population = 11000; } // 2 конструктор - - public City(string n, string m, int a) { name = n; country = m; population = a; } - public void GetInfo() - { - Console.WriteLine($"Название: {name} Страна: {country} Популяция: {population}"); - } - public void s(int pop) - { - population += pop; - } - public void Ueh() - { - Console.WriteLine($"Из-за ужасной ядерной катастрофы всё население Иванова вымерло"); - } - - } - class Program - { - static void Main(string[] args) - { - City ivanovo = new City(); // вызов 1-ого конструктора без параметров - City moscow = new City("Москва", "Россия"); //вызов 2-ого конструктора с одним параметром - City peter = new City("Питер", "Россия", 9000); - - - ivanovo.GetInfo(); - moscow.GetInfo(); - peter.GetInfo(); - - - ivanovo.s(100); - ivanovo.GetInfo(); - - ivanovo.Ueh(); - - Console.Read(); - } - } -} \ No newline at end of file From bc60700fabe40cd8ad5a4c8d0dbc4cac34ce6835 Mon Sep 17 00:00:00 2001 From: user 112 Date: Tue, 11 Dec 2018 12:58:22 +0400 Subject: [PATCH 09/16] Corrected city --- CourseApp/City.cs | 4 ++-- CourseApp/Program.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CourseApp/City.cs b/CourseApp/City.cs index 33150e2..5d7d828 100644 --- a/CourseApp/City.cs +++ b/CourseApp/City.cs @@ -26,7 +26,7 @@ public int Population public City() : this("Иваново", "Россия", 316) { } // 1 конструктор - public City(string name, string country) : this(name, country, 11000) { } // 2 конструктор + public City(string name, string country): this(name, country, 11000) { } // 2 конструктор public City(string name, string country, int population) { Name = name; Country = country; Population = population; } // 3 конструктор public void GetInfo() @@ -39,7 +39,7 @@ public void s(int pop) } public void Ueh() { - Console.WriteLine($"Из-за ужасной ядерной катастрофы всё население Иванова вымерло"); + Console.WriteLine($"Из-за ужасной ядерной катастрофы всё население города вымерло"); } } diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index 07ba3b9..f3bbb01 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -4,7 +4,7 @@ namespace CourseApp { public class Program { - public static double formula(double x, double a, double b) + public static double formula (double x, double a, double b) { return (a + ((Math.Sin(b * x)) * (Math.Sin(b * x))) / ((Math.Cos(b * x)) * (Math.Cos(b * x)))) / (b + ((Math.Cos(a * x) * (Math.Cos(a * x)) / (Math.Sin(a * x) * (Math.Sin(a * x)))))); From 292a21d319525453d20e3b91cd5530b73482e392 Mon Sep 17 00:00:00 2001 From: user 112 Date: Fri, 14 Dec 2018 13:48:32 +0400 Subject: [PATCH 10/16] Corrected city kill --- CourseApp/City.cs | 21 +++++++++++++++------ CourseApp/Program.cs | 19 +++++++------------ test/UnitTest1.cs | 4 ++-- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/CourseApp/City.cs b/CourseApp/City.cs index 5d7d828..4b225ac 100644 --- a/CourseApp/City.cs +++ b/CourseApp/City.cs @@ -5,7 +5,9 @@ namespace CourseApp public class City { public string Country { get; set; } + private int population; + public string Name { get; set; } public int Population @@ -14,32 +16,39 @@ public int Population { return population; } + set { if (value > 0) { this.population = value; } - } } - public City() : this("Иваново", "Россия", 316) { } // 1 конструктор + public City() + : this("Иваново", "Россия", 316) { } // 1 конструктор - public City(string name, string country): this(name, country, 11000) { } // 2 конструктор + public City(string name, string country) + : this(name, country, 11000) { } // 2 конструктор + + public City(string name, string country, int population) { Name = name; + Country = country; + Population = population; } // 3 конструктор - public City(string name, string country, int population) { Name = name; Country = country; Population = population; } // 3 конструктор public void GetInfo() { Console.WriteLine($"Название: {Name} Страна: {Country} Популяция: {population}"); } + public void s(int pop) { population += pop; } - public void Ueh() + + public string Dead() { - Console.WriteLine($"Из-за ужасной ядерной катастрофы всё население города вымерло"); + return $"Всё население {Name} вымерло"; } } diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index f3bbb01..6399cb5 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -4,12 +4,9 @@ namespace CourseApp { public class Program { - public static double formula (double x, double a, double b) - { - return (a + ((Math.Sin(b * x)) * (Math.Sin(b * x))) / ((Math.Cos(b * x)) * (Math.Cos(b * x)))) / (b + ((Math.Cos(a * x) * (Math.Cos(a * x)) / (Math.Sin(a * x) * (Math.Sin(a * x)))))); + public static double Formula(double x, double a, double b) => (a + ((Math.Sin(b * x) * Math.Sin(b * x)) / (Math.Cos(b * x) * Math.Cos(b * x)))) / (b + (Math.Cos(a * x) * Math.Cos(a * x) / (Math.Sin(a * x) * Math.Sin(a * x)))); - } - static void Main(string[] args) + private static void Main(string[] args) { Console.WriteLine("Анастасия Зайцева"); Console.WriteLine("вар 17"); @@ -22,21 +19,19 @@ static void Main(string[] args) double dx = 0.25; for (double x = xn; x <= xk; x = x + dx) { - Console.WriteLine($" x={x} y={Math.Round(formula(x, a, b), 3)}"); + Console.WriteLine($" x={x} y={Math.Round(Formula(x, a, b), 3)}"); } Console.WriteLine(); Console.WriteLine("под B"); double[] z = new double[] { 0.2, 0.3, 0.44, 0.6, 0.56 }; foreach (double element in z) { - Console.WriteLine($" X={element} y={Math.Round(formula(element, a, b), 3)} "); + Console.WriteLine($" X={element} y={Math.Round(Formula(element, a, b), 3)} "); } City ivanovo = new City(); // вызов 1-ого City moscow = new City("Москва", "Россия"); // вызов 2-ого City peter = new City("Питер", "Россия", 9000); // вызов 3-ого - - ivanovo.GetInfo(); ivanovo.Population = 5; @@ -48,12 +43,12 @@ static void Main(string[] args) moscow.GetInfo(); peter.GetInfo(); - - ivanovo.s(100); ivanovo.GetInfo(); - ivanovo.Ueh(); + Console.WriteLine(ivanovo.Dead()); + Console.WriteLine(moscow.Dead()); + Console.WriteLine(peter.Dead()); Console.Read(); } diff --git a/test/UnitTest1.cs b/test/UnitTest1.cs index 756aabe..594725e 100644 --- a/test/UnitTest1.cs +++ b/test/UnitTest1.cs @@ -42,13 +42,13 @@ public void Test3() [Fact] public void Test4() { - var res = Program.formula(0.1, 0.5, 0.15); + var res = Program.Formula(0.1, 0.5, 0.15); Assert.Equal(0.001, res, 3); } [Fact] public void Test5() { - var res = Program.formula(0.0, 0.0, 0.1); + var res = Program.Formula(0.0, 0.0, 0.1); Assert.Equal(0.0, res, 3); } } From 31b0eab0e2dea3f82edc6b9ea3c8b0657036fbd8 Mon Sep 17 00:00:00 2001 From: user 112 Date: Fri, 14 Dec 2018 14:09:15 +0400 Subject: [PATCH 11/16] Corrected city kill --- CourseApp/City.cs | 1 - {test => CourseApp/test}/UnitTest1.cs | 0 {test => CourseApp/test}/test.csproj | 0 {test => CourseApp/test}/test.sln | 0 4 files changed, 1 deletion(-) rename {test => CourseApp/test}/UnitTest1.cs (100%) rename {test => CourseApp/test}/test.csproj (100%) rename {test => CourseApp/test}/test.sln (100%) diff --git a/CourseApp/City.cs b/CourseApp/City.cs index 4b225ac..9ba7fda 100644 --- a/CourseApp/City.cs +++ b/CourseApp/City.cs @@ -50,6 +50,5 @@ public string Dead() { return $"Всё население {Name} вымерло"; } - } } \ No newline at end of file diff --git a/test/UnitTest1.cs b/CourseApp/test/UnitTest1.cs similarity index 100% rename from test/UnitTest1.cs rename to CourseApp/test/UnitTest1.cs diff --git a/test/test.csproj b/CourseApp/test/test.csproj similarity index 100% rename from test/test.csproj rename to CourseApp/test/test.csproj diff --git a/test/test.sln b/CourseApp/test/test.sln similarity index 100% rename from test/test.sln rename to CourseApp/test/test.sln From a06bf5134c9d39736fbe663ea81118cea0ce2d56 Mon Sep 17 00:00:00 2001 From: user 112 Date: Fri, 14 Dec 2018 15:00:38 +0400 Subject: [PATCH 12/16] Corrected city kill aaaaaaaa --- CourseApp.Tests/CourseApp.Tests.csproj | 2 +- .../test => CourseApp.Tests}/UnitTest1.cs | 16 ++++++--- CourseApp/City.cs | 35 +++++++++++-------- CourseApp/CourseApp.csproj | 2 ++ CourseApp/CourseApp.sln | 10 +++--- CourseApp/Program.cs | 3 +- CourseApp/test/test.csproj | 20 ----------- CourseApp/test/test.sln | 25 ------------- 8 files changed, 42 insertions(+), 71 deletions(-) rename {CourseApp/test => CourseApp.Tests}/UnitTest1.cs (92%) delete mode 100644 CourseApp/test/test.csproj delete mode 100644 CourseApp/test/test.sln diff --git a/CourseApp.Tests/CourseApp.Tests.csproj b/CourseApp.Tests/CourseApp.Tests.csproj index dcfd1f9..15bc277 100644 --- a/CourseApp.Tests/CourseApp.Tests.csproj +++ b/CourseApp.Tests/CourseApp.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp2.0 True 1573,1591,1701;1702;1705 false diff --git a/CourseApp/test/UnitTest1.cs b/CourseApp.Tests/UnitTest1.cs similarity index 92% rename from CourseApp/test/UnitTest1.cs rename to CourseApp.Tests/UnitTest1.cs index 594725e..1e4abe5 100644 --- a/CourseApp/test/UnitTest1.cs +++ b/CourseApp.Tests/UnitTest1.cs @@ -1,11 +1,13 @@ -using System; -using Xunit; -using CourseApp; - -namespace test +namespace Test { + using System; + using CourseApp; + using Xunit; + public class UnitTest1 { + public object Assert { get; private set; } + [Fact] public void Test1() { @@ -17,6 +19,7 @@ public void Test1() Assert.Equal(316, respopulation); Assert.Equal("", resname); } + [Fact] public void Test2() { @@ -28,6 +31,7 @@ public void Test2() Assert.Equal(11000, respopulation); Assert.Equal("", resname); } + [Fact] public void Test3() { @@ -39,12 +43,14 @@ public void Test3() Assert.Equal(9000, respopulation); Assert.Equal("", resname); } + [Fact] public void Test4() { var res = Program.Formula(0.1, 0.5, 0.15); Assert.Equal(0.001, res, 3); } + [Fact] public void Test5() { diff --git a/CourseApp/City.cs b/CourseApp/City.cs index 9ba7fda..e1d35af 100644 --- a/CourseApp/City.cs +++ b/CourseApp/City.cs @@ -4,10 +4,27 @@ namespace CourseApp { public class City { - public string Country { get; set; } - private int population; + public City() + : this("Иваново", "Россия", 316) + { + } // 1 конструктор + + public City(string name, string country) + : this(name, country, 11000) + { + } // 2 конструктор + + public City(string name, string country, int population) + { + Name = name; + Country = country; + Population = population; + } // 3 конструктор + + public string Country { get; set; } + public string Name { get; set; } public int Population @@ -26,29 +43,19 @@ public int Population } } - public City() - : this("Иваново", "Россия", 316) { } // 1 конструктор - - public City(string name, string country) - : this(name, country, 11000) { } // 2 конструктор - - public City(string name, string country, int population) { Name = name; - Country = country; - Population = population; } // 3 конструктор - public void GetInfo() { Console.WriteLine($"Название: {Name} Страна: {Country} Популяция: {population}"); } - public void s(int pop) + public void Addpopulation(int pop) { population += pop; } public string Dead() { - return $"Всё население {Name} вымерло"; + return $"Всё население города {Name} вымерло из-за аварии на АЭС."; } } } \ No newline at end of file diff --git a/CourseApp/CourseApp.csproj b/CourseApp/CourseApp.csproj index 4e5adfe..b26cc56 100644 --- a/CourseApp/CourseApp.csproj +++ b/CourseApp/CourseApp.csproj @@ -3,6 +3,8 @@ Exe netcoreapp2.0 + True + 1573,1591,1701;1702;1705 diff --git a/CourseApp/CourseApp.sln b/CourseApp/CourseApp.sln index 880d9eb..f4a0bbb 100644 --- a/CourseApp/CourseApp.sln +++ b/CourseApp/CourseApp.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.27428.2037 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CourseApp", "CourseApp.csproj", "{3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\test.csproj", "{F41FC357-FFB9-4654-9C10-87F548367AD4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CourseApp.Tests", "..\CourseApp.Tests\CourseApp.Tests.csproj", "{5919BA31-3171-43C7-B452-E5EA9330F77A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,10 +17,10 @@ Global {3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F1471F2-2FB2-4B42-BC14-ECEA29012CB4}.Release|Any CPU.Build.0 = Release|Any CPU - {F41FC357-FFB9-4654-9C10-87F548367AD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F41FC357-FFB9-4654-9C10-87F548367AD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F41FC357-FFB9-4654-9C10-87F548367AD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F41FC357-FFB9-4654-9C10-87F548367AD4}.Release|Any CPU.Build.0 = Release|Any CPU + {5919BA31-3171-43C7-B452-E5EA9330F77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5919BA31-3171-43C7-B452-E5EA9330F77A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5919BA31-3171-43C7-B452-E5EA9330F77A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5919BA31-3171-43C7-B452-E5EA9330F77A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index 6399cb5..3ad652c 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -21,6 +21,7 @@ private static void Main(string[] args) { Console.WriteLine($" x={x} y={Math.Round(Formula(x, a, b), 3)}"); } + Console.WriteLine(); Console.WriteLine("под B"); double[] z = new double[] { 0.2, 0.3, 0.44, 0.6, 0.56 }; @@ -43,7 +44,7 @@ private static void Main(string[] args) moscow.GetInfo(); peter.GetInfo(); - ivanovo.s(100); + ivanovo.Addpopulation(100); ivanovo.GetInfo(); Console.WriteLine(ivanovo.Dead()); diff --git a/CourseApp/test/test.csproj b/CourseApp/test/test.csproj deleted file mode 100644 index 7b2ba24..0000000 --- a/CourseApp/test/test.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netcoreapp2.0 - - false - - - - - - - - - - - - - - diff --git a/CourseApp/test/test.sln b/CourseApp/test/test.sln deleted file mode 100644 index 9375cd4..0000000 --- a/CourseApp/test/test.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27428.2037 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "test.csproj", "{54005DE3-DDA5-4054-B1E5-C615C6978944}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {54005DE3-DDA5-4054-B1E5-C615C6978944}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54005DE3-DDA5-4054-B1E5-C615C6978944}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54005DE3-DDA5-4054-B1E5-C615C6978944}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54005DE3-DDA5-4054-B1E5-C615C6978944}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4F11FC6D-B967-4BB4-B687-47D6434B6F5D} - EndGlobalSection -EndGlobal From d794ab5ff4a862dee50e00660fb1f6e8f03b6f42 Mon Sep 17 00:00:00 2001 From: jskonst Date: Tue, 18 Dec 2018 09:46:47 +0300 Subject: [PATCH 13/16] Fixed problems with tests --- CourseApp.Tests/UnitTest1.cs | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/CourseApp.Tests/UnitTest1.cs b/CourseApp.Tests/UnitTest1.cs index 1e4abe5..a591bc4 100644 --- a/CourseApp.Tests/UnitTest1.cs +++ b/CourseApp.Tests/UnitTest1.cs @@ -1,47 +1,45 @@ +using System; +using CourseApp; +using Xunit; + namespace Test { - using System; - using CourseApp; - using Xunit; - public class UnitTest1 { - public object Assert { get; private set; } - [Fact] public void Test1() { City ivanovo = new City(); var rescountry = ivanovo.Country; - var respopulation = ivanovo.Population ; + var respopulation = ivanovo.Population; var resname = ivanovo.Name; - Assert.Equal("", rescountry); + Assert.Equal("������", rescountry); Assert.Equal(316, respopulation); - Assert.Equal("", resname); + Assert.Equal("�������", resname); } [Fact] public void Test2() { - City moscow = new City("",""); + City moscow = new City("������", "������"); var rescountry = moscow.Country; var respopulation = moscow.Population; var resname = moscow.Name; - Assert.Equal("", rescountry); + Assert.Equal("������", rescountry); Assert.Equal(11000, respopulation); - Assert.Equal("", resname); + Assert.Equal("������", resname); } [Fact] public void Test3() { - City spb = new City("", "", 9000); + City spb = new City("�����", "������", 9000); var rescountry = spb.Country; var respopulation = spb.Population; var resname = spb.Name; - Assert.Equal("", rescountry); + Assert.Equal("������", rescountry); Assert.Equal(9000, respopulation); - Assert.Equal("", resname); + Assert.Equal("�����", resname); } [Fact] From 99742172c8a7672b5c878247f951d8189a104991 Mon Sep 17 00:00:00 2001 From: user 112 Date: Tue, 18 Dec 2018 13:16:21 +0400 Subject: [PATCH 14/16] Corrected test --- CourseApp.Tests/UnitTest1.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CourseApp.Tests/UnitTest1.cs b/CourseApp.Tests/UnitTest1.cs index a591bc4..6a95cad 100644 --- a/CourseApp.Tests/UnitTest1.cs +++ b/CourseApp.Tests/UnitTest1.cs @@ -13,33 +13,33 @@ public void Test1() var rescountry = ivanovo.Country; var respopulation = ivanovo.Population; var resname = ivanovo.Name; - Assert.Equal("������", rescountry); + Assert.Equal("Россия", rescountry); Assert.Equal(316, respopulation); - Assert.Equal("�������", resname); + Assert.Equal("Иваново", resname); } [Fact] public void Test2() { - City moscow = new City("������", "������"); + City moscow = new City("Москва", "Россия"); var rescountry = moscow.Country; var respopulation = moscow.Population; var resname = moscow.Name; - Assert.Equal("������", rescountry); + Assert.Equal("Россия", rescountry); Assert.Equal(11000, respopulation); - Assert.Equal("������", resname); + Assert.Equal("Москва", resname); } [Fact] public void Test3() { - City spb = new City("�����", "������", 9000); + City spb = new City("Питер", "Россия", 9000); var rescountry = spb.Country; var respopulation = spb.Population; var resname = spb.Name; - Assert.Equal("������", rescountry); + Assert.Equal("Россия", rescountry); Assert.Equal(9000, respopulation); - Assert.Equal("�����", resname); + Assert.Equal("Питер", resname); } [Fact] From cd1209fd77c67c6dd37c4fdc496b4d5cc7ee07ef Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Jan 2019 17:59:28 +0300 Subject: [PATCH 15/16] Metropolis --- CourseApp/City.cs | 61 ------------------------------------ CourseApp/Metropolis.cs | 68 +++++++++++++++++++++++++++++++++++++++++ CourseApp/Program.cs | 3 +- 3 files changed, 70 insertions(+), 62 deletions(-) delete mode 100644 CourseApp/City.cs create mode 100644 CourseApp/Metropolis.cs diff --git a/CourseApp/City.cs b/CourseApp/City.cs deleted file mode 100644 index e1d35af..0000000 --- a/CourseApp/City.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; - -namespace CourseApp -{ - public class City - { - private int population; - - public City() - : this("Иваново", "Россия", 316) - { - } // 1 конструктор - - public City(string name, string country) - : this(name, country, 11000) - { - } // 2 конструктор - - public City(string name, string country, int population) - { - Name = name; - Country = country; - Population = population; - } // 3 конструктор - - public string Country { get; set; } - - public string Name { get; set; } - - public int Population - { - get - { - return population; - } - - set - { - if (value > 0) - { - this.population = value; - } - } - } - - public void GetInfo() - { - Console.WriteLine($"Название: {Name} Страна: {Country} Популяция: {population}"); - } - - public void Addpopulation(int pop) - { - population += pop; - } - - public string Dead() - { - return $"Всё население города {Name} вымерло из-за аварии на АЭС."; - } - } -} \ No newline at end of file diff --git a/CourseApp/Metropolis.cs b/CourseApp/Metropolis.cs new file mode 100644 index 0000000..5a2f0aa --- /dev/null +++ b/CourseApp/Metropolis.cs @@ -0,0 +1,68 @@ +using System; + +namespace CourseApp +{ + public abstract class Metropolis + { + private int population; + + public Metropolis() + { + public class City + { + private int population; + + public City() + : this("Иваново", "Россия", 316) + { + } // 1 конструктор + + public City(string name, string country) + : this(name, country, 11000) + { + } // 2 конструктор + + public City(string name, string country, int population) + { + Name = name; + Country = country; + Population = population; + } // 3 конструктор + + public string Country { get; set; } + + public string Name { get; set; } + + public int Population + { + get + { + return population; + } + + set + { + if (value > 0) + { + this.population = value; + } + } + } + + public void GetInfo() + { + Console.WriteLine($"Название: {Name} Страна: {Country} Популяция: {population}"); + } + + public void AddPopulation(int pop) + { + population += pop; + } + + public string Dead() + { + return $"Всё население города {Name} вымерло из-за аварии на АЭС."; + } + } + } +} \ No newline at end of file diff --git a/CourseApp/Program.cs b/CourseApp/Program.cs index 3ad652c..325f4b8 100644 --- a/CourseApp/Program.cs +++ b/CourseApp/Program.cs @@ -1,4 +1,5 @@ using System; +using static CourseApp.Metropolis; namespace CourseApp { @@ -44,7 +45,7 @@ private static void Main(string[] args) moscow.GetInfo(); peter.GetInfo(); - ivanovo.Addpopulation(100); + ivanovo.AddPopulation(100); ivanovo.GetInfo(); Console.WriteLine(ivanovo.Dead()); From bb0b2a2fe713446807e3383f8f7cf21db219d940 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Jan 2019 18:17:49 +0300 Subject: [PATCH 16/16] Metropolis --- CourseApp/Metropolis.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CourseApp/Metropolis.cs b/CourseApp/Metropolis.cs index 5a2f0aa..61df6af 100644 --- a/CourseApp/Metropolis.cs +++ b/CourseApp/Metropolis.cs @@ -7,6 +7,12 @@ public abstract class Metropolis private int population; public Metropolis() + { + Name = "Иваново"; + population = 316; + } + + public string Name { get; set; } { public class City {