Commit d62042f5 authored by Sebastian Hörl's avatar Sebastian Hörl
Browse files

Fix av freight probability

parent 543dac2d
......@@ -347,10 +347,10 @@ public class AssignPrivatAVs {
if (r <= 0.6000) {
person.getAttributes().putAttribute(FREIGHT_AV,true);
person.getAttributes().putAttribute(FREIGHT_AV,false);
} else {
person.getAttributes().putAttribute(FREIGHT_AV,false);
person.getAttributes().putAttribute(FREIGHT_AV,true);
}
} else if(year >= 2040){
//TODO put the values that TP5 gives us as conditions for freight av market penetration 2040
......@@ -358,10 +358,10 @@ public class AssignPrivatAVs {
if (r <= 0.7500) {
person.getAttributes().putAttribute(FREIGHT_AV,true);
person.getAttributes().putAttribute(FREIGHT_AV,false);
} else {
person.getAttributes().putAttribute(FREIGHT_AV,false);
person.getAttributes().putAttribute(FREIGHT_AV,true);
}
} else if( year >= 2030){
//TODO put the values that TP5 gives us as conditions for freight av market penetration 2030
......@@ -369,16 +369,16 @@ public class AssignPrivatAVs {
if (r <= 0.9000) {
person.getAttributes().putAttribute(FREIGHT_AV,true);
person.getAttributes().putAttribute(FREIGHT_AV,false);
} else {
person.getAttributes().putAttribute(FREIGHT_AV,false);
person.getAttributes().putAttribute(FREIGHT_AV,true);
}
} else {
person.getAttributes().putAttribute(FREIGHT_AV,false);
}
person.getAttributes().putAttribute(FREIGHT_AV,false);
}
}
}
......
Supports Markdown
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