forked from s425077/PotatoPlan
asd
This commit is contained in:
commit
94c2792ef3
@ -332,6 +332,27 @@ class Crops
|
|||||||
|
|
||||||
public float getProductionRate(CropTypes Sample)
|
public float getProductionRate(CropTypes Sample)
|
||||||
{
|
{
|
||||||
|
float predProd = 1.0f;
|
||||||
|
if (Status > 1)
|
||||||
|
{
|
||||||
|
bool correctSeason = false;
|
||||||
|
foreach (string i in Sample.Season)
|
||||||
|
{
|
||||||
|
if (i == Time.getTimeOfYear() || i == "Whole Year")
|
||||||
|
{
|
||||||
|
correctSeason = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (correctSeason)
|
||||||
|
{
|
||||||
|
predProd = Game1.Sources.ML_Joel.Engine.PredictProductionwithRainfall(soilProperties, Time);
|
||||||
|
predProd = (predProd / soilProperties.Area) / 2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
predProd = 0.20f;
|
||||||
|
}
|
||||||
|
|
||||||
ProductionRate = 1;
|
ProductionRate = 1;
|
||||||
float min = 1.0f;
|
float min = 1.0f;
|
||||||
@ -371,7 +392,7 @@ class Crops
|
|||||||
ProductionRate = ProductionRate / 1.5f;
|
ProductionRate = ProductionRate / 1.5f;
|
||||||
}
|
}
|
||||||
ProductionRate = (float)Math.Pow(ProductionRate, 2.5f);
|
ProductionRate = (float)Math.Pow(ProductionRate, 2.5f);
|
||||||
return ProductionRate;
|
return ProductionRate * predProd;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float getProductionRate()
|
public float getProductionRate()
|
||||||
|
@ -77,8 +77,8 @@ class Farm
|
|||||||
init(Size, housepos);
|
init(Size, housepos);
|
||||||
RainPosition.X = r.Next(0, 1900);
|
RainPosition.X = r.Next(0, 1900);
|
||||||
RainPosition.Y = r.Next(0, 1950);
|
RainPosition.Y = r.Next(0, 1950);
|
||||||
RainfallMap = PerlinNoise.LoadImage("C:\\Users\\Joel\\source\\repos\\Oskars Repo\\Game1\\Content\\Rainfall.png");
|
//RainfallMap = PerlinNoise.LoadImage("C:\\Users\\Joel\\source\\repos\\Oskars Repo\\Game1\\Content\\Rainfall.png");
|
||||||
//RainfallMap = PerlinNoise.LoadImage("C:/Users/Oskar/source/repos/PotatoPlanFinal/Game1/Content/Rainfall.png");
|
RainfallMap = PerlinNoise.LoadImage("C:/Users/Oskar/source/repos/PotatoPlanFinal/Game1/Content/Rainfall.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
public Rectangle getRainPosition(int TileSize, int x, int y, Vector2 Size)
|
public Rectangle getRainPosition(int TileSize, int x, int y, Vector2 Size)
|
||||||
|
@ -35,13 +35,13 @@ namespace Game1.Sources.ML_Joel
|
|||||||
PredictionEngineArea = Model.CreateEngineArea();
|
PredictionEngineArea = Model.CreateEngineArea();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static float PredictProductionwithRainfall(Crops crop, CropTypes cropTypes)
|
public static float PredictProductionwithRainfall(SoilProperties soilProperties, DayNightCycle Time)
|
||||||
{
|
{
|
||||||
InputArea modelInput = new InputArea
|
InputArea modelInput = new InputArea
|
||||||
{
|
{
|
||||||
//Season = ,
|
Season = Time.getTimeOfYear(),
|
||||||
//Area = crop.getSoilProperties().Area,
|
Area = soilProperties.Area,
|
||||||
Rainfall = crop.getSoilProperties().Humidity,
|
Rainfall = soilProperties.Humidity,
|
||||||
};
|
};
|
||||||
|
|
||||||
return PredictionEngineArea.Predict(modelInput).Score;
|
return PredictionEngineArea.Predict(modelInput).Score;
|
||||||
|
@ -16,7 +16,7 @@ class SmartTractor
|
|||||||
//What to do next
|
//What to do next
|
||||||
public Path returnChoice()
|
public Path returnChoice()
|
||||||
{
|
{
|
||||||
//System.Threading.St
|
//System.Threading.ThreadStart tractorThread = new System.Threading.ThreadStart(farm.UpdatePreferedCrops);
|
||||||
ai.update(farm, Size, tractorPos / (tileSize + Spacing), housePos / (tileSize + Spacing), Target / (tileSize + Spacing), Rotation);
|
ai.update(farm, Size, tractorPos / (tileSize + Spacing), housePos / (tileSize + Spacing), Target / (tileSize + Spacing), Rotation);
|
||||||
farm.UpdatePreferedCrops(Size);
|
farm.UpdatePreferedCrops(Size);
|
||||||
farm = ai.changeCropStatus();
|
farm = ai.changeCropStatus();
|
||||||
|
Loading…
Reference in New Issue
Block a user