From 8968df10afc4db5dada78547ad4307babc445c7c Mon Sep 17 00:00:00 2001 From: Marija_Popova Date: Fri, 19 Jun 2020 12:43:29 +0300 Subject: [PATCH 1/2] duck --- .gitignore | 433 +++++++++++++++++++++++++++++++++++++ App.Tests/App.Tests.csproj | 20 ++ App.Tests/UnitTest1.cs | 35 +++ App/App.csproj | 8 + App/Duck.cs | 63 ++++++ App/Interfaces.cs | 12 + App/Program.cs | 18 ++ App/absDuck.cs | 23 ++ README.md | 4 +- 9 files changed, 615 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 App.Tests/App.Tests.csproj create mode 100644 App.Tests/UnitTest1.cs create mode 100644 App/App.csproj create mode 100644 App/Duck.cs create mode 100644 App/Interfaces.cs create mode 100644 App/Program.cs create mode 100644 App/absDuck.cs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..12a2548 --- /dev/null +++ b/.gitignore @@ -0,0 +1,433 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- Backup*.rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# JetBrains Rider +.idea/ +*.sln.iml + +## +## Visual Studio Code +## +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json diff --git a/App.Tests/App.Tests.csproj b/App.Tests/App.Tests.csproj new file mode 100644 index 0000000..4e216e1 --- /dev/null +++ b/App.Tests/App.Tests.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp3.0 + + false + + + + + + + + + + + + + + diff --git a/App.Tests/UnitTest1.cs b/App.Tests/UnitTest1.cs new file mode 100644 index 0000000..6ada2ea --- /dev/null +++ b/App.Tests/UnitTest1.cs @@ -0,0 +1,35 @@ +using System; +using Xunit; + +namespace App.Tests +{ + public class UnitTest1 + { + [Fact] + public void Display() + { + Duck duck = new Duck("Утьоночек", 3, 5, true); + string str = duck.Display(); + Assert.Equal("Уточки - милые создания", str); + } + + [Fact] + public void Area() + { + Duck duck = new Duck("Утьоночек", 3, 5, true); + string str = duck.PlaceOfLiving(); + Assert.Equal("Я живу на озере, если что", str); + Duck duck2 = new Duck("Дональд", 4, 10, false); + string str2 = duck2.PlaceOfLiving(); + Assert.Equal("Живу на реке, держу в курсе", str2); + } + + [Fact] + public void FlightDirection() + { + Duck duck = new Duck("Утьоночек", 3, 5, true); + string str = duck.FlightDirection(); + Assert.Equal("Я улетаю на юг!!!", str); + } + } +} diff --git a/App/App.csproj b/App/App.csproj new file mode 100644 index 0000000..958d2f1 --- /dev/null +++ b/App/App.csproj @@ -0,0 +1,8 @@ + + + + Exe + netcoreapp3.0 + + + diff --git a/App/Duck.cs b/App/Duck.cs new file mode 100644 index 0000000..f81cad9 --- /dev/null +++ b/App/Duck.cs @@ -0,0 +1,63 @@ +using System; + +namespace App +{ + public class Duck : absDuck + { + public string name; + public int count; + public bool isLake; + public int age; + + public int Age + { + get + { + return age; + } + set + { + if ( age >= 0 && age < 20) + { + age = value; + } + else + { + Console.WriteLine("Установите возраст от 0 до 20"); + } + } + } + public Duck(string name, int age, int count, bool isLake) { this.name = name; Age = age; Count = count; this.isLake = isLake; } + + public override int Count + { + get + { + return count; + } + set + { + count = value; + } + } + + public override string PlaceOfLiving() + { + if (isLake == true) + { + return "Я живу на озере, если что"; + } + else + { + return "Живу на реке, держу в курсе"; + } + } + + public override string Display() + { + return "Уточки - милые создания"; + } + + + } +} \ No newline at end of file diff --git a/App/Interfaces.cs b/App/Interfaces.cs new file mode 100644 index 0000000..0e08702 --- /dev/null +++ b/App/Interfaces.cs @@ -0,0 +1,12 @@ +namespace App +{ + interface IFly + { + string FlightDirection(); // куда летят + int Count { get; set; } // число уток + } + interface IQuack + { + string PlaceOfLiving(); //где обитает + } +} \ No newline at end of file diff --git a/App/Program.cs b/App/Program.cs new file mode 100644 index 0000000..e04cc11 --- /dev/null +++ b/App/Program.cs @@ -0,0 +1,18 @@ +using System; + +namespace App +{ + class Program + { + static void Main(string[] args) + { + Duck krya = new Duck("Утьоночек", 3, 5, true); + Console.WriteLine(krya.name); + Console.WriteLine(krya.Age + " лет"); + Console.WriteLine($"Нас {krya.Count}"); + Console.WriteLine(krya.PlaceOfLiving()); + Console.WriteLine("+++++++++++++++++"); + Console.WriteLine(krya.Display()); + } + } +} diff --git a/App/absDuck.cs b/App/absDuck.cs new file mode 100644 index 0000000..1a0f857 --- /dev/null +++ b/App/absDuck.cs @@ -0,0 +1,23 @@ +using System; + +namespace App +{ + public abstract class absDuck : IFly, IQuack + { + public string FlightDirection() + { + return "Я улетаю на юг!!!"; + } + public virtual int Count { get; set; } + public virtual string PlaceOfLiving() + { + return "Я уточка, живу где хочу"; + } + public static string Swim() + { + return "Утки хорошо держатся на поверхности воды благодаря форме тела — оно у неё сплюснутое"; + } + + public abstract string Display(); + } +} diff --git a/README.md b/README.md index f097ac3..c78cb80 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# exam_147_2020 \ No newline at end of file +Попова Мария 2/147 + +Создайте иерархию классов моделирующее игру. Создайте различные виды персонажей и вооружения. Отделите поведение различного типа вооружения. (Используйте интерфейсы для определения поведения) \ No newline at end of file From c023af18ef7f64a67f425844ba45e3473580fd08 Mon Sep 17 00:00:00 2001 From: ivinoiz <55226166+ivinoiz@users.noreply.github.com> Date: Fri, 19 Jun 2020 13:03:45 +0300 Subject: [PATCH 2/2] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c78cb80..c178719 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ Попова Мария 2/147 -Создайте иерархию классов моделирующее игру. Создайте различные виды персонажей и вооружения. Отделите поведение различного типа вооружения. (Используйте интерфейсы для определения поведения) \ No newline at end of file +Создайте абстрактный класс утка с методам swim, абстрактным методом display, и интерфейсы fly и quack. Показать пример использования класса наследующего абстрактный класс и реализующими интерфейсы. +