s449854/PotatoPlan
1
0
Fork 0
forked from s425077/PotatoPlan
Code Releases Activity

Merge branch 'Oskar-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Oskar-ML

Browse Source
This commit is contained in:
BOTLester 2020-05-10 18:18:16 +02:00
commit 49182f0fd0
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Game1/Sources/Crops/Crops.cs
View File

@ -273,6 +273,7 @@ class Crops
} }
ProductionRate = ProductionRate / 1.5f; ProductionRate = ProductionRate / 1.5f;
} }
ProductionRate = (float)Math.Pow(ProductionRate, 2.5f);
return ProductionRate; return ProductionRate;
} }

12
Game1/Sources/ML/MLModel.cs
View File

@ -11,12 +11,12 @@ using Microsoft.ML.Trainers.LightGbm;
class MLModel class MLModel
{ {
private static MLContext mlContext = new MLContext(seed: 1); private static MLContext mlContext = new MLContext(seed: 1);
private static string path = "C:/Users/Oskar/source/repos/PotatoPlanFinal/Game1/Content/ML/Fertilizer_Prediction.csv"; private static string path = "C:/Users/Joel/source/repos/Oskars Repo/Game1/Content/ML/Fertilizer_Prediction.csv";
private static string modelpath = "C:/Users/Oskar/source/repos/PotatoPlanFinal/Game1/Content/ML/MLmodel"; private static string modelpath = "C:/Users/Joel/source/repos/Oskars Repo/Game1/Content/ML/MLmodel";
private static string report = "C:/Users/Oskar/source/repos/PotatoPlanFinal/Game1/Content/ML/report"; private static string report = "C:/Users/Joel/source/repos/Oskars Repo/Game1/Content/ML/report";
private static string pathBig = "C:/Users/Oskar/source/repos/PotatoPlanFinal/Game1/Content/ML/BigFertPredict.csv"; private static string pathBig = "C:/Users/Joel/source/repos/Oskars Repo/Game1/Content/ML/BigFertPredict.csv";
private static string modelpathBig = "C:/Users/Oskar/source/repos/PotatoPlanFinal/Game1/Content/ML/MLmodelBig"; private static string modelpathBig = "C:/Users/Joel/source/repos/Oskars Repo/Game1/Content/ML/MLmodelBig";
private static string reportBig = "C:/Users/Oskar/source/repos/PotatoPlanFinal/Game1/Content/ML/report_BigModel"; private static string reportBig = "C:/Users/Joel/source/repos/Oskars Repo/Game1/Content/ML/report_BigModel";
// Loading data, creatin and saving ML model for smaller dataset (100) // Loading data, creatin and saving ML model for smaller dataset (100)
public static void CreateModel() public static void CreateModel()

23
Game1/Sources/Objects/Tractor.cs
View File

@ -9,7 +9,9 @@ class Tractor
private Path path = new Path(); private Path path = new Path();
private SmartTractor smartTractor = new SmartTractor(); private SmartTractor smartTractor = new SmartTractor();
private HandleRotation handleRotation = new HandleRotation(); private HandleRotation handleRotation = new HandleRotation();
private int j = 60; private int WaitFrame = 30;
private int j;
public void updateSizing(Input input, int Status, Vector2 newHousePos, DayNightCycle Time) public void updateSizing(Input input, int Status, Vector2 newHousePos, DayNightCycle Time)
@ -63,10 +65,29 @@ class Tractor
public void updatePosition(Vector2 Size, int Status) // updates the position public void updatePosition(Vector2 Size, int Status) // updates the position
{ {
//farm.updateSize(Size, sizeTile, Spacing); //farm.updateSize(Size, sizeTile, Spacing);
for (int i = 0; i < Speed; i++) for (int i = 0; i < Speed; i++)
{ {
updateDirection(Size, Position); updateDirection(Size, Position);
/*
if (!smartTractor.getWaitTwoFrames())
{
updateDirection(Size, Position);
j = WaitFrame;
}
else if (j != 0)
{
j--;
}
else
{
smartTractor.setWaitTwoFrames(false);
}*/
} }
} }