s434678/Czoko_Smieciarka
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

:/

Browse Source
This commit is contained in:
ryuga4 2019-04-23 09:30:16 +02:00
parent 39776ce06a
commit d26d9e1bc8
4 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Trunk/Helper Programs/MapEditor/MapEditor/App.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<configuration> <configuration>
<appSettings> <appSettings>
<add key="imageFilePath" value="C:\Users\micjan11\Projekty\Czoko_Smieciarka\Trunk\MonoGameView\map.bmp"/> <add key="imageFilePath" value="C:\Users\micjan11\Projekty\Czoko_Smieciarka\Trunk\MonoGameView\map2.bmp"/>
<add key="outputFilePath" value="C:\Users\micjan11\Projekty\Czoko_Smieciarka\Trunk\MonoGameView\bin\Windows\x86\Debug\map.xml"/> <add key="outputFilePath" value="C:\Users\micjan11\Projekty\Czoko_Smieciarka\Trunk\MonoGameView\bin\Windows\x86\Debug\map.xml"/>
</appSettings> </appSettings>
<startup> <startup>

46
Trunk/MonoGameView/Algorithms/DFS.cs
View File

@ -51,31 +51,37 @@ namespace CzokoŚmieciarka.MonoGameView.Algorithms
var result = new List<IStep>(); var result = new List<IStep>();
var moveSteps = new List<IStep>()
if (!(collector.TrashContainers.Any(x => x.FillPercent > 0) && grid[collector.Coords.X,collector.Coords.Y] is ADump))
{ {
new MoveStep(Direction.Up), var moveSteps = new List<IStep>()
new MoveStep(Direction.Down),
new MoveStep(Direction.Left),
new MoveStep(Direction.Right)
};
var filteredMoveSteps = new List<IStep>();
foreach (var item in moveSteps)
{
var copyCollector = (AGarbageCollector)collector.Clone();
try
{ {
item.Invoke(copyCollector, grid); new MoveStep(Direction.Up),
var gcx = copyCollector.Coords.X; new MoveStep(Direction.Down),
var gcy = copyCollector.Coords.Y; new MoveStep(Direction.Left),
if (grid[gcx, gcy] is Road1 || grid[gcx, gcy] is House || grid[gcx, gcy] is ADump) new MoveStep(Direction.Right)
};
var filteredMoveSteps = new List<IStep>();
foreach (var item in moveSteps)
{
var copyCollector = (AGarbageCollector)collector.Clone();
try
{ {
result.Add(item); item.Invoke(copyCollector, grid);
var gcx = copyCollector.Coords.X;
var gcy = copyCollector.Coords.Y;
if (grid[gcx, gcy] is Road1 || grid[gcx, gcy] is House || (grid[gcx, gcy] is ADump && copyCollector.TrashContainers.Any(x=>x.FillPercent>0)))
{
result.Add(item);
}
}
catch (Exception e)
{
} }
} }
catch (Exception e)
{
}
} }
if (grid[collector.Coords.X, collector.Coords.Y] is IGarbageLocalization) if (grid[collector.Coords.X, collector.Coords.Y] is IGarbageLocalization)
{ {
@ -132,7 +138,7 @@ namespace CzokoŚmieciarka.MonoGameView.Algorithms
KeyValuePair<List<IStep>, int> Search(ContentManager content, GarbageCollector collector, ICloneable[,] grid, int length) KeyValuePair<List<IStep>, int> Search(ContentManager content, GarbageCollector collector, ICloneable[,] grid, int length)
{ {
if (length > 200) return new KeyValuePair<List<IStep>, int>(null,length); if (length > 100) return new KeyValuePair<List<IStep>, int>(null,length);
count++; count++;
if (Houses.All(c => (grid[c.X, c.Y] as IGarbageLocalization).TrashCans.All(j => j.FillPercent == 0.0)) if (Houses.All(c => (grid[c.X, c.Y] as IGarbageLocalization).TrashCans.All(j => j.FillPercent == 0.0))
&& &&

20
Trunk/MonoGameView/Game1.cs
View File

@ -53,7 +53,7 @@ namespace CzokoŚmieciarka.MonoGameView
ImageContainer.InitContainer(Content); ImageContainer.InitContainer(Content);
// TODO: Add your initialization logic here // TODO: Add your initialization logic here
timer = 5f; timer = 0f;
mapLoader.Load(out size,out grid,"map.xml"); mapLoader.Load(out size,out grid,"map.xml");
var containers = new List<GarbageCollectorContainer>() var containers = new List<GarbageCollectorContainer>()
@ -61,8 +61,24 @@ namespace CzokoŚmieciarka.MonoGameView
new GarbageCollectorContainer( new GarbageCollectorContainer(
new TypeOfGarbage(GarbageType.Glass,50,1), new TypeOfGarbage(GarbageType.Glass,50,1),
100, 100,
new BasicGarbage(new TypeOfGarbage(GarbageType.Glass,50,1),1) new BasicGarbage(new TypeOfGarbage(GarbageType.Glass,50,1),0)
), ),
new GarbageCollectorContainer(
new TypeOfGarbage(GarbageType.Paper,50,1),
100,
new BasicGarbage(new TypeOfGarbage(GarbageType.Glass,50,1),0)
),
new GarbageCollectorContainer(
new TypeOfGarbage(GarbageType.Organic,50,1),
100,
new BasicGarbage(new TypeOfGarbage(GarbageType.Glass,50,1),0)
),
new GarbageCollectorContainer(
new TypeOfGarbage(GarbageType.PlasticMetal,50,1),
100,
new BasicGarbage(new TypeOfGarbage(GarbageType.Glass,50,1),0)
),
}; };
collector = new GarbageCollector(new Coords(0,0), containers, size, size); collector = new GarbageCollector(new Coords(0,0), containers, size, size);

BIN
Trunk/MonoGameView/map2.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 442 B