-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Destination intervention update, new mode choice models
- Loading branch information
1 parent
dcc6507
commit 88d76da
Showing
6 changed files
with
320 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
src/main/java/estimation/specifications/manchester/HBA.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| package estimation.specifications.manchester; | ||
|
|
||
| import estimation.LogitData; | ||
| import estimation.RouteAttribute; | ||
| import org.matsim.api.core.v01.TransportMode; | ||
| import org.matsim.api.core.v01.network.Network; | ||
| import org.matsim.core.router.util.TravelTime; | ||
| import org.matsim.vehicles.Vehicle; | ||
| import org.opengis.feature.simple.SimpleFeature; | ||
| import routing.Gradient; | ||
| import routing.disutility.components.JctStress; | ||
| import routing.disutility.components.LinkAmbience; | ||
| import routing.disutility.components.LinkStress; | ||
| import trip.Trip; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class HBA extends MNL_Manchester { | ||
|
|
||
| private final static List<String> SOCIODEMOGRAPHIC_VARIABLES = List.of( | ||
| "p.age_group_agg_5_24","p.age_group_agg_40_69","p.age_group_agg_70", | ||
| "p.female", | ||
| "p.occupation_worker", | ||
| "hh.cars_gr_0","hh.cars_gr_2","hh.cars_gr_3"); | ||
|
|
||
| public HBA(LogitData data, Trip[] trips, Set<SimpleFeature> OAs, | ||
| Network netBike, Vehicle vehBike, TravelTime ttBike, | ||
| Network netWalk, Vehicle vehWalk, TravelTime ttWalk) { | ||
| super(data,trips,OAs,netBike,vehBike,ttBike,netWalk,vehWalk,ttWalk); | ||
| } | ||
|
|
||
| @Override | ||
| List<String> sociodemographicVariables() { | ||
| return SOCIODEMOGRAPHIC_VARIABLES; | ||
| } | ||
|
|
||
| List<RouteAttribute> streetEnvironmentAttributesBike() { | ||
| List<RouteAttribute> bike = new ArrayList<>(); | ||
| // bike.add(new RouteAttribute("g_bike_grad", l -> Math.max(Math.min(Gradient.getGradient(l),0.5),0.))); | ||
| // bike.add(new RouteAttribute("g_bike_vgvi", l -> Math.max(0.,0.81 - LinkAmbience.getVgviFactor(l)))); | ||
| // bike.add(new RouteAttribute("g_bike_stressLink", l -> LinkStress.getStress(l, TransportMode.bike))); | ||
| return bike; | ||
| } | ||
|
|
||
| List<RouteAttribute> streetEnvironmentAttributesWalk() { | ||
| List<RouteAttribute> walk = new ArrayList<>(); | ||
| walk.add(new RouteAttribute("g_walk_vgvi", l -> Math.max(0.,0.81 - LinkAmbience.getVgviFactor(l)))); | ||
| // walk.add(new RouteAttribute("g_walk_stressJct", l -> JctStress.getStressProp(l,TransportMode.walk))); | ||
| // walk.add(new RouteAttribute("g_walk_speed", l -> Math.min(1.,l.getFreespeed() / 22.35))); | ||
| // walk.add(new RouteAttribute("g_walk_aadt", l -> Math.min(1.,((int) l.getAttributes().getAttribute("aadt")) * 0.865/6000.))); | ||
| return walk; | ||
| } | ||
|
|
||
| @Override | ||
| protected List<String> fixed() { | ||
| List<String> fixed = coefficients().keySet().stream().filter(s -> (s.contains("carD"))).collect(Collectors.toList()); | ||
| fixed.add("b_pt_hh.cars_gr_2"); | ||
| fixed.add("b_pt_hh.cars_gr_3"); | ||
| fixed.add("b_bike_hh.cars_gr_0"); | ||
| fixed.add("b_bike_hh.cars_gr_2"); | ||
| fixed.add("b_bike_hh.cars_gr_3"); | ||
| fixed.add("b_bike_p.female"); | ||
| fixed.add("b_walk_hh.cars_gr_2"); | ||
| fixed.add("b_pt_p.age_group_agg_5_24"); | ||
| fixed.add("b_pt_p.age_group_agg_40_69"); | ||
| fixed.add("b_pt_p.age_group_agg_70"); | ||
| fixed.add("b_bike_p.age_group_agg_5_24"); | ||
| fixed.add("b_bike_p.age_group_agg_40_69"); | ||
| fixed.add("b_bike_p.age_group_agg_70"); | ||
| fixed.add("b_bike_p.occupation_worker"); | ||
| // fixed.add("b_carP_p.age_group_agg_5_14"); | ||
| // fixed.add("b_carP_hh.income_agg_high"); | ||
| // fixed.add("b_carP_t.full_purpose_HBO"); | ||
| // fixed.add("b_bike_p.age_group_agg_40_69"); | ||
| // fixed.add("b_bike_hh.income_agg_high"); | ||
| // fixed.add("g_bike_vgvi"); | ||
| // fixed.add("g_bike_stressJct"); | ||
| // fixed.add("g_bike_stressJct_f"); | ||
| // fixed.add("g_bike_stressJct_c"); | ||
| // fixed.add("g_walk_grad"); | ||
| // fixed.add("g_walk_stressLink"); | ||
| // fixed.add("g_walk_stressLink_f"); | ||
| // fixed.add("g_walk_stressJct_f"); | ||
| return fixed; | ||
| } | ||
| } |
94 changes: 94 additions & 0 deletions
94
src/main/java/estimation/specifications/manchester/NHBO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| package estimation.specifications.manchester; | ||
|
|
||
| import estimation.LogitData; | ||
| import estimation.RouteAttribute; | ||
| import org.matsim.api.core.v01.TransportMode; | ||
| import org.matsim.api.core.v01.network.Network; | ||
| import org.matsim.core.router.util.TravelTime; | ||
| import org.matsim.vehicles.Vehicle; | ||
| import org.opengis.feature.simple.SimpleFeature; | ||
| import routing.Gradient; | ||
| import routing.disutility.components.JctStress; | ||
| import routing.disutility.components.LinkAmbience; | ||
| import routing.disutility.components.LinkStress; | ||
| import trip.Trip; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class NHBO extends MNL_Manchester { | ||
|
|
||
| private final static List<String> SOCIODEMOGRAPHIC_VARIABLES = List.of( | ||
| "p.age_group_agg_5_14","p.age_group_agg_15_24","p.age_group_agg_40_69","p.age_group_agg_70", | ||
| "p.female", | ||
| "p.occupation_worker", | ||
| "hh.cars_gr_0","hh.cars_gr_23"); | ||
|
|
||
| public NHBO(LogitData data, Trip[] trips, Set<SimpleFeature> OAs, | ||
| Network netBike, Vehicle vehBike, TravelTime ttBike, | ||
| Network netWalk, Vehicle vehWalk, TravelTime ttWalk) { | ||
| super(data,trips,OAs,netBike,vehBike,ttBike,netWalk,vehWalk,ttWalk); | ||
| } | ||
|
|
||
| @Override | ||
| List<String> sociodemographicVariables() { | ||
| return SOCIODEMOGRAPHIC_VARIABLES; | ||
| } | ||
|
|
||
| List<RouteAttribute> streetEnvironmentAttributesBike() { | ||
| List<RouteAttribute> bike = new ArrayList<>(); | ||
| // bike.add(new RouteAttribute("g_bike_grad", l -> Math.max(Math.min(Gradient.getGradient(l),0.5),0.))); | ||
| // bike.add(new RouteAttribute("g_bike_vgvi", l -> Math.max(0.,0.81 - LinkAmbience.getVgviFactor(l)))); | ||
| // bike.add(new RouteAttribute("g_bike_stressLink", l -> LinkStress.getStress(l, TransportMode.bike))); | ||
| return bike; | ||
| } | ||
|
|
||
| List<RouteAttribute> streetEnvironmentAttributesWalk() { | ||
| List<RouteAttribute> walk = new ArrayList<>(); | ||
| // walk.add(new RouteAttribute("g_walk_vgvi", l -> Math.max(0.,0.81 - LinkAmbience.getVgviFactor(l)))); | ||
| // walk.add(new RouteAttribute("g_walk_stressJct", l -> JctStress.getStressProp(l,TransportMode.walk))); | ||
| walk.add(new RouteAttribute("g_walk_speed", l -> Math.min(1.,l.getFreespeed() / 22.35))); | ||
| // walk.add(new RouteAttribute("g_walk_aadt", l -> Math.min(1.,((int) l.getAttributes().getAttribute("aadt")) * 0.865/6000.))); | ||
| // walk.add(new RouteAttribute("g_walk_speed_aadt", l -> Math.min(1.,l.getFreespeed() / 22.35) * Math.min(1.,((int) l.getAttributes().getAttribute("aadt")) * 0.865/6000.))); | ||
| return walk; | ||
| } | ||
|
|
||
| @Override | ||
| protected List<String> fixed() { | ||
| List<String> fixed = coefficients().keySet().stream().filter(s -> (s.contains("carD"))).collect(Collectors.toList()); | ||
| fixed.add("b_carP_p.age_group_agg_5_14"); | ||
| fixed.add("b_carP_hh.cars_gr_0"); | ||
| fixed.add("b_bike_p.age_group_agg_5_14"); | ||
| fixed.add("b_bike_p.age_group_agg_15_24"); | ||
| fixed.add("b_bike_p.age_group_agg_40_69"); | ||
| fixed.add("b_bike_p.age_group_agg_70"); | ||
| fixed.add("b_pt_p.age_group_agg_40_69"); | ||
| fixed.add("b_pt_p.age_group_agg_70"); | ||
| // fixed.add("b_pt_p.occupation_worker"); | ||
| fixed.add("b_bike_hh.cars_gr_0"); | ||
| fixed.add("b_bike_hh.cars_gr_23"); | ||
| fixed.add("b_bike_p.female"); | ||
| fixed.add("b_bike_p.occupation_worker"); | ||
| fixed.add("b_carP_hh.cars_gr_23"); | ||
| fixed.add("b_walk_hh.cars_gr_23"); | ||
| fixed.add("b_carP_p.age_group_agg_40_69"); | ||
| fixed.add("b_carP_p.age_group_agg_70"); | ||
| // fixed.add("b_carP_t.full_purpose_HBO"); | ||
| // fixed.add("b_pt_hh.income_agg_high"); | ||
| fixed.add("b_walk_p.occupation_worker"); | ||
| fixed.add("b_walk_p.female"); | ||
| fixed.add("b_pt_p.female"); | ||
|
|
||
| // fixed.add("g_bike_vgvi"); | ||
| // fixed.add("g_bike_stressJct"); | ||
| // fixed.add("g_bike_stressJct_f"); | ||
| // fixed.add("g_bike_stressJct_c"); | ||
| // fixed.add("g_walk_grad"); | ||
| // fixed.add("g_walk_stressLink"); | ||
| // fixed.add("g_walk_stressLink_f"); | ||
| // fixed.add("g_walk_stressJct_f"); | ||
| return fixed; | ||
| } | ||
| } |
Oops, something went wrong.