diff --git a/Zero_engine.alpx b/Zero_engine.alpx index 3871055f..6b624322 100644 --- a/Zero_engine.alpx +++ b/Zero_engine.alpx @@ -1,7 +1,7 @@ 1658477103134 diff --git a/_alp/Classes/Class.J_Address.java b/_alp/Classes/Class.J_Address.java index 8199794f..eacbd7c5 100644 --- a/_alp/Classes/Class.J_Address.java +++ b/_alp/Classes/Class.J_Address.java @@ -43,7 +43,7 @@ public String getAddress() { sb.append(" "); sb.append(this.postalcode); } - if ( this.postalcode != null ){ + if ( this.city != null ){ sb.append(" "); sb.append(this.city); } diff --git a/_alp/Classes/Class.J_EADieselTractor.java b/_alp/Classes/Class.J_EADieselTractor.java index 65dfe477..f40dfe2e 100644 --- a/_alp/Classes/Class.J_EADieselTractor.java +++ b/_alp/Classes/Class.J_EADieselTractor.java @@ -105,7 +105,9 @@ private int workTimeStepsPerWeek() { private double currentPower_kW(double currentStep_h) { int week = (int) Math.round(currentStep_h / (7 * 24)); - + if(week == 52) { + week = 51; + } double thisWeekDieselConsumption_L = this.dieselConsumptionPerWeek_L[week]; double thisWeekDieselConsumption_kWh = thisWeekDieselConsumption_L * DIESEL_ENERGY_DENSITY_KWH_PER_L; double power_kW = thisWeekDieselConsumption_kWh / workHoursPerWeek();