From 8e17d516f790dabbf82e4074bf65f84853bd1c33 Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Tue, 11 Feb 2025 15:35:50 +0100
Subject: [PATCH] quickfix tractors + bugfix getAddress

---
 Zero_engine.alpx                          | 2 +-
 _alp/Classes/Class.J_Address.java         | 2 +-
 _alp/Classes/Class.J_EADieselTractor.java | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AnyLogicWorkspace splitVersion="1"
                    WorkspaceVersion="1.9"
-                   AnyLogicVersion="8.9.2.202410172110"
+                   AnyLogicVersion="8.9.2.202410172112"
                    AlpVersion="8.9.2">
 	<Model>
 		<Id>1658477103134</Id>
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();