Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix glob patterns in dashboards for runs without run id #3515

Merged
merged 3 commits into from
Oct 15, 2024
+9 −9
Merged

fix glob patterns in dashboards for runs without run id #3515

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
241f2f0
fix patterns for runs without run ids
rakow Oct 15, 2024
b6eb15e
better error message
rakow Oct 15, 2024
0b9787e
Merge branch 'master' into fix-glob-pattern
rakow Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Loading
Loading status checks…
fix patterns for runs without run ids
@rakow
rakow committed Oct 15, 2024
commit 241f2f016cdc309c5fa2a35dd6314dc281cd23a9
2 changes: 1 addition & 1 deletion contribs/application/src/main/java/org/matsim/application/ApplicationUtils.java
View file
Original file line number Diff line number Diff line change
@@ -446,7 +446,7 @@ public static Path matchInput(String name, Path dir) {
return path.get();

// Even more permissive pattern
path = matchPattern(".+\\.[a-zA-Z0-9_.\\-]*(_|\\.)" + name + "\\..+", dir);
path = matchPattern(".+[a-zA-Z0-9_.\\-]*(_|\\.)" + name + ".+", dir);
if (path.isPresent())
return path.get();

8 changes: 4 additions & 4 deletions contribs/simwrapper/src/main/java/org/matsim/simwrapper/dashboard/OverviewDashboard.java
View file
Original file line number Diff line number Diff line change
@@ -58,15 +58,15 @@ public void configure(Header header, Layout layout) {
});

layout.row("config").el(XML.class, (viz, data) -> {
viz.file = data.output("*.output_config.xml");
viz.file = data.output("(*.)?output_config.xml");
viz.height = 6d;
viz.width = 2d;
viz.unfoldLevel = 1;

}).el(PieChart.class, (viz, data) -> {
viz.title = "Mode Share";
viz.description = "at final Iteration";
viz.dataset = data.output("*.modestats.csv");
viz.dataset = data.output("(*.)?modestats.csv");
viz.ignoreColumns = List.of("iteration");
viz.useLastRow = true;
});
@@ -75,7 +75,7 @@ public void configure(Header header, Layout layout) {
layout.row("second").el(Line.class, (viz, data) -> {

viz.title = "Score";
viz.dataset = data.output("*.scorestats.csv");
viz.dataset = data.output("(*.)?scorestats.csv");
viz.description = "per Iteration";
viz.x = "iteration";
viz.columns = List.of("avg_executed", "avg_worst", "avg_best");
@@ -88,7 +88,7 @@ public void configure(Header header, Layout layout) {
.el(Area.class, (viz, data) -> {
viz.title = "Mode Share Progression";
viz.description = "per Iteration";
viz.dataset = data.output("*.modestats.csv");
viz.dataset = data.output("(*.)?modestats.csv");
viz.x = "iteration";
viz.xAxisName = "Iteration";
viz.yAxisName = "Share";
6 changes: 3 additions & 3 deletions ...ribs/simwrapper/src/main/java/org/matsim/simwrapper/dashboard/PublicTransitDashboard.java
View file
Original file line number Diff line number Diff line change
@@ -28,14 +28,14 @@ public void configure(Header header, Layout layout) {

header.title = "Public Transit";
header.tab = "PT";
header.triggerPattern = "*output_transitSchedule*xml*";
header.triggerPattern = "(*.)?output_transitSchedule*xml*";

layout.row("viewer").el(TransitViewer.class, (viz, data) -> {
viz.title = "Transit Viewer";
viz.height = 12d;
viz.description = "Visualize the transit schedule.";
viz.network = "*output_network.xml.gz";
viz.transitSchedule = data.output("*output_transitSchedule.xml.gz");
viz.network = "(*.)?output_network.xml.gz";
viz.transitSchedule = data.output("(*.)?output_transitSchedule.xml.gz");

if (!customRouteTypes.isEmpty())
viz.customRouteTypes = customRouteTypes;