Skip to content
Snippets Groups Projects
Commit 4e4013dd authored by ThibautDemare's avatar ThibautDemare
Browse files

Filter on moving vehicle (don't need to consider vehicles which have not already left the building)

parent d1cbed35
Branches
Tags
No related merge requests found
...@@ -770,21 +770,23 @@ global { ...@@ -770,21 +770,23 @@ global {
int sumMaritime <- 0; int sumMaritime <- 0;
int sumSecondary <- 0; int sumSecondary <- 0;
ask Vehicle { ask Vehicle {
if(networkType = "road"){ if(readyToMove and destination != nil){
averageRoadVehicleOccupancy <- averageRoadVehicleOccupancy + currentTransportedVolume; if(networkType = "road"){
sumRoad <- sumRoad + 1; averageRoadVehicleOccupancy <- averageRoadVehicleOccupancy + currentTransportedVolume;
} sumRoad <- sumRoad + 1;
else if(networkType = "river"){ }
averageRiverVehicleOccupancy <- averageRiverVehicleOccupancy + currentTransportedVolume; else if(networkType = "river"){
sumRiver <- sumRiver + 1; averageRiverVehicleOccupancy <- averageRiverVehicleOccupancy + currentTransportedVolume;
} sumRiver <- sumRiver + 1;
else if(networkType = "maritime"){ }
averageMaritimeVehicleOccupancy <- averageMaritimeVehicleOccupancy + currentTransportedVolume; else if(networkType = "maritime"){
sumMaritime <- sumMaritime + 1; averageMaritimeVehicleOccupancy <- averageMaritimeVehicleOccupancy + currentTransportedVolume;
} sumMaritime <- sumMaritime + 1;
else if(networkType = "secondary"){ }
averageSecondaryVehicleOccupancy <- averageSecondaryVehicleOccupancy + currentTransportedVolume; else if(networkType = "secondary"){
sumSecondary <- sumSecondary + 1; averageSecondaryVehicleOccupancy <- averageSecondaryVehicleOccupancy + currentTransportedVolume;
sumSecondary <- sumSecondary + 1;
}
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment