package structure + debug dashboard color ramps

src/main/java/org/matsim/analysis/postAnalysis/EmissionsPostProcessingAverageAnalysis.java → src/main/java/org/matsim/analysis/postAnalysis/emissions/EmissionsPostProcessingAverageAnalysis.java

@@ -1,4 +1,4 @@
-package org.matsim.analysis.postAnalysis;
+package org.matsim.analysis.postAnalysis.emissions;
 
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;

src/main/java/org/matsim/analysis/emissions/KelheimOfflineAirPollutionAnalysisByEngineInformation.java → src/main/java/org/matsim/analysis/postAnalysis/emissions/KelheimOfflineAirPollutionAnalysisByEngineInformation.java

@@ -18,7 +18,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.analysis.emissions;
+package org.matsim.analysis.postAnalysis.emissions;
 
 import it.unimi.dsi.fastutil.objects.Object2DoubleLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;

src/main/java/org/matsim/dashboard/AverageKelheimEmissionsDashboard.java

@@ -20,7 +20,7 @@
 
 package org.matsim.dashboard;
 
-import org.matsim.analysis.postAnalysis.EmissionsPostProcessingAverageAnalysis;
+import org.matsim.analysis.postAnalysis.emissions.EmissionsPostProcessingAverageAnalysis;
 import org.matsim.simwrapper.Dashboard;
 import org.matsim.simwrapper.Data;
 import org.matsim.simwrapper.Header;
@@ -33,6 +33,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.matsim.dashboard.AverageKelheimNoiseDashboard.*;
+
 /**
  * Average emissions dashboard for several runs with the same config but a different random seed.
  */
@@ -105,13 +107,15 @@ public void configure(Header header, Layout layout) {
 			viz.title = "CO₂ Emissions";
 			viz.description = "per day. Be aware that CO2 values are provided in the simulation sample size!";
 			viz.projection = "EPSG:25832";
+			viz.setColorRamp(new double[]{30, 40, 50, 60, 70}, new String[]{DARK_BLUE, LIGHT_BLUE, YELLOW, SAND, ORANGE, RED});
 			viz.height = 12.0;
 			viz.file = postProcess(data, "mean_emissions_grid_per_day.xyt.csv");
 		});
 		layout.row("third")
 			.el(GridMap.class, (viz, data) -> {
 				viz.title = "CO₂ Emissions";
 				viz.projection = "EPSG:25832";
+				viz.setColorRamp(new double[]{30, 40, 50, 60, 70}, new String[]{DARK_BLUE, LIGHT_BLUE, YELLOW, SAND, ORANGE, RED});
 				viz.description = "per hour. Be aware that CO2 values are provided in the simulation sample size!";
 				viz.height = 12.;
 				viz.file = postProcess(data, "mean_emissions_grid_per_hour.csv");

src/main/java/org/matsim/dashboard/AverageKelheimNoiseDashboard.java

@@ -23,12 +23,12 @@ public class AverageKelheimNoiseDashboard implements Dashboard {
 	private final List<String> dirs;
 	private final Integer noRuns;
 	private static final String NOISE = "noise";
-	private static final String DARK_BLUE = "#1175b3";
-	private static final String LIGHT_BLUE = "#95c7df";
-	private static final String ORANGE = "#f4a986";
-	private static final String RED = "#cc0c27";
-	private static final String SAND = "#dfb095";
-	private static final String YELLOW = "#dfdb95";
+	static final String DARK_BLUE = "#1175b3";
+	static final String LIGHT_BLUE = "#95c7df";
+	static final String ORANGE = "#f4a986";
+	static final String RED = "#cc0c27";
+	static final String SAND = "#dfb095";
+	static final String YELLOW = "#dfdb95";
 
 	public AverageKelheimNoiseDashboard(List<String> dirs, Integer noRuns) {
 		this.dirs = dirs;

src/main/java/org/matsim/dashboard/KelheimDashboardProvider.java

@@ -1,6 +1,5 @@
 package org.matsim.dashboard;
 
-import org.matsim.analysis.emissions.KelheimEmissionsDashboard;
 import org.matsim.core.config.Config;
 import org.matsim.core.utils.io.IOUtils;
 import org.matsim.simwrapper.Dashboard;

src/main/java/org/matsim/analysis/emissions/KelheimEmissionsDashboard.java → src/main/java/org/matsim/dashboard/KelheimEmissionsDashboard.java

@@ -18,8 +18,9 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.analysis.emissions;
+package org.matsim.dashboard;
 
+import org.matsim.analysis.postAnalysis.emissions.KelheimOfflineAirPollutionAnalysisByEngineInformation;
 import org.matsim.application.prepare.network.CreateGeoJsonNetwork;
 import org.matsim.simwrapper.Dashboard;
 import org.matsim.simwrapper.Header;
@@ -28,6 +29,9 @@
 import org.matsim.simwrapper.viz.Links;
 import org.matsim.simwrapper.viz.Table;
 
+import static org.matsim.dashboard.AverageKelheimNoiseDashboard.*;
+import static org.matsim.dashboard.AverageKelheimNoiseDashboard.RED;
+
 /**
  * this is basically equivalent to the standard emissions dashboard
  * but calls the matsim-kelheim-specific emissions analysis class
@@ -93,13 +97,16 @@ public void configure(Header header, Layout layout) {
 			viz.description = "per day. Be aware that CO2 values are provided in the simulation sample size!";
 			viz.height = 12.0;
 			viz.file = data.compute(KelheimOfflineAirPollutionAnalysisByEngineInformation.class, "emissions_grid_per_day.xyt.csv", new String[0]);
+			viz.setColorRamp(new double[]{30, 40, 50, 60, 70}, new String[]{DARK_BLUE, LIGHT_BLUE, YELLOW, SAND, ORANGE, RED});
+
 		});
 		layout.row("third")
 			.el(GridMap.class, (viz, data) -> {
 				viz.title = "CO₂ Emissions";
 				viz.description = "per hour. Be aware that CO2 values are provided in the simulation sample size!";
 				viz.height = 12.;
 				viz.file = data.compute(KelheimOfflineAirPollutionAnalysisByEngineInformation.class, "emissions_grid_per_hour.csv");
+				viz.setColorRamp(new double[]{30, 40, 50, 60, 70}, new String[]{DARK_BLUE, LIGHT_BLUE, YELLOW, SAND, ORANGE, RED});
 			});
 	}
 }

src/main/java/org/matsim/dashboard/KelheimSimWrapperRunner.java

@@ -22,7 +22,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.matsim.analysis.emissions.KelheimEmissionsDashboard;
 import org.matsim.application.ApplicationUtils;
 import org.matsim.application.MATSimAppCommand;
 import org.matsim.application.options.ShpOptions;