From 7511a507998163dcf4341b7f8bbf55519e672347 Mon Sep 17 00:00:00 2001 From: Bartosz Chyzy Date: Wed, 13 Mar 2019 14:19:38 +0100 Subject: [PATCH] init --- .gitignore | 261 ++++++++++++++++++ .../CzokoŚmieciarka.DataModels.csproj | 54 ++++ .../DataModels/Interfaces/Garbage/AGarbage.cs | 41 +++ .../DataModels/Interfaces/Garbage/IGarbage.cs | 17 ++ .../GarbageCollector/AGarbageCollector.cs | 46 +++ .../GarbageCollector/IGarbageCollector.cs | 22 ++ .../Interfaces/IGarbageLocalization.cs | 16 ++ Trunk/DataModels/Interfaces/ITypeOfGarbage.cs | 15 + .../IRoutePlanningEngine.cs | 13 + .../TrashCans/AGarbageCollectorContainer.cs | 16 ++ .../Interfaces/TrashCans/ATrashCan.cs | 48 ++++ Trunk/DataModels/Models/Coords.cs | 22 ++ Trunk/DataModels/Models/Map.cs | 23 ++ Trunk/DataModels/Properties/AssemblyInfo.cs | 36 +++ 14 files changed, 630 insertions(+) create mode 100644 .gitignore create mode 100644 Trunk/DataModels/CzokoŚmieciarka.DataModels.csproj create mode 100644 Trunk/DataModels/Interfaces/Garbage/AGarbage.cs create mode 100644 Trunk/DataModels/Interfaces/Garbage/IGarbage.cs create mode 100644 Trunk/DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs create mode 100644 Trunk/DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs create mode 100644 Trunk/DataModels/Interfaces/IGarbageLocalization.cs create mode 100644 Trunk/DataModels/Interfaces/ITypeOfGarbage.cs create mode 100644 Trunk/DataModels/Interfaces/RoutePlanningEngine/IRoutePlanningEngine.cs create mode 100644 Trunk/DataModels/Interfaces/TrashCans/AGarbageCollectorContainer.cs create mode 100644 Trunk/DataModels/Interfaces/TrashCans/ATrashCan.cs create mode 100644 Trunk/DataModels/Models/Coords.cs create mode 100644 Trunk/DataModels/Models/Map.cs create mode 100644 Trunk/DataModels/Properties/AssemblyInfo.cs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c4efe2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,261 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# 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 + +# DNX +project.lock.json +project.fragment.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.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 + +# 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 + +# 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 +# TODO: 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 +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable 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 + +# 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 +node_modules/ +orleans.codegen.cs + +# 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 + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# 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/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc \ No newline at end of file diff --git a/Trunk/DataModels/CzokoŚmieciarka.DataModels.csproj b/Trunk/DataModels/CzokoŚmieciarka.DataModels.csproj new file mode 100644 index 0000000..8558e5f --- /dev/null +++ b/Trunk/DataModels/CzokoŚmieciarka.DataModels.csproj @@ -0,0 +1,54 @@ + + + + + Debug + AnyCPU + a5de8ecc-f35c-45a9-a27d-3f3622a294ac + Library + Properties + CzokoŚmieciarka.DataModels + CzokoŚmieciarka.DataModels + v4.6.1 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Trunk/DataModels/Interfaces/Garbage/AGarbage.cs b/Trunk/DataModels/Interfaces/Garbage/AGarbage.cs new file mode 100644 index 0000000..47b52c9 --- /dev/null +++ b/Trunk/DataModels/Interfaces/Garbage/AGarbage.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.DataModels.Interfaces +{ + public abstract class AGarbage : IGarbage + { + protected AGarbage(ITypeOfGarbage typeOfGarbage, int weight) + { + this.TypeOfGarbage = typeOfGarbage; + this.Weight = weight; + } + + public ITypeOfGarbage TypeOfGarbage { get; } + public virtual int Weight { get; } + + public virtual int Volume + { + get { return this.Weight / TypeOfGarbage.Density; } + } + + protected abstract AGarbage Add(AGarbage garbageToAdd); + protected abstract AGarbage Subtract (AGarbage garbageToSubstract); + + #region Operators + + public static AGarbage operator + (AGarbage a, AGarbage b) + { + return a.Add(b); + } + + public static AGarbage operator - (AGarbage a, AGarbage b) + { + return a.Subtract(b); + } + #endregion + } +} diff --git a/Trunk/DataModels/Interfaces/Garbage/IGarbage.cs b/Trunk/DataModels/Interfaces/Garbage/IGarbage.cs new file mode 100644 index 0000000..465e2d9 --- /dev/null +++ b/Trunk/DataModels/Interfaces/Garbage/IGarbage.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.DataModels.Interfaces +{ + public interface IGarbage + { + ITypeOfGarbage TypeOfGarbage { get; } + + int Weight { get; } + + int Volume { get; } +} +} diff --git a/Trunk/DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs b/Trunk/DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs new file mode 100644 index 0000000..384b48d --- /dev/null +++ b/Trunk/DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using CzokoŚmieciarka.DataModels.Models; + +namespace CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector +{ + public abstract class AGarbageCollector : IGarbageCollector + { + public AGarbageCollector(Coords startPosition, IEnumerable trashContainers) + { + this.Position = startPosition; + this.TrashContainers = trashContainers; + } + public Coords Position { get; } + + public Coords MoveUp() + { + return new Coords(Position.X,Position.Y+1); + } + + public Coords MoveDown() + { + return new Coords(Position.X, Position.Y - 1); + } + + public Coords MoveLeft() + { + return new Coords(Position.X-1, Position.Y); + } + + public Coords MoveRight() + { + return new Coords(Position.X+1, Position.Y); + } + + public IEnumerable TrashContainers { get; } + + public bool Collect(ITypeOfGarbage typeOfGarbage) + { + throw new NotImplementedException(); + } + } +} diff --git a/Trunk/DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs b/Trunk/DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs new file mode 100644 index 0000000..f92e2e4 --- /dev/null +++ b/Trunk/DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using CzokoŚmieciarka.DataModels.Models; + +namespace CzokoŚmieciarka.DataModels.Interfaces +{ + public interface IGarbageCollector + { + Coords Position { get; } + Coords MoveUp(); + Coords MoveDown(); + Coords MoveLeft(); + Coords MoveRight(); + + IEnumerable TrashContainers { get; } + + bool Collect(ITypeOfGarbage typeOfGarbage); + } +} diff --git a/Trunk/DataModels/Interfaces/IGarbageLocalization.cs b/Trunk/DataModels/Interfaces/IGarbageLocalization.cs new file mode 100644 index 0000000..f414a52 --- /dev/null +++ b/Trunk/DataModels/Interfaces/IGarbageLocalization.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using CzokoŚmieciarka.DataModels.Models; + +namespace CzokoŚmieciarka.DataModels.Interfaces +{ + public interface IGarbageLocalization + { + Coords Coords { get; } + + IEnumerable TrashCans { get; set; } + } +} diff --git a/Trunk/DataModels/Interfaces/ITypeOfGarbage.cs b/Trunk/DataModels/Interfaces/ITypeOfGarbage.cs new file mode 100644 index 0000000..c81d75a --- /dev/null +++ b/Trunk/DataModels/Interfaces/ITypeOfGarbage.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.DataModels.Interfaces +{ + public interface ITypeOfGarbage + { + string GarbageType { get; } + int ProcessingTimePerUnit { get; } + int Density { get; } + } +} diff --git a/Trunk/DataModels/Interfaces/RoutePlanningEngine/IRoutePlanningEngine.cs b/Trunk/DataModels/Interfaces/RoutePlanningEngine/IRoutePlanningEngine.cs new file mode 100644 index 0000000..e9908de --- /dev/null +++ b/Trunk/DataModels/Interfaces/RoutePlanningEngine/IRoutePlanningEngine.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.DataModels.Interfaces.RoutePlanningEngine +{ + public abstract class ARoutePlanningEngine + { + + } +} diff --git a/Trunk/DataModels/Interfaces/TrashCans/AGarbageCollectorContainer.cs b/Trunk/DataModels/Interfaces/TrashCans/AGarbageCollectorContainer.cs new file mode 100644 index 0000000..33a96db --- /dev/null +++ b/Trunk/DataModels/Interfaces/TrashCans/AGarbageCollectorContainer.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.DataModels.Interfaces +{ + public abstract class AGarbageCollectorContainer : ATrashCan + { + protected AGarbageCollectorContainer(ITypeOfGarbage typeOfGarbage, int maxVolume) : base(typeOfGarbage, maxVolume) + { + + } + } +} diff --git a/Trunk/DataModels/Interfaces/TrashCans/ATrashCan.cs b/Trunk/DataModels/Interfaces/TrashCans/ATrashCan.cs new file mode 100644 index 0000000..e4f02ad --- /dev/null +++ b/Trunk/DataModels/Interfaces/TrashCans/ATrashCan.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.DataModels.Interfaces +{ + public abstract class ATrashCan + { + protected ATrashCan(ITypeOfGarbage typeOfGarbage, int maxVolume) + { + this.MaxVolume = maxVolume; + this._typeOfGarbage = typeOfGarbage; + } + + protected ITypeOfGarbage _typeOfGarbage; + + public int MaxVolume { get;} + + public AGarbage Garbage { get; private set; } + + public int FillPercent + { + get { return Garbage.Volume / this.MaxVolume; } + } + + public virtual bool AddGarbage(AGarbage garbage) + { + if (this._typeOfGarbage != garbage.TypeOfGarbage) + return false; + + var newGarbage = this.Garbage + Garbage; + if (newGarbage.Volume > this.MaxVolume) + return false; + + this.Garbage = newGarbage; + return true; + } + + public virtual AGarbage TakeGarbage() + { + var result = this.Garbage; + this.Garbage = null; + return result; + } + } +} diff --git a/Trunk/DataModels/Models/Coords.cs b/Trunk/DataModels/Models/Coords.cs new file mode 100644 index 0000000..9cd3523 --- /dev/null +++ b/Trunk/DataModels/Models/Coords.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.DataModels.Models +{ + public class Coords + { + public Coords(int x,int y) + { + this.X = x; + this.Y = y; + } + + public int X { get; set; } + public int Y { get; set; } + + + } +} diff --git a/Trunk/DataModels/Models/Map.cs b/Trunk/DataModels/Models/Map.cs new file mode 100644 index 0000000..d852af3 --- /dev/null +++ b/Trunk/DataModels/Models/Map.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using CzokoŚmieciarka.DataModels.Interfaces; + +namespace CzokoŚmieciarka.DataModels.Models +{ + public class Map + { + public Map(Rectangle mapRectangle, IEnumerable garbageLocalizations=null) + { + this.MapRectangle = mapRectangle; + this.GarbageLocalizations = garbageLocalizations; + } + + Rectangle MapRectangle { get; } + + IEnumerable GarbageLocalizations { get; } + } +} diff --git a/Trunk/DataModels/Properties/AssemblyInfo.cs b/Trunk/DataModels/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..6836431 --- /dev/null +++ b/Trunk/DataModels/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("CzokoŚmieciarka.DataModels")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("CzokoŚmieciarka.DataModels")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("a5de8ecc-f35c-45a9-a27d-3f3622a294ac")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")]