Skip to content

Commit 47f8562

Browse files
tschlenthertschlenther
committed
reduce duplication
1 parent 82cad54 commit 47f8562

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

‎src/main/java/org/matsim/analysis/emissions/KelheimEmissionsDashboard.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void configure(Header header, Layout layout) {
5858

5959
String linkDescription = "Displays the emissions for each link per meter. Be aware that emission values are provided in the simulation sample size!";
6060
if (pathToCsvBase != null){
61-
linkDescription += String.format("\n Base is %s", pathToCsvBase);
61+
linkDescription += String.format("%n Base is %s", pathToCsvBase);
6262
}
6363
String finalLinkDescription = linkDescription;
6464

‎src/main/java/org/matsim/dashboard/AverageDrtDashboard.java

-20
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,18 @@ public void configure(Header header, Layout layout) {
4343
layout.row("one")
4444
.el(Table.class, (viz, data) -> {
4545
viz.title = "Rides per vehicle";
46-
viz.description = "Final demand statistics and KPI.";
4746
viz.dataset = postProcess(data, "rides_per_veh_avg_demand_stats.csv");
4847
viz.showAllRows = true;
4948
viz.width = 1.;
5049
})
5150
.el(Table.class, (viz, data) -> {
5251
viz.title = "Avg wait time";
53-
viz.description = "Final demand statistics and KPI.";
5452
viz.dataset = postProcess(data, "avg_wait_time_avg_demand_stats.csv");
5553
viz.showAllRows = true;
5654
viz.width = 1.;
5755
})
5856
.el(Table.class, (viz, data) -> {
5957
viz.title = "Requests";
60-
viz.description = "Final demand statistics and KPI.";
6158
viz.dataset = postProcess(data, "requests_avg_demand_stats.csv");
6259
viz.showAllRows = true;
6360
viz.width = 1.;
@@ -66,21 +63,18 @@ public void configure(Header header, Layout layout) {
6663
layout.row("two")
6764
.el(Table.class, (viz, data) -> {
6865
viz.title = "Avg total travel time";
69-
viz.description = "Final demand statistics and KPI.";
7066
viz.dataset = postProcess(data, "avg_total_travel_time_avg_demand_stats.csv");
7167
viz.showAllRows = true;
7268
viz.width = 1.;
7369
})
7470
.el(Table.class, (viz, data) -> {
7571
viz.title = "Rides";
76-
viz.description = "Final demand statistics and KPI.";
7772
viz.dataset = postProcess(data, "rides_avg_demand_stats.csv");
7873
viz.showAllRows = true;
7974
viz.width = 1.;
8075
})
8176
.el(Table.class, (viz, data) -> {
8277
viz.title = "Avg direct distance [km]";
83-
viz.description = "Final demand statistics and KPI.";
8478
viz.dataset = postProcess(data, "avg_direct_distance_[km]_avg_demand_stats.csv");
8579
viz.showAllRows = true;
8680
viz.width = 1.;
@@ -89,21 +83,18 @@ public void configure(Header header, Layout layout) {
8983
layout.row("three")
9084
.el(Table.class, (viz, data) -> {
9185
viz.title = "Rejections";
92-
viz.description = "Final demand statistics and KPI.";
9386
viz.dataset = postProcess(data, "rejections_avg_demand_stats.csv");
9487
viz.showAllRows = true;
9588
viz.width = 1.;
9689
})
9790
.el(Table.class, (viz, data) -> {
9891
viz.title = "95th percentile wait time";
99-
viz.description = "Final demand statistics and KPI.";
10092
viz.dataset = postProcess(data, "95th_percentile_wait_time_avg_demand_stats.csv");
10193
viz.showAllRows = true;
10294
viz.width = 1.;
10395
})
10496
.el(Table.class, (viz, data) -> {
10597
viz.title = "Avg in-vehicle time";
106-
viz.description = "Final demand statistics and KPI.";
10798
viz.dataset = postProcess(data, "avg_in-vehicle_time_avg_demand_stats.csv");
10899
viz.showAllRows = true;
109100
viz.width = 1.;
@@ -112,21 +103,18 @@ public void configure(Header header, Layout layout) {
112103
layout.row("four")
113104
.el(Table.class, (viz, data) -> {
114105
viz.title = "Avg ride distance [km]";
115-
viz.description = "Final demand statistics and KPI.";
116106
viz.dataset = postProcess(data, "avg_ride_distance_[km]_avg_demand_stats.csv");
117107
viz.showAllRows = true;
118108
viz.width = 1.;
119109
})
120110
.el(Table.class, (viz, data) -> {
121111
viz.title = "Rejection rate";
122-
viz.description = "Final demand statistics and KPI.";
123112
viz.dataset = postProcess(data, "rejection_rate_avg_demand_stats.csv");
124113
viz.showAllRows = true;
125114
viz.width = 1.;
126115
})
127116
.el(Table.class, (viz, data) -> {
128117
viz.title = "Avg fare [MoneyUnit]";
129-
viz.description = "Final demand statistics and KPI.";
130118
viz.dataset = postProcess(data, "avg_fare_[MoneyUnit]_avg_demand_stats.csv");
131119
viz.showAllRows = true;
132120
viz.width = 1.;
@@ -140,21 +128,18 @@ private void supplyTabs(Layout layout) {
140128
layout.row("six")
141129
.el(Table.class, (viz, data) -> {
142130
viz.title = "Total service hours";
143-
viz.description = "Final configuration and service KPI.";
144131
viz.dataset = postProcess(data, "total_service_hours_avg_supply_stats.csv");
145132
viz.showAllRows = true;
146133
viz.width = 1.;
147134
})
148135
.el(Table.class, (viz, data) -> {
149136
viz.title = "Pooling ratio";
150-
viz.description = "Final configuration and service KPI.";
151137
viz.dataset = postProcess(data, "pooling_ratio_avg_supply_stats.csv");
152138
viz.showAllRows = true;
153139
viz.width = 1.;
154140
})
155141
.el(Table.class, (viz, data) -> {
156142
viz.title = "Detour ratio";
157-
viz.description = "Final configuration and service KPI.";
158143
viz.dataset = postProcess(data, "detour_ratio_avg_supply_stats.csv");
159144
viz.showAllRows = true;
160145
viz.width = 1.;
@@ -163,21 +148,18 @@ private void supplyTabs(Layout layout) {
163148
layout.row("seven")
164149
.el(Table.class, (viz, data) -> {
165150
viz.title = "Total vehicle mileage [km]";
166-
viz.description = "Final configuration and service KPI.";
167151
viz.dataset = postProcess(data, "total_vehicle_mileage_[km]_avg_supply_stats.csv");
168152
viz.showAllRows = true;
169153
viz.width = 1.;
170154
})
171155
.el(Table.class, (viz, data) -> {
172156
viz.title = "Empty ratio";
173-
viz.description = "Final configuration and service KPI.";
174157
viz.dataset = postProcess(data, "empty_ratio_avg_supply_stats.csv");
175158
viz.showAllRows = true;
176159
viz.width = 1.;
177160
})
178161
.el(Table.class, (viz, data) -> {
179162
viz.title = "Number of stops";
180-
viz.description = "Final configuration and service KPI.";
181163
viz.dataset = postProcess(data, "number_of_stops_avg_supply_stats.csv");
182164
viz.showAllRows = true;
183165
viz.width = 1.;
@@ -186,14 +168,12 @@ private void supplyTabs(Layout layout) {
186168
layout.row("eight")
187169
.el(Table.class, (viz, data) -> {
188170
viz.title = "Total pax distance [km]";
189-
viz.description = "Final configuration and service KPI.";
190171
viz.dataset = postProcess(data, "total_pax_distance_[km]_avg_supply_stats.csv");
191172
viz.showAllRows = true;
192173
viz.width = 1.;
193174
})
194175
.el(Table.class, (viz, data) -> {
195176
viz.title = "Vehicles";
196-
viz.description = "Final configuration and service KPI.";
197177
viz.dataset = postProcess(data, "vehicles_avg_supply_stats.csv");
198178
viz.showAllRows = true;
199179
viz.width = 1.;

0 commit comments

Comments
 (0)