Skip to content

quickfix tractors + bugfix getAddress #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AteZenmo merged 1 commit into from
Feb 11, 2025
Merged

quickfix tractors + bugfix getAddress #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Zero_engine.alpx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion _alp/Classes/Class.J_Address.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 3 additions & 1 deletion _alp/Classes/Class.J_EADieselTractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down