To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 24935997 authored by clivings's avatar clivings
Browse files

Merge remote-tracking branch 'origin/master' into sensitivity_clarissa

parents 57181178 92dfad9b
......@@ -152,7 +152,7 @@ public class FlowListener implements LinkEnterEventHandler {
item.privateVehicles++;
}
item.pcus += flowEfficiencyCalculator.calculateFlowEfficiency(vehicle, link);
item.pcus += 1.0 / flowEfficiencyCalculator.calculateFlowEfficiency(vehicle, link);
}
@Override
......
......@@ -30,9 +30,9 @@ import com.vividsolutions.jts.geom.Coordinate;
import ch.ethz.matsim.baseline_scenario.config.CommandLine;
import ch.ethz.matsim.baseline_scenario.config.CommandLine.ConfigurationException;
import ch.ethz.matsim.projects.astra_2018_002.analysis.flow.FlowListener.CountItem;
import ch.ethz.matsim.projects.astra_2018_002.flow_efficiency.AvFlowEfficiencyCalculator;
import ch.ethz.matsim.projects.astra_2018_002.flow_efficiency.FlowEfficiencyCalculator;
import ch.ethz.matsim.projects.astra_2018_002.flow_efficiency.FlowEfficiencyConfigurator;
import ch.ethz.matsim.projects.astra_2018_002.flow_efficiency.StaticFlowEfficiencyCalculator;
public class RunFlowAnalysis {
static public void main(String[] args) throws ConfigurationException, IOException {
......@@ -46,7 +46,7 @@ public class RunFlowAnalysis {
new MatsimNetworkReader(scenario.getNetwork()).readFile(cmd.getOptionStrict("network-path"));
FlowEfficiencyConfigurator.defineVehicleTypes(scenario);
FlowEfficiencyCalculator flowEfficiencyCalculator = new StaticFlowEfficiencyCalculator();
FlowEfficiencyCalculator flowEfficiencyCalculator = new AvFlowEfficiencyCalculator();
double startTime = cmd.getOption("start-time").map(Time::parseTime).orElse(5.0 * 3600);
double endTime = cmd.getOption("end-time").map(Time::parseTime).orElse(22.0 * 3600);
......@@ -104,28 +104,28 @@ public class RunFlowAnalysis {
.addAttribute("lanes", Double.class) //
.addAttribute("osm_type", String.class) //
//
.addAttribute("day_private", Integer.class) //
.addAttribute("day_pooled", Integer.class) //
.addAttribute("day_priv", Integer.class) //
.addAttribute("day_pool", Integer.class) //
.addAttribute("day_taxi", Integer.class) //
.addAttribute("day_conventional", Integer.class) //
.addAttribute("day_conv", Integer.class) //
.addAttribute("day_level5", Integer.class) //
.addAttribute("day_level4", Integer.class) //
.addAttribute("day_level3", Integer.class) //
.addAttribute("day_pcu", Double.class) //
//
.addAttribute("am_private", Integer.class) //
.addAttribute("am_pooled", Integer.class) //
.addAttribute("am_priv", Integer.class) //
.addAttribute("am_pool", Integer.class) //
.addAttribute("am_taxi", Integer.class) //
.addAttribute("am_conventional", Integer.class) //
.addAttribute("am_conv", Integer.class) //
.addAttribute("am_level5", Integer.class) //
.addAttribute("am_level4", Integer.class) //
.addAttribute("am_level3", Integer.class) //
.addAttribute("am_pcu", Double.class) //
//
.addAttribute("pm_private", Integer.class) //
.addAttribute("pm_pooled", Integer.class) //
.addAttribute("pm_priv", Integer.class) //
.addAttribute("pm_pool", Integer.class) //
.addAttribute("pm_taxi", Integer.class) //
.addAttribute("pm_conventional", Integer.class) //
.addAttribute("pm_conv", Integer.class) //
.addAttribute("pm_level5", Integer.class) //
.addAttribute("pm_level4", Integer.class) //
.addAttribute("pm_level3", Integer.class) //
......
Markdown is supported
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