Skip to content
Snippets Groups Projects
Commit 7057d239 authored by ThibautDemare's avatar ThibautDemare
Browse files

Debug issue with results in Le Havre

parent c4fa738d
No related merge requests found
Hide whitespace changes
Inline Side-by-side
models/Building.gaml
+ 12
− 3
View file @ 7057d239
......@@ -80,17 +80,26 @@ species Building {
}
}
action welcomeVehicle(Vehicle v){
if(v.networkType = "road"){
nbRoadVehiclesLastSteps[length(nbRoadVehiclesLastSteps)-1] <- nbRoadVehiclesLastSteps[length(nbRoadVehiclesLastSteps)-1] + 1.0;
}
else if(v.networkType = "river"){
nbRiverVehiclesLastSteps[length(nbRiverVehiclesLastSteps)-1] <- nbRiverVehiclesLastSteps[length(nbRiverVehiclesLastSteps)-1] + 1.0;
}
else { // if(v.networkType = "maritime")
nbMaritimeVehiclesLastSteps[length(nbMaritimeVehiclesLastSteps)-1] <- nbMaritimeVehiclesLastSteps[length(nbMaritimeVehiclesLastSteps)-1] + 1.0;
}
}
action receiveCommodity(Commodity c, string nt){
if(nt = "road"){
nbRoadVehiclesLastSteps[length(nbRoadVehiclesLastSteps)-1] <- nbRoadVehiclesLastSteps[length(nbRoadVehiclesLastSteps)-1] + 1.0;
nbRoadQuantitiesLastSteps[length(nbRoadQuantitiesLastSteps)-1] <- nbRoadQuantitiesLastSteps[length(nbRoadQuantitiesLastSteps)-1] + c.volume;
}
else if(nt = "river"){
nbRiverVehiclesLastSteps[length(nbRiverVehiclesLastSteps)-1] <- nbRiverVehiclesLastSteps[length(nbRiverVehiclesLastSteps)-1] + 1.0;
nbRiverQuantitiesLastSteps[length(nbRiverQuantitiesLastSteps)-1] <- nbRiverQuantitiesLastSteps[length(nbRiverQuantitiesLastSteps)-1] + c.volume;
}
else { // if(nt = "maritime")
nbMaritimeVehiclesLastSteps[length(nbMaritimeVehiclesLastSteps)-1] <- nbMaritimeVehiclesLastSteps[length(nbMaritimeVehiclesLastSteps)-1] + 1.0;
nbMaritimeQuantitiesLastSteps[length(nbMaritimeQuantitiesLastSteps)-1] <- nbMaritimeQuantitiesLastSteps[length(nbMaritimeQuantitiesLastSteps)-1] + c.volume;
}
if(c.finalDestination = self){
......
models/Observer.gaml
+ 59
− 25
View file @ 7057d239
......@@ -274,6 +274,7 @@ global {
do updateROTerminalModeShare(myself);
}
}
do cleanNbVehiclesQuantitiesLastSteps;
if(sumVehicle > 0) {
shareRoadVehicle <- sumRoadVehicle / sumVehicle;
......@@ -313,47 +314,60 @@ global {
int j <- 0;
loop while: j < length(buildings) {
Building b <- buildings[j];
// Road
int i <- 0;
loop while: i < length(b.nbRoadVehiclesLastSteps) {
sumVehicle <- sumVehicle + b.nbRoadVehiclesLastSteps[i] + b.nbRiverVehiclesLastSteps[i] + b.nbMaritimeVehiclesLastSteps[i];
sumVehicle <- sumVehicle + b.nbRoadVehiclesLastSteps[i];
sumRoadVehicle <- sumRoadVehicle + b.nbRoadVehiclesLastSteps[i];
sumRiverVehicle <- sumRiverVehicle + b.nbRiverVehiclesLastSteps[i];
sumMaritimeVehicle <- sumMaritimeVehicle + b.nbMaritimeVehiclesLastSteps[i];
sumVehicleRO <- sumVehicleRO + b.nbRoadVehiclesLastSteps[i] + b.nbRiverVehiclesLastSteps[i] + b.nbMaritimeVehiclesLastSteps[i];
sumVehicleRO <- sumVehicleRO + b.nbRoadVehiclesLastSteps[i];
sumRoadVehicleRO <- sumRoadVehicleRO + b.nbRoadVehiclesLastSteps[i];
sumRiverVehicleRO <- sumRiverVehicleRO + b.nbRiverVehiclesLastSteps[i];
sumMaritimeVehicleRO <- sumMaritimeVehicleRO + b.nbMaritimeVehiclesLastSteps[i];
sumQuantities <- sumQuantities + b.nbRoadQuantitiesLastSteps[i] + b.nbRiverQuantitiesLastSteps[i] + b.nbMaritimeQuantitiesLastSteps[i];
sumQuantities <- sumQuantities + b.nbRoadQuantitiesLastSteps[i];
sumRoadQuantities <- sumRoadQuantities + b.nbRoadQuantitiesLastSteps[i];
sumRiverQuantities <- sumRiverQuantities + b.nbRiverQuantitiesLastSteps[i];
sumMaritimeQuantities <- sumMaritimeQuantities + b.nbMaritimeQuantitiesLastSteps[i];
sumQuantitiesRO <- sumQuantitiesRO + b.nbRoadQuantitiesLastSteps[i] + b.nbRiverQuantitiesLastSteps[i] + b.nbMaritimeQuantitiesLastSteps[i];
sumQuantitiesRO <- sumQuantitiesRO + b.nbRoadQuantitiesLastSteps[i];
sumRoadQuantitiesRO <- sumRoadQuantitiesRO + b.nbRoadQuantitiesLastSteps[i];
i <- i + 1;
}
// River
i <- 0;
loop while: i < length(b.nbRiverVehiclesLastSteps) {
sumVehicle <- sumVehicle + b.nbRiverVehiclesLastSteps[i];
sumRiverVehicle <- sumRiverVehicle + b.nbRiverVehiclesLastSteps[i];
sumVehicleRO <- sumVehicleRO + b.nbRiverVehiclesLastSteps[i];
sumRiverVehicleRO <- sumRiverVehicleRO + b.nbRiverVehiclesLastSteps[i];
sumQuantities <- sumQuantities + b.nbRoadQuantitiesLastSteps[i] + b.nbRiverQuantitiesLastSteps[i];
sumRiverQuantities <- sumRiverQuantities + b.nbRiverQuantitiesLastSteps[i];
sumQuantitiesRO <- sumQuantitiesRO + b.nbRiverQuantitiesLastSteps[i];
sumRiverQuantitiesRO <- sumRiverQuantitiesRO + b.nbRiverQuantitiesLastSteps[i];
sumMaritimeQuantitiesRO <- sumMaritimeQuantitiesRO + b.nbMaritimeQuantitiesLastSteps[i];
i <- i + 1;
}
if(cycle > -1){
remove index: 0 from: b.nbRoadVehiclesLastSteps;
remove index: 0 from: b.nbRiverVehiclesLastSteps;
remove index: 0 from: b.nbMaritimeVehiclesLastSteps;
remove index: 0 from: b.nbRoadQuantitiesLastSteps;
remove index: 0 from: b.nbRiverQuantitiesLastSteps;
remove index: 0 from: b.nbMaritimeQuantitiesLastSteps;
// Maritime
i <- 0;
loop while: i < length(b.nbMaritimeVehiclesLastSteps) {
sumVehicle <- sumVehicle + b.nbMaritimeVehiclesLastSteps[i];
sumMaritimeVehicle <- sumMaritimeVehicle + b.nbMaritimeVehiclesLastSteps[i];
sumVehicleRO <- sumVehicleRO + b.nbMaritimeVehiclesLastSteps[i];
sumMaritimeVehicleRO <- sumMaritimeVehicleRO + b.nbMaritimeVehiclesLastSteps[i];
sumQuantities <- sumQuantities + b.nbMaritimeQuantitiesLastSteps[i];
sumMaritimeQuantities <- sumMaritimeQuantities + b.nbMaritimeQuantitiesLastSteps[i];
sumQuantitiesRO <- sumQuantitiesRO + b.nbMaritimeQuantitiesLastSteps[i];
sumMaritimeQuantitiesRO <- sumMaritimeQuantitiesRO + b.nbMaritimeQuantitiesLastSteps[i];
i <- i + 1;
}
b.nbRoadVehiclesLastSteps <+ 0;
b.nbRiverVehiclesLastSteps <+ 0;
b.nbMaritimeVehiclesLastSteps <+ 0;
b.nbRoadQuantitiesLastSteps <+ 0;
b.nbRiverQuantitiesLastSteps <+ 0;
b.nbMaritimeQuantitiesLastSteps <+ 0;
j <- j + 1;
}
......@@ -381,6 +395,26 @@ global {
}
}
action cleanNbVehiclesQuantitiesLastSteps {
ask ((Building as list) + (Warehouse as list) + (MaritimeTerminal as list) + (RiverTerminal as list) + (MaritimeRiverTerminal as list)) {
if(cycle > -1){
remove index: 0 from: nbRoadVehiclesLastSteps;
remove index: 0 from: nbRiverVehiclesLastSteps;
remove index: 0 from: nbMaritimeVehiclesLastSteps;
remove index: 0 from: nbRoadQuantitiesLastSteps;
remove index: 0 from: nbRiverQuantitiesLastSteps;
remove index: 0 from: nbMaritimeQuantitiesLastSteps;
}
nbRoadVehiclesLastSteps <+ 0;
nbRiverVehiclesLastSteps <+ 0;
nbMaritimeVehiclesLastSteps <+ 0;
nbRoadQuantitiesLastSteps <+ 0;
nbRiverQuantitiesLastSteps <+ 0;
nbMaritimeQuantitiesLastSteps <+ 0;
}
}
action updateROTerminalModeShare(RegionObserver ro) {
ask ro {
......
models/Vehicle.gaml
+ 5
− 1
View file @ 7057d239
......@@ -45,6 +45,7 @@ species Vehicle skills:[MovingOnNetwork] {
scheduledCommodities[j].currentNetwork <- networkType;
currentTransportedVolume <- currentTransportedVolume + scheduledCommodities[j].volume;
remove index: j from: scheduledCommodities;
remove index: i from: source.leavingCommodities;
notfound <- false;
}
i <- i + 1;
......@@ -67,6 +68,7 @@ species Vehicle skills:[MovingOnNetwork] {
if(location = destination.location){
int j <- 0;
loop while: j < length(transportedCommodities) {
transportedCommodities[j].location <- location;
transportedCommodities[j].incomingDate <- current_date;
ask destination {
......@@ -74,7 +76,9 @@ species Vehicle skills:[MovingOnNetwork] {
}
j <- j + 1;
}
ask destination {
do welcomeVehicle(myself);
}
destination <- nil;
do die;
}
......
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