Skip to content

Commit 8e17d51

Browse files
committed
quickfix tractors + bugfix getAddress
1 parent e27e0c8 commit 8e17d51

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Zero_engine.alpx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<AnyLogicWorkspace splitVersion="1"
33
WorkspaceVersion="1.9"
4-
AnyLogicVersion="8.9.2.202410172110"
4+
AnyLogicVersion="8.9.2.202410172112"
55
AlpVersion="8.9.2">
66
<Model>
77
<Id>1658477103134</Id>

_alp/Classes/Class.J_Address.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public String getAddress() {
4343
sb.append(" ");
4444
sb.append(this.postalcode);
4545
}
46-
if ( this.postalcode != null ){
46+
if ( this.city != null ){
4747
sb.append(" ");
4848
sb.append(this.city);
4949
}

_alp/Classes/Class.J_EADieselTractor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ private int workTimeStepsPerWeek() {
105105

106106
private double currentPower_kW(double currentStep_h) {
107107
int week = (int) Math.round(currentStep_h / (7 * 24));
108-
108+
if(week == 52) {
109+
week = 51;
110+
}
109111
double thisWeekDieselConsumption_L = this.dieselConsumptionPerWeek_L[week];
110112
double thisWeekDieselConsumption_kWh = thisWeekDieselConsumption_L * DIESEL_ENERGY_DENSITY_KWH_PER_L;
111113
double power_kW = thisWeekDieselConsumption_kWh / workHoursPerWeek();

0 commit comments

Comments
 (0)