Skip to content
Snippets Groups Projects
Commit 75c09cc2 authored by ThibautDemare's avatar ThibautDemare
Browse files

Use the scheduledTransportedVolume instead to make the observation

parent fde1edce
Branches
Tags
No related merge requests found
......@@ -400,20 +400,19 @@ global {
sumLeavingMaritimeVehicleRO <- sumLeavingMaritimeVehicleRO + length(t.leavingVehicles_maritime);
ask t.leavingVehicles_maritime {
myself.sumLeavingQuantitiesRO <- myself.sumLeavingQuantitiesRO + self.currentTransportedVolume;
myself.sumLeavingMaritimeQuantitiesRO <- myself.sumLeavingMaritimeQuantitiesRO + self.currentTransportedVolume;
myself.sumLeavingQuantitiesRO <- myself.sumLeavingQuantitiesRO + self.scheduledTransportedVolume;
myself.sumLeavingMaritimeQuantitiesRO <- myself.sumLeavingMaritimeQuantitiesRO + self.scheduledTransportedVolume;
}
ask t.leavingVehicles_road {
myself.sumLeavingQuantitiesRO <- myself.sumLeavingQuantitiesRO + self.currentTransportedVolume;
myself.sumLeavingRoadQuantitiesRO <- myself.sumLeavingRoadQuantitiesRO + self.currentTransportedVolume;
myself.sumLeavingQuantitiesRO <- myself.sumLeavingQuantitiesRO + self.scheduledTransportedVolume;
myself.sumLeavingRoadQuantitiesRO <- myself.sumLeavingRoadQuantitiesRO + self.scheduledTransportedVolume;
}
ask t.leavingVehicles_river {
myself.sumLeavingQuantitiesRO <- myself.sumLeavingQuantitiesRO + self.currentTransportedVolume;
myself.sumLeavingRiverQuantitiesRO <- myself.sumLeavingRiverQuantitiesRO + self.currentTransportedVolume;
myself.sumLeavingQuantitiesRO <- myself.sumLeavingQuantitiesRO + self.scheduledTransportedVolume;
myself.sumLeavingRiverQuantitiesRO <- myself.sumLeavingRiverQuantitiesRO + self.scheduledTransportedVolume;
}
j <- j + 1;
}
......
......@@ -14,6 +14,7 @@ species Vehicle skills:[MovingOnNetwork] {
Building source; // where the vehicle comes from
list<Commodity> scheduledCommodities; // marchandises qui devraient être transportées
list<Commodity> transportedCommodities; // commodities really transported
float scheduledTransportedVolume <- 0;
float currentTransportedVolume; // quantité de marchandise actuellement transportees
bool readyToMove <- false;
string networkType;
......
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