From deeb13eb8269b9dfd408e10f3fed591a1c6a6ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulski?= Date: Mon, 22 Apr 2019 09:24:16 +0200 Subject: [PATCH] =?UTF-8?q?Reasumuj=C4=85c=20wszystkie=20aspekty=20kwintes?= =?UTF-8?q?encji=20tematu,=20dochodz=C4=99=20do=20fundamentalnej=20konkluz?= =?UTF-8?q?ji,=20warto=20commitowa=C4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/Dump.cs | 13 -- .../CzokoŚmieciarka.DataModels.csproj | 30 +-- .../Exceptions/OutOfGridException.cs | 24 -- .../Interfaces/IStep.cs | 9 - Trunk/CzokoŚmieciarka.sln | 72 ------ .../CzokoŚmieciarka.WPFv2.csproj | 14 -- .../Algorithms}/DFS.cs | 218 +++++++++--------- .../DataModels}/Enums/Directions.cs | 2 +- .../DataModels}/Enums/GarbageTypes.cs | 2 +- .../DataModels/Exceptions}/Exceptions.cs | 18 +- .../Interfaces/Garbage/AGarbage.cs | 2 +- .../Interfaces/Garbage/IGarbage.cs | 2 +- .../GarbageCollector/AGarbageCollector.cs | 134 +++++------ .../GarbageCollector/IGarbageCollector.cs | 6 +- .../Interfaces/IGarbageLocalization.cs | 6 +- .../DataModels/Interfaces/IHouse.cs | 12 + .../DataModels}/Interfaces/IRoad.cs | 24 +- .../DataModels}/Interfaces/IRoad1.cs | 24 +- .../DataModels}/Interfaces/IRoad2.cs | 24 +- .../DataModels/Interfaces/IStep.cs | 9 + .../DataModels}/Interfaces/ITypeOfGarbage.cs | 4 +- .../IRoutePlanningEngine.cs | 4 +- .../DataModels}/Interfaces/TrashCans/ADump.cs | 4 +- .../TrashCans/AGarbageCollectorContainer.cs | 2 +- .../Interfaces/TrashCans/ATrashCan.cs | 3 +- .../DataModels}/Models/Coords.cs | 34 +-- Trunk/MonoGameView/DataModels/Models/Dump.cs | 13 ++ .../DataModels}/Models/Garbage.cs | 5 +- .../DataModels}/Models/GarbageCollector.cs | 8 +- .../Models/GarbageCollectorContainer.cs | 6 +- .../DataModels}/Models/GarbageLocalization.cs | 8 +- Trunk/MonoGameView/DataModels/Models/House.cs | 13 ++ .../DataModels}/Models/Map.cs | 5 +- .../DataModels}/Models/Road1.cs | 26 +-- .../DataModels}/Models/Road2.cs | 26 +-- .../DataModels}/Models/Steps/CollectStep.cs | 7 +- .../DataModels}/Models/Steps/MoveStep.cs | 11 +- .../DataModels}/Models/Steps/SpillStep.cs | 7 +- .../DataModels}/Models/TrashCan.cs | 6 +- .../DataModels}/Models/TypeOfGarbage.cs | 6 +- Trunk/MonoGameView/Game1.cs | 17 +- Trunk/MonoGameView/GarbageCollector.cs | 6 +- Trunk/MonoGameView/MonoGameView.csproj | 49 ++-- 43 files changed, 429 insertions(+), 486 deletions(-) delete mode 100644 Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/Dump.cs delete mode 100644 Trunk/Components/CzokoŚmieciarka.DataModels/Exceptions/OutOfGridException.cs delete mode 100644 Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IStep.cs rename Trunk/{Components/CzokoŚmieciarka.AI_Naive => MonoGameView/Algorithms}/DFS.cs (87%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Enums/Directions.cs (61%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Enums/GarbageTypes.cs (80%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels/Exceptions}/Exceptions.cs (63%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/Garbage/AGarbage.cs (93%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/Garbage/IGarbage.cs (79%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/GarbageCollector/AGarbageCollector.cs (85%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/GarbageCollector/IGarbageCollector.cs (65%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/IGarbageLocalization.cs (58%) create mode 100644 Trunk/MonoGameView/DataModels/Interfaces/IHouse.cs rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/IRoad.cs (72%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/IRoad1.cs (72%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/IRoad2.cs (72%) create mode 100644 Trunk/MonoGameView/DataModels/Interfaces/IStep.cs rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/ITypeOfGarbage.cs (71%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/RoutePlanningEngine/IRoutePlanningEngine.cs (58%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/TrashCans/ADump.cs (69%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/TrashCans/AGarbageCollectorContainer.cs (75%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Interfaces/TrashCans/ATrashCan.cs (90%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Models/Coords.cs (94%) create mode 100644 Trunk/MonoGameView/DataModels/Models/Dump.cs rename Trunk/{Components/CzokoŚmieciarka.DataModels.GeneralModels => MonoGameView/DataModels}/Models/Garbage.cs (70%) rename Trunk/{Components/CzokoŚmieciarka.DataModels.GeneralModels => MonoGameView/DataModels}/Models/GarbageCollector.cs (53%) rename Trunk/{Components/CzokoŚmieciarka.DataModels.GeneralModels => MonoGameView/DataModels}/Models/GarbageCollectorContainer.cs (52%) rename Trunk/{Components/CzokoŚmieciarka.DataModels.GeneralModels => MonoGameView/DataModels}/Models/GarbageLocalization.cs (65%) create mode 100644 Trunk/MonoGameView/DataModels/Models/House.cs rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Models/Map.cs (77%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Models/Road1.cs (57%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Models/Road2.cs (57%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Models/Steps/CollectStep.cs (81%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Models/Steps/MoveStep.cs (75%) rename Trunk/{Components/CzokoŚmieciarka.DataModels => MonoGameView/DataModels}/Models/Steps/SpillStep.cs (82%) rename Trunk/{Components/CzokoŚmieciarka.DataModels.GeneralModels => MonoGameView/DataModels}/Models/TrashCan.cs (61%) rename Trunk/{Components/CzokoŚmieciarka.DataModels.GeneralModels => MonoGameView/DataModels}/Models/TypeOfGarbage.cs (71%) diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/Dump.cs b/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/Dump.cs deleted file mode 100644 index ea9d2b7..0000000 --- a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/Dump.cs +++ /dev/null @@ -1,13 +0,0 @@ -using CzokoŚmieciarka.DataModels.Interfaces; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; -using CzokoŚmieciarka.DataModels.Models; - -namespace CzokoŚmieciarka.DataModels.GeneralModels.Models -{ - public class Dump : ADump - { - public Dump(ITypeOfGarbage typeOfGarbage, int maxVolume, Coords localization) : base(typeOfGarbage, maxVolume, localization) - { - } - } -} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj b/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj index d200d86..f1402e1 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj +++ b/Trunk/Components/CzokoŚmieciarka.DataModels/CzokoŚmieciarka.DataModels.csproj @@ -42,32 +42,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Exceptions/OutOfGridException.cs b/Trunk/Components/CzokoŚmieciarka.DataModels/Exceptions/OutOfGridException.cs deleted file mode 100644 index a0c69cc..0000000 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Exceptions/OutOfGridException.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CzokoŚmieciarka.DataModels.Exceptions -{ - public class OutOfGridException : Exception - { - public OutOfGridException() - { - } - public OutOfGridException(string message) - : base(message) - { - } - - public OutOfGridException(string message, Exception inner) - : base(message, inner) - { - } - } -} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IStep.cs b/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IStep.cs deleted file mode 100644 index 10f537f..0000000 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IStep.cs +++ /dev/null @@ -1,9 +0,0 @@ -using CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector; - -namespace CzokoŚmieciarka.DataModels.Interfaces -{ - public interface IStep - { - void Invoke(IGarbageCollector collector, object [,] grid); - } -} diff --git a/Trunk/CzokoŚmieciarka.sln b/Trunk/CzokoŚmieciarka.sln index 7342d94..c584a58 100644 --- a/Trunk/CzokoŚmieciarka.sln +++ b/Trunk/CzokoŚmieciarka.sln @@ -3,14 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28307.136 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.DataModels", "Components\CzokoŚmieciarka.DataModels\CzokoŚmieciarka.DataModels.csproj", "{F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.DataModels.GeneralModels", "Components\CzokoŚmieciarka.DataModels.GeneralModels\CzokoŚmieciarka.DataModels.GeneralModels.csproj", "{A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.WPFv2", "Interface\CzokoŚmieciarka.WPFv2\CzokoŚmieciarka.WPFv2.csproj", "{2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CzokoŚmieciarka.AI_Naive", "Components\CzokoŚmieciarka.AI_Naive\CzokoŚmieciarka.AI_Naive.csproj", "{10E77BBE-55E1-483D-A456-0E94EAC9B24A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGameView", "MonoGameView\MonoGameView.csproj", "{EBE9431C-9B66-4300-B288-7A0F7B899415}" EndProject Global @@ -25,70 +17,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Debug|ARM.Build.0 = Debug|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Debug|x64.ActiveCfg = Debug|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Debug|x64.Build.0 = Debug|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Debug|x86.ActiveCfg = Debug|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Debug|x86.Build.0 = Debug|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Release|Any CPU.Build.0 = Release|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Release|ARM.ActiveCfg = Release|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Release|ARM.Build.0 = Release|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Release|x64.ActiveCfg = Release|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Release|x64.Build.0 = Release|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Release|x86.ActiveCfg = Release|Any CPU - {F2E11FEE-C5AC-47D2-BA9C-819909B6DFF7}.Release|x86.Build.0 = Release|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Debug|ARM.Build.0 = Debug|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Debug|x64.ActiveCfg = Debug|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Debug|x64.Build.0 = Debug|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Debug|x86.ActiveCfg = Debug|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Debug|x86.Build.0 = Debug|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|Any CPU.Build.0 = Release|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|ARM.ActiveCfg = Release|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|ARM.Build.0 = Release|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|x64.ActiveCfg = Release|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|x64.Build.0 = Release|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|x86.ActiveCfg = Release|Any CPU - {A3D5DA96-69D7-463F-B1EE-6FC70716E3B2}.Release|x86.Build.0 = Release|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Debug|ARM.Build.0 = Debug|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Debug|x64.ActiveCfg = Debug|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Debug|x64.Build.0 = Debug|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Debug|x86.ActiveCfg = Debug|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Debug|x86.Build.0 = Debug|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|Any CPU.Build.0 = Release|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|ARM.ActiveCfg = Release|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|ARM.Build.0 = Release|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|x64.ActiveCfg = Release|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|x64.Build.0 = Release|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|x86.ActiveCfg = Release|Any CPU - {2BADDDA9-A77C-4FB2-9F28-4DAE712E8947}.Release|x86.Build.0 = Release|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Debug|ARM.ActiveCfg = Debug|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Debug|ARM.Build.0 = Debug|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Debug|x64.ActiveCfg = Debug|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Debug|x64.Build.0 = Debug|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Debug|x86.ActiveCfg = Debug|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Debug|x86.Build.0 = Debug|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Release|Any CPU.Build.0 = Release|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Release|ARM.ActiveCfg = Release|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Release|ARM.Build.0 = Release|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Release|x64.ActiveCfg = Release|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Release|x64.Build.0 = Release|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Release|x86.ActiveCfg = Release|Any CPU - {10E77BBE-55E1-483D-A456-0E94EAC9B24A}.Release|x86.Build.0 = Release|Any CPU {EBE9431C-9B66-4300-B288-7A0F7B899415}.Debug|Any CPU.ActiveCfg = Debug|x86 {EBE9431C-9B66-4300-B288-7A0F7B899415}.Debug|Any CPU.Build.0 = Debug|x86 {EBE9431C-9B66-4300-B288-7A0F7B899415}.Debug|ARM.ActiveCfg = Debug|x86 diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/CzokoŚmieciarka.WPFv2.csproj b/Trunk/Interface/CzokoŚmieciarka.WPFv2/CzokoŚmieciarka.WPFv2.csproj index 69761c4..e146b90 100644 --- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/CzokoŚmieciarka.WPFv2.csproj +++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/CzokoŚmieciarka.WPFv2.csproj @@ -102,20 +102,6 @@ - - - {10e77bbe-55e1-483d-a456-0e94eac9b24a} - CzokoŚmieciarka.AI_Naive - - - {a3d5da96-69d7-463f-b1ee-6fc70716e3b2} - CzokoŚmieciarka.DataModels.GeneralModels - - - {f2e11fee-c5ac-47d2-ba9c-819909b6dff7} - CzokoŚmieciarka.DataModels - - \ No newline at end of file diff --git a/Trunk/Components/CzokoŚmieciarka.AI_Naive/DFS.cs b/Trunk/MonoGameView/Algorithms/DFS.cs similarity index 87% rename from Trunk/Components/CzokoŚmieciarka.AI_Naive/DFS.cs rename to Trunk/MonoGameView/Algorithms/DFS.cs index 10571e8..79e5766 100644 --- a/Trunk/Components/CzokoŚmieciarka.AI_Naive/DFS.cs +++ b/Trunk/MonoGameView/Algorithms/DFS.cs @@ -1,109 +1,109 @@ -using CzokoŚmieciarka.DataModels.Enums; -using CzokoŚmieciarka.DataModels.Interfaces; -using CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; -using CzokoŚmieciarka.DataModels.Models; -using CzokoŚmieciarka.DataModels.Models.Steps; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CzokoŚmieciarka.AI_Naive -{ - public class DFS - { - public DFS() - { - } - int count = 0; - - - public List BestPath(AGarbageCollector collector, object[,] grid) - { - var r=Search(collector, grid, 0).Key; - Console.WriteLine(count); - return r; - } - - List PossibleSteps(AGarbageCollector collector, object[,] grid) - { - - - var result = new List(); - var moveSteps = new List() - { - new MoveStep(Direction.Up), - new MoveStep(Direction.Down), - new MoveStep(Direction.Left), - new MoveStep(Direction.Right) - }; - var filteredMoveSteps = new List(); - foreach (var item in moveSteps) - { - var copyCollector = (AGarbageCollector)collector.Clone(); - var copyGrid = (object[,])grid.Clone(); - try - { - item.Invoke(copyCollector, grid); - var gcx = copyCollector.Coords.X; - var gcy = copyCollector.Coords.Y; - if (grid[gcx, gcy] is IRoad1 || grid[gcx, gcy] is IGarbageLocalization || grid[gcx, gcy] is ADump) - { - result.Add(item); - } - } - catch (Exception e) - { - - } - } - - return result; - } - - KeyValuePair, int> Search(AGarbageCollector collector, object[,] grid, int length) - { - count++; - if (length > 40) return new KeyValuePair, int>(new List(), length); - var possibleSteps = PossibleSteps(collector, grid); - - foreach (var item in possibleSteps) - { - var copyCollector = (AGarbageCollector)collector.Clone(); - var copyGrid = (object[,])grid.Clone(); - - - - - - - - //if (copyGrid[copyCollector.Coords.X, copyCollector.Coords.Y] is IRoad1) copyGrid[copyCollector.Coords.X, copyCollector.Coords.Y] = new Road2(); - item.Invoke(copyCollector, copyGrid); - var s = Search(copyCollector, copyGrid, length + 1); - if (s.Key != null) - { - s.Key.Insert(0, item); - return s; - } - } - return new KeyValuePair, int>(null, length); - /*var min = int.MaxValue; - var min_index = 0; - for (int i = 0; i < mapped.Count; i++) - { - if (mapped.ElementAt(i).Value <= min) - { - min = mapped.ElementAt(i).Value; - min_index = i; - } - } - return mapped.ElementAt(min_index); - */ - - - } - } -} +using CzokoŚmieciarka.MonoGameView.DataModels.Enums; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.GarbageCollector; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Models; +using CzokoŚmieciarka.MonoGameView.DataModels.Models.Steps; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.MonoGameView.Algorithms +{ + public class DFS + { + public DFS() + { + } + int count = 0; + + + public List BestPath(AGarbageCollector collector, object[,] grid) + { + var r=Search(collector, grid, 0).Key; + Console.WriteLine(count); + return r; + } + + List PossibleSteps(AGarbageCollector collector, object[,] grid) + { + + + var result = new List(); + var moveSteps = new List() + { + new MoveStep(Direction.Up), + new MoveStep(Direction.Down), + new MoveStep(Direction.Left), + new MoveStep(Direction.Right) + }; + var filteredMoveSteps = new List(); + foreach (var item in moveSteps) + { + var copyCollector = (AGarbageCollector)collector.Clone(); + var copyGrid = (object[,])grid.Clone(); + try + { + item.Invoke(copyCollector, grid); + var gcx = copyCollector.Coords.X; + var gcy = copyCollector.Coords.Y; + if (grid[gcx, gcy] is IRoad1 || grid[gcx, gcy] is IGarbageLocalization || grid[gcx, gcy] is ADump) + { + result.Add(item); + } + } + catch (Exception e) + { + + } + } + + return result; + } + + KeyValuePair, int> Search(AGarbageCollector collector, object[,] grid, int length) + { + count++; + if (length > 40) return new KeyValuePair, int>(new List(), length); + var possibleSteps = PossibleSteps(collector, grid); + + foreach (var item in possibleSteps) + { + var copyCollector = (AGarbageCollector)collector.Clone(); + var copyGrid = (object[,])grid.Clone(); + + + + + + + + //if (copyGrid[copyCollector.Coords.X, copyCollector.Coords.Y] is IRoad1) copyGrid[copyCollector.Coords.X, copyCollector.Coords.Y] = new Road2(); + item.Invoke(copyCollector, copyGrid); + var s = Search(copyCollector, copyGrid, length + 1); + if (s.Key != null) + { + s.Key.Insert(0, item); + return s; + } + } + return new KeyValuePair, int>(null, length); + /*var min = int.MaxValue; + var min_index = 0; + for (int i = 0; i < mapped.Count; i++) + { + if (mapped.ElementAt(i).Value <= min) + { + min = mapped.ElementAt(i).Value; + min_index = i; + } + } + return mapped.ElementAt(min_index); + */ + + + } + } +} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Enums/Directions.cs b/Trunk/MonoGameView/DataModels/Enums/Directions.cs similarity index 61% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Enums/Directions.cs rename to Trunk/MonoGameView/DataModels/Enums/Directions.cs index 1c46e50..aff1717 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Enums/Directions.cs +++ b/Trunk/MonoGameView/DataModels/Enums/Directions.cs @@ -1,4 +1,4 @@ -namespace CzokoŚmieciarka.DataModels.Enums +namespace CzokoŚmieciarka.MonoGameView.DataModels.Enums { public enum Direction { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Enums/GarbageTypes.cs b/Trunk/MonoGameView/DataModels/Enums/GarbageTypes.cs similarity index 80% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Enums/GarbageTypes.cs rename to Trunk/MonoGameView/DataModels/Enums/GarbageTypes.cs index ce58a4a..755bb93 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Enums/GarbageTypes.cs +++ b/Trunk/MonoGameView/DataModels/Enums/GarbageTypes.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace CzokoŚmieciarka.DataModels.Enums +namespace CzokoŚmieciarka.MonoGameView.DataModels.Enums { public enum GarbageType { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Exceptions.cs b/Trunk/MonoGameView/DataModels/Exceptions/Exceptions.cs similarity index 63% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Exceptions.cs rename to Trunk/MonoGameView/DataModels/Exceptions/Exceptions.cs index fb15cd3..52ec2f5 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Exceptions.cs +++ b/Trunk/MonoGameView/DataModels/Exceptions/Exceptions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace CzokoŚmieciarka.DataModels +namespace CzokoŚmieciarka.MonoGameView.DataModels.Exceptions { public class WrongPositionException : Exception { @@ -26,4 +26,20 @@ namespace CzokoŚmieciarka.DataModels } } + public class OutOfGridException : Exception + { + public OutOfGridException() + { + } + public OutOfGridException(string message) + : base(message) + { + } + + public OutOfGridException(string message, Exception inner) + : base(message, inner) + { + } + } + } diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/Garbage/AGarbage.cs b/Trunk/MonoGameView/DataModels/Interfaces/Garbage/AGarbage.cs similarity index 93% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/Garbage/AGarbage.cs rename to Trunk/MonoGameView/DataModels/Interfaces/Garbage/AGarbage.cs index 1ae2f2a..3c71b29 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/Garbage/AGarbage.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/Garbage/AGarbage.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace CzokoŚmieciarka.DataModels.Interfaces +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.Garbage { public abstract class AGarbage : IGarbage { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/Garbage/IGarbage.cs b/Trunk/MonoGameView/DataModels/Interfaces/Garbage/IGarbage.cs similarity index 79% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/Garbage/IGarbage.cs rename to Trunk/MonoGameView/DataModels/Interfaces/Garbage/IGarbage.cs index f76aef2..097f8b7 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/Garbage/IGarbage.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/Garbage/IGarbage.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace CzokoŚmieciarka.DataModels.Interfaces +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.Garbage { public interface IGarbage : ICloneable { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs b/Trunk/MonoGameView/DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs similarity index 85% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs rename to Trunk/MonoGameView/DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs index c071ed9..87c1de3 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/GarbageCollector/AGarbageCollector.cs @@ -1,67 +1,67 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using CzokoŚmieciarka.DataModels.Exceptions; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; -using CzokoŚmieciarka.DataModels.Models; - -namespace CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector -{ - public abstract class AGarbageCollector : IGarbageCollector, ICloneable - { - public AGarbageCollector(Coords startPosition, IEnumerable trashContainers, int columns, int rows) - { - this.columns = columns; - this.rows = rows; - this.Coords = startPosition; - this.TrashContainers = trashContainers; - } - public Coords Coords { get; set; } - public int columns { get; set; } - public int rows { get; set; } - public void MoveUp() - { - if(Coords.Y -1 < 0) - { - throw new OutOfGridException(); - } - Coords.Y -= 1; - } - - public void MoveDown() - { - if (Coords.Y + 1 >= rows) - { - throw new OutOfGridException(); - } - Coords.Y +=1; - } - - public void MoveLeft() - { - if (Coords.X - 1 < 0) - { - throw new OutOfGridException(); - } - Coords.X -= 1; - } - - public void MoveRight() - { - if (Coords.X + 1 >= columns) - { - throw new OutOfGridException(); - } - Coords.X += 1; - } - - public virtual object Clone() - { - throw new NotImplementedException(); - } - - public IEnumerable TrashContainers { get; } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using CzokoŚmieciarka.MonoGameView.DataModels.Exceptions; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Models; + +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.GarbageCollector +{ + public abstract class AGarbageCollector : IGarbageCollector, ICloneable + { + public AGarbageCollector(Coords startPosition, IEnumerable trashContainers, int columns, int rows) + { + this.columns = columns; + this.rows = rows; + this.Coords = startPosition; + this.TrashContainers = trashContainers; + } + public Coords Coords { get; set; } + public int columns { get; set; } + public int rows { get; set; } + public void MoveUp() + { + if(Coords.Y -1 < 0) + { + throw new OutOfGridException(); + } + Coords.Y -= 1; + } + + public void MoveDown() + { + if (Coords.Y + 1 >= rows) + { + throw new OutOfGridException(); + } + Coords.Y +=1; + } + + public void MoveLeft() + { + if (Coords.X - 1 < 0) + { + throw new OutOfGridException(); + } + Coords.X -= 1; + } + + public void MoveRight() + { + if (Coords.X + 1 >= columns) + { + throw new OutOfGridException(); + } + Coords.X += 1; + } + + public virtual object Clone() + { + throw new NotImplementedException(); + } + + public IEnumerable TrashContainers { get; } + } +} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs b/Trunk/MonoGameView/DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs similarity index 65% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs rename to Trunk/MonoGameView/DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs index 89bc30e..c705805 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/GarbageCollector/IGarbageCollector.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; -using CzokoŚmieciarka.DataModels.Models; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Models; -namespace CzokoŚmieciarka.DataModels.Interfaces +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.GarbageCollector { public interface IGarbageCollector : ICloneable { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IGarbageLocalization.cs b/Trunk/MonoGameView/DataModels/Interfaces/IGarbageLocalization.cs similarity index 58% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IGarbageLocalization.cs rename to Trunk/MonoGameView/DataModels/Interfaces/IGarbageLocalization.cs index 55435a7..08c4fcd 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IGarbageLocalization.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/IGarbageLocalization.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; -using CzokoŚmieciarka.DataModels.Models; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Models; -namespace CzokoŚmieciarka.DataModels.Interfaces +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces { public interface IGarbageLocalization { diff --git a/Trunk/MonoGameView/DataModels/Interfaces/IHouse.cs b/Trunk/MonoGameView/DataModels/Interfaces/IHouse.cs new file mode 100644 index 0000000..d03aa40 --- /dev/null +++ b/Trunk/MonoGameView/DataModels/Interfaces/IHouse.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces +{ + public interface IHouse + { + } +} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IRoad.cs b/Trunk/MonoGameView/DataModels/Interfaces/IRoad.cs similarity index 72% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IRoad.cs rename to Trunk/MonoGameView/DataModels/Interfaces/IRoad.cs index 43c9b37..5c03df8 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IRoad.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/IRoad.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CzokoŚmieciarka.DataModels.Interfaces -{ - public interface IRoad - { - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces +{ + public interface IRoad + { + } +} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IRoad1.cs b/Trunk/MonoGameView/DataModels/Interfaces/IRoad1.cs similarity index 72% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IRoad1.cs rename to Trunk/MonoGameView/DataModels/Interfaces/IRoad1.cs index a31b73c..9c8382f 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IRoad1.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/IRoad1.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CzokoŚmieciarka.DataModels.Interfaces -{ - public interface IRoad1 - { - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces +{ + public interface IRoad1 + { + } +} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IRoad2.cs b/Trunk/MonoGameView/DataModels/Interfaces/IRoad2.cs similarity index 72% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IRoad2.cs rename to Trunk/MonoGameView/DataModels/Interfaces/IRoad2.cs index ee9254e..e962c74 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/IRoad2.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/IRoad2.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CzokoŚmieciarka.DataModels.Interfaces -{ - public interface IRoad2 - { - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces +{ + public interface IRoad2 + { + } +} diff --git a/Trunk/MonoGameView/DataModels/Interfaces/IStep.cs b/Trunk/MonoGameView/DataModels/Interfaces/IStep.cs new file mode 100644 index 0000000..f526bec --- /dev/null +++ b/Trunk/MonoGameView/DataModels/Interfaces/IStep.cs @@ -0,0 +1,9 @@ +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.GarbageCollector; + +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces +{ + public interface IStep + { + void Invoke(IGarbageCollector collector, object [,] grid); + } +} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/ITypeOfGarbage.cs b/Trunk/MonoGameView/DataModels/Interfaces/ITypeOfGarbage.cs similarity index 71% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/ITypeOfGarbage.cs rename to Trunk/MonoGameView/DataModels/Interfaces/ITypeOfGarbage.cs index b8b65c0..f7e6e85 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/ITypeOfGarbage.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/ITypeOfGarbage.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using CzokoŚmieciarka.DataModels.Enums; +using CzokoŚmieciarka.MonoGameView.DataModels.Enums; -namespace CzokoŚmieciarka.DataModels.Interfaces +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces { public interface ITypeOfGarbage { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/RoutePlanningEngine/IRoutePlanningEngine.cs b/Trunk/MonoGameView/DataModels/Interfaces/RoutePlanningEngine/IRoutePlanningEngine.cs similarity index 58% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/RoutePlanningEngine/IRoutePlanningEngine.cs rename to Trunk/MonoGameView/DataModels/Interfaces/RoutePlanningEngine/IRoutePlanningEngine.cs index f20ed55..23defd3 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/RoutePlanningEngine/IRoutePlanningEngine.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/RoutePlanningEngine/IRoutePlanningEngine.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; -namespace CzokoŚmieciarka.DataModels.Interfaces.RoutePlanningEngine +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.RoutePlanningEngine { public interface IRoutePlanningEngine { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/ADump.cs b/Trunk/MonoGameView/DataModels/Interfaces/TrashCans/ADump.cs similarity index 69% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/ADump.cs rename to Trunk/MonoGameView/DataModels/Interfaces/TrashCans/ADump.cs index d59ce30..59094fd 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/ADump.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/TrashCans/ADump.cs @@ -1,6 +1,6 @@ -using CzokoŚmieciarka.DataModels.Models; +using CzokoŚmieciarka.MonoGameView.DataModels.Models; -namespace CzokoŚmieciarka.DataModels.Interfaces.TrashCans +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans { public abstract class ADump : ATrashCan { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/AGarbageCollectorContainer.cs b/Trunk/MonoGameView/DataModels/Interfaces/TrashCans/AGarbageCollectorContainer.cs similarity index 75% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/AGarbageCollectorContainer.cs rename to Trunk/MonoGameView/DataModels/Interfaces/TrashCans/AGarbageCollectorContainer.cs index 6c49db5..de7a40c 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/AGarbageCollectorContainer.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/TrashCans/AGarbageCollectorContainer.cs @@ -1,4 +1,4 @@ -namespace CzokoŚmieciarka.DataModels.Interfaces.TrashCans +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans { public abstract class AGarbageCollectorContainer : ATrashCan { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/ATrashCan.cs b/Trunk/MonoGameView/DataModels/Interfaces/TrashCans/ATrashCan.cs similarity index 90% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/ATrashCan.cs rename to Trunk/MonoGameView/DataModels/Interfaces/TrashCans/ATrashCan.cs index 9d900cf..5df8a4b 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Interfaces/TrashCans/ATrashCan.cs +++ b/Trunk/MonoGameView/DataModels/Interfaces/TrashCans/ATrashCan.cs @@ -1,6 +1,7 @@ using System; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.Garbage; -namespace CzokoŚmieciarka.DataModels.Interfaces.TrashCans +namespace CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans { public abstract class ATrashCan { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Coords.cs b/Trunk/MonoGameView/DataModels/Models/Coords.cs similarity index 94% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Models/Coords.cs rename to Trunk/MonoGameView/DataModels/Models/Coords.cs index b6d9c21..8d27913 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Coords.cs +++ b/Trunk/MonoGameView/DataModels/Models/Coords.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace CzokoŚmieciarka.DataModels.Models +namespace CzokoŚmieciarka.MonoGameView.DataModels.Models { public class Coords { @@ -34,21 +34,21 @@ namespace CzokoŚmieciarka.DataModels.Models public static Coords operator -(Coords a, Coords b) { return new Coords(a.X - b.X, a.Y - b.Y); - } - - public override string ToString() - { - return base.ToString(); - } - - public override bool Equals(object obj) - { - return base.Equals(obj); - } - - public override int GetHashCode() - { - return base.GetHashCode(); - } + } + + public override string ToString() + { + return base.ToString(); + } + + public override bool Equals(object obj) + { + return base.Equals(obj); + } + + public override int GetHashCode() + { + return base.GetHashCode(); + } } } diff --git a/Trunk/MonoGameView/DataModels/Models/Dump.cs b/Trunk/MonoGameView/DataModels/Models/Dump.cs new file mode 100644 index 0000000..2de111e --- /dev/null +++ b/Trunk/MonoGameView/DataModels/Models/Dump.cs @@ -0,0 +1,13 @@ +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Models; + +namespace CzokoŚmieciarka.MonoGameView.DataModels.GeneralModels.Models +{ + public class Dump : ADump + { + public Dump(ITypeOfGarbage typeOfGarbage, int maxVolume, Coords localization) : base(typeOfGarbage, maxVolume, localization) + { + } + } +} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/Garbage.cs b/Trunk/MonoGameView/DataModels/Models/Garbage.cs similarity index 70% rename from Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/Garbage.cs rename to Trunk/MonoGameView/DataModels/Models/Garbage.cs index 059e9f7..165d1a2 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/Garbage.cs +++ b/Trunk/MonoGameView/DataModels/Models/Garbage.cs @@ -1,7 +1,8 @@ using System; -using CzokoŚmieciarka.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.Garbage; -namespace CzokoŚmieciarka.DataModels.GeneralModels.Models +namespace CzokoŚmieciarka.MonoGameView.DataModels.GeneralModels.Models { public class Garbage : AGarbage { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageCollector.cs b/Trunk/MonoGameView/DataModels/Models/GarbageCollector.cs similarity index 53% rename from Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageCollector.cs rename to Trunk/MonoGameView/DataModels/Models/GarbageCollector.cs index 5a224df..00c570e 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageCollector.cs +++ b/Trunk/MonoGameView/DataModels/Models/GarbageCollector.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; -using CzokoŚmieciarka.DataModels.Models; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.GarbageCollector; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Models; -namespace CzokoŚmieciarka.DataModels.GeneralModels.Models +namespace CzokoŚmieciarka.MonoGameView.DataModels.GeneralModels.Models { public class GarbageCollector : AGarbageCollector { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageCollectorContainer.cs b/Trunk/MonoGameView/DataModels/Models/GarbageCollectorContainer.cs similarity index 52% rename from Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageCollectorContainer.cs rename to Trunk/MonoGameView/DataModels/Models/GarbageCollectorContainer.cs index 9b095ea..7f0fbc3 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageCollectorContainer.cs +++ b/Trunk/MonoGameView/DataModels/Models/GarbageCollectorContainer.cs @@ -1,7 +1,7 @@ -using CzokoŚmieciarka.DataModels.Interfaces; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; -namespace CzokoŚmieciarka.DataModels.GeneralModels.Models +namespace CzokoŚmieciarka.MonoGameView.DataModels.GeneralModels.Models { public class GarbageCollectorContainer : AGarbageCollectorContainer { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageLocalization.cs b/Trunk/MonoGameView/DataModels/Models/GarbageLocalization.cs similarity index 65% rename from Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageLocalization.cs rename to Trunk/MonoGameView/DataModels/Models/GarbageLocalization.cs index 29f38a8..ca22d01 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/GarbageLocalization.cs +++ b/Trunk/MonoGameView/DataModels/Models/GarbageLocalization.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using CzokoŚmieciarka.DataModels.Interfaces; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; -using CzokoŚmieciarka.DataModels.Models; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Models; -namespace CzokoŚmieciarka.DataModels.GeneralModels.Models +namespace CzokoŚmieciarka.MonoGameView.DataModels.GeneralModels.Models { public class GarbageLocalization : IGarbageLocalization { diff --git a/Trunk/MonoGameView/DataModels/Models/House.cs b/Trunk/MonoGameView/DataModels/Models/House.cs new file mode 100644 index 0000000..4bd9368 --- /dev/null +++ b/Trunk/MonoGameView/DataModels/Models/House.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; + +namespace CzokoŚmieciarka.MonoGameView.DataModels.Models +{ + public class House : IHouse + { + } +} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Map.cs b/Trunk/MonoGameView/DataModels/Models/Map.cs similarity index 77% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Models/Map.cs rename to Trunk/MonoGameView/DataModels/Models/Map.cs index 3cd1057..b117992 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Map.cs +++ b/Trunk/MonoGameView/DataModels/Models/Map.cs @@ -4,9 +4,10 @@ using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; -using CzokoŚmieciarka.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using Microsoft.Xna.Framework; -namespace CzokoŚmieciarka.DataModels.Models +namespace CzokoŚmieciarka.MonoGameView.DataModels.Models { public class Map { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Road1.cs b/Trunk/MonoGameView/DataModels/Models/Road1.cs similarity index 57% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Models/Road1.cs rename to Trunk/MonoGameView/DataModels/Models/Road1.cs index 88f8ec8..8887581 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Road1.cs +++ b/Trunk/MonoGameView/DataModels/Models/Road1.cs @@ -1,13 +1,13 @@ -using CzokoŚmieciarka.DataModels.Interfaces; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CzokoŚmieciarka.DataModels.Models -{ - public class Road1 :IRoad1 - { - } -} +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.MonoGameView.DataModels.Models +{ + public class Road1 :IRoad1 + { + } +} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Road2.cs b/Trunk/MonoGameView/DataModels/Models/Road2.cs similarity index 57% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Models/Road2.cs rename to Trunk/MonoGameView/DataModels/Models/Road2.cs index e9a4093..1838d6b 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Road2.cs +++ b/Trunk/MonoGameView/DataModels/Models/Road2.cs @@ -1,13 +1,13 @@ -using CzokoŚmieciarka.DataModels.Interfaces; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CzokoŚmieciarka.DataModels.Models -{ - public class Road2 : IRoad2 - { - } -} +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CzokoŚmieciarka.MonoGameView.DataModels.Models +{ + public class Road2 : IRoad2 + { + } +} diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Steps/CollectStep.cs b/Trunk/MonoGameView/DataModels/Models/Steps/CollectStep.cs similarity index 81% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Models/Steps/CollectStep.cs rename to Trunk/MonoGameView/DataModels/Models/Steps/CollectStep.cs index 8c2d369..75ebfe7 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Steps/CollectStep.cs +++ b/Trunk/MonoGameView/DataModels/Models/Steps/CollectStep.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using CzokoŚmieciarka.DataModels.Interfaces; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.GarbageCollector; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; -namespace CzokoŚmieciarka.DataModels.Models.Steps +namespace CzokoŚmieciarka.MonoGameView.DataModels.Models.Steps { public class CollectStep : IStep { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Steps/MoveStep.cs b/Trunk/MonoGameView/DataModels/Models/Steps/MoveStep.cs similarity index 75% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Models/Steps/MoveStep.cs rename to Trunk/MonoGameView/DataModels/Models/Steps/MoveStep.cs index ba757ba..6f377fa 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Steps/MoveStep.cs +++ b/Trunk/MonoGameView/DataModels/Models/Steps/MoveStep.cs @@ -3,11 +3,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using CzokoŚmieciarka.DataModels.Enums; -using CzokoŚmieciarka.DataModels.Interfaces; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Enums; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.GarbageCollector; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; -namespace CzokoŚmieciarka.DataModels.Models.Steps +namespace CzokoŚmieciarka.MonoGameView.DataModels.Models.Steps { public class MoveStep : IStep { @@ -21,7 +22,7 @@ namespace CzokoŚmieciarka.DataModels.Models.Steps public void Invoke(IGarbageCollector _garbageCollector, object[,] grid) { - if(grid[_garbageCollector.Coords.X, _garbageCollector.Coords.Y] is Road1) + if(grid[_garbageCollector.Coords.X, _garbageCollector.Coords.Y] is Road1) grid[_garbageCollector.Coords.X, _garbageCollector.Coords.Y] = new Road2(); switch (_direction) { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Steps/SpillStep.cs b/Trunk/MonoGameView/DataModels/Models/Steps/SpillStep.cs similarity index 82% rename from Trunk/Components/CzokoŚmieciarka.DataModels/Models/Steps/SpillStep.cs rename to Trunk/MonoGameView/DataModels/Models/Steps/SpillStep.cs index e898bf3..d259717 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels/Models/Steps/SpillStep.cs +++ b/Trunk/MonoGameView/DataModels/Models/Steps/SpillStep.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using CzokoŚmieciarka.DataModels.Interfaces; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.GarbageCollector; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; -namespace CzokoŚmieciarka.DataModels.Models.Steps +namespace CzokoŚmieciarka.MonoGameView.DataModels.Models.Steps { public class SpillStep : IStep { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/TrashCan.cs b/Trunk/MonoGameView/DataModels/Models/TrashCan.cs similarity index 61% rename from Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/TrashCan.cs rename to Trunk/MonoGameView/DataModels/Models/TrashCan.cs index c42c7ef..74a0637 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/TrashCan.cs +++ b/Trunk/MonoGameView/DataModels/Models/TrashCan.cs @@ -1,7 +1,7 @@ -using CzokoŚmieciarka.DataModels.Interfaces; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; -namespace CzokoŚmieciarka.DataModels.GeneralModels.Models +namespace CzokoŚmieciarka.MonoGameView.DataModels.GeneralModels.Models { public class TrashCan : ATrashCan { diff --git a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/TypeOfGarbage.cs b/Trunk/MonoGameView/DataModels/Models/TypeOfGarbage.cs similarity index 71% rename from Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/TypeOfGarbage.cs rename to Trunk/MonoGameView/DataModels/Models/TypeOfGarbage.cs index 38f6415..c942553 100644 --- a/Trunk/Components/CzokoŚmieciarka.DataModels.GeneralModels/Models/TypeOfGarbage.cs +++ b/Trunk/MonoGameView/DataModels/Models/TypeOfGarbage.cs @@ -1,7 +1,7 @@ -using CzokoŚmieciarka.DataModels.Enums; -using CzokoŚmieciarka.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Enums; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; -namespace CzokoŚmieciarka.DataModels.GeneralModels.Models +namespace CzokoŚmieciarka.MonoGameView.DataModels.GeneralModels.Models { public class TypeOfGarbage : ITypeOfGarbage { diff --git a/Trunk/MonoGameView/Game1.cs b/Trunk/MonoGameView/Game1.cs index 8daffd8..2eb2b4a 100644 --- a/Trunk/MonoGameView/Game1.cs +++ b/Trunk/MonoGameView/Game1.cs @@ -1,8 +1,7 @@ -using CzokoŚmieciarka.AI_Naive; -using CzokoŚmieciarka.DataModels.Interfaces; -using CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; -using CzokoŚmieciarka.DataModels.Models; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.GarbageCollector; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Models; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; @@ -10,6 +9,7 @@ using MonoGameView; using System; using System.Collections.Generic; using System.Linq; +using CzokoŚmieciarka.MonoGameView.Algorithms; namespace CzokoŚmieciarka.MonoGameView { @@ -23,6 +23,7 @@ namespace CzokoŚmieciarka.MonoGameView Texture2D road1; Texture2D road2; Texture2D grass; + Texture2D house; Vector2 roadPos; float timer; const float TIMER = 0.2f; @@ -60,7 +61,8 @@ namespace CzokoŚmieciarka.MonoGameView } } - + grid[4, 0] = new House(); + grid[6, 4] = new House(); collector = new GarbageCollector(Content,new Coords(0, 0), new List(), 10, 10); @@ -82,6 +84,7 @@ namespace CzokoŚmieciarka.MonoGameView road1 = Content.Load("road1"); road2 = Content.Load("road2"); grass = Content.Load("grass"); + house = Content.Load("house"); // TODO: use this.Content to load your game content here } @@ -91,6 +94,7 @@ namespace CzokoŚmieciarka.MonoGameView /// protected override void UnloadContent() { + Content.Unload(); // TODO: Unload any non ContentManager content here } @@ -139,6 +143,7 @@ namespace CzokoŚmieciarka.MonoGameView { if (grid[x, y] is Road1) spriteBatch.Draw(road1, new Vector2(x*50,y*50), Color.White); else if (grid[x,y] is Road2) spriteBatch.Draw(road2, new Vector2(x * 50, y * 50), Color.White); + else if (grid[x, y] is House) spriteBatch.Draw(house, new Vector2(x*50, y*50), Color.White); else spriteBatch.Draw(grass, new Vector2(x * 50, y * 50), Color.White); } } diff --git a/Trunk/MonoGameView/GarbageCollector.cs b/Trunk/MonoGameView/GarbageCollector.cs index e2e11a2..5d622e9 100644 --- a/Trunk/MonoGameView/GarbageCollector.cs +++ b/Trunk/MonoGameView/GarbageCollector.cs @@ -1,6 +1,6 @@ -using CzokoŚmieciarka.DataModels.Interfaces.GarbageCollector; -using CzokoŚmieciarka.DataModels.Interfaces.TrashCans; -using CzokoŚmieciarka.DataModels.Models; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.GarbageCollector; +using CzokoŚmieciarka.MonoGameView.DataModels.Interfaces.TrashCans; +using CzokoŚmieciarka.MonoGameView.DataModels.Models; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Content; using Microsoft.Xna.Framework.Graphics; diff --git a/Trunk/MonoGameView/MonoGameView.csproj b/Trunk/MonoGameView/MonoGameView.csproj index 318153e..26e9658 100644 --- a/Trunk/MonoGameView/MonoGameView.csproj +++ b/Trunk/MonoGameView/MonoGameView.csproj @@ -42,6 +42,40 @@ app.manifest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62,20 +96,7 @@ - - - {10e77bbe-55e1-483d-a456-0e94eac9b24a} - CzokoŚmieciarka.AI_Naive - - - {a3d5da96-69d7-463f-b1ee-6fc70716e3b2} - CzokoŚmieciarka.DataModels.GeneralModels - - - {f2e11fee-c5ac-47d2-ba9c-819909b6dff7} - CzokoŚmieciarka.DataModels - - +