try to satisfy checkstyle AND sonarcloud

matsim-scenarios · Sep 30, 2024 · 15de3e1 · 15de3e1
1 parent 12642b2
commit 15de3e1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 34 deletions.
diff --git a/...nalysis/postAnalysis/emissions/KelheimOfflineAirPollutionAnalysisByEngineInformation.java b/...nalysis/postAnalysis/emissions/KelheimOfflineAirPollutionAnalysisByEngineInformation.java
@@ -109,10 +109,17 @@ public class KelheimOfflineAirPollutionAnalysisByEngineInformation implements MA
 	@CommandLine.Option(names = "--grid-size", description = "Grid size in meter", defaultValue = "250")
 	private double gridSize;
 
+	private final NumberFormat numberFormat;
 
 	//dump out all pollutants. to include only a subset of pollutants, adjust!
 	static List<Pollutant> pollutants2Output = Arrays.asList(Pollutant.values());
 
+	KelheimOfflineAirPollutionAnalysisByEngineInformation(){
+		numberFormat = NumberFormat.getInstance(Locale.US);
+		numberFormat.setMaximumFractionDigits(4);
+		numberFormat.setGroupingUsed(false);
+	}
+
 	@Override
 	public Integer call() throws Exception {
 
@@ -140,7 +147,6 @@ private void process(Config config, Scenario scenario) throws IOException {
 		// the following is copied from the example and supplemented...
 		//------------------------------------------------------------------------------
 
-
 		NetworkUtils.writeNetwork(scenario.getNetwork(), output.getPath( "emissionNetwork.xml.gz").toString());
 
 		final String eventsFile = input.getEventsPath();
@@ -301,10 +307,6 @@ private void writeLinkOutput(String linkEmissionAnalysisFile, String linkEmissio
 
 		log.info("Writing output...");
 
-		NumberFormat nf = NumberFormat.getInstance(Locale.US);
-		nf.setMaximumFractionDigits(4);
-		nf.setGroupingUsed(false);
-
 		{
 			//dump link-based output files
 			File absolutFile = new File(linkEmissionAnalysisFile);
@@ -340,14 +342,14 @@ private void writeLinkOutput(String linkEmissionAnalysisFile, String linkEmissio
 					if (link2pollutants.get(linkId).get(pollutant) != null) {
 						emissionValue = link2pollutants.get(linkId).get(pollutant);
 					}
-					absolutWriter.write(";" + nf.format(emissionValue));
+					absolutWriter.write(";" + numberFormat.format(emissionValue));
 
 					double emissionPerM = Double.NaN;
 					Link link = network.getLinks().get(linkId);
 					if (link != null) {
 						emissionPerM = emissionValue / link.getLength();
 					}
-					perMeterWriter.write(";" + nf.format(emissionPerM));
+					perMeterWriter.write(";" + numberFormat.format(emissionPerM));
 
 				}
 				absolutWriter.newLine();
@@ -435,18 +437,7 @@ private void writeRaster(Network fullNetwork, Network filteredNetwork, Config co
 		try (CSVPrinter printer = new CSVPrinter(Files.newBufferedWriter(output.getPath("emissions_grid_per_day.xyt.csv")),
 			CSVFormat.DEFAULT.builder().setCommentMarker('#').build())) {
 
-			NumberFormat nf = NumberFormat.getInstance(Locale.US);
-			nf.setMaximumFractionDigits(4);
-			nf.setGroupingUsed(false);
-
-			String crs = ProjectionUtils.getCRS(fullNetwork);
-			if (crs == null)
-				crs = config.network().getInputCRS();
-			if (crs == null)
-				crs = config.global().getCoordinateSystem();
-
-			// print coordinate system
-//			printer.printComment(crs);
+//			printCrsComment(fullNetwork, config, printer);
 
 			// print header
 			printer.print("time");
@@ -480,7 +471,7 @@ private void writeRaster(Network fullNetwork, Network filteredNetwork, Config co
 					printer.print(coord.getY());
 
 					double value = rasterMap.get(Pollutant.CO2_TOTAL).getValueByIndex(xi, yi);
-					printer.print(nf.format(value));
+					printer.print(numberFormat.format(value));
 
 					printer.println();
 				}
@@ -517,18 +508,7 @@ private void writeTimeDependentRaster(Network fullNetwork, Network filteredNetwo
 		try (CSVPrinter printer = new CSVPrinter(IOUtils.getBufferedWriter(output.getPath("emissions_grid_per_hour.csv").toString()),
 			CSVFormat.DEFAULT.builder().setCommentMarker('#').build())) {
 
-			NumberFormat nf = NumberFormat.getInstance(Locale.US);
-			nf.setMaximumFractionDigits(4);
-			nf.setGroupingUsed(false);
-
-			String crs = ProjectionUtils.getCRS(fullNetwork);
-			if (crs == null)
-				crs = config.network().getInputCRS();
-			if (crs == null)
-				crs = config.global().getCoordinateSystem();
-
-//			 print coordinate system
-//			printer.printComment(crs);
+//			printCrsComment(fullNetwork, config, printer);
 
 			// print header
 			printer.print("time");
@@ -566,7 +546,7 @@ private void writeTimeDependentRaster(Network fullNetwork, Network filteredNetwo
 						printer.print(coord.getX());
 						printer.print(coord.getY());
 
-						printer.print(nf.format(value));
+						printer.print(numberFormat.format(value));
 
 						printer.println();
 					}
@@ -579,4 +559,15 @@ private void writeTimeDependentRaster(Network fullNetwork, Network filteredNetwo
 
 	}
 
+	private static void printCrsComment(Network fullNetwork, Config config, CSVPrinter printer) throws IOException {
+		String crs = ProjectionUtils.getCRS(fullNetwork);
+		if (crs == null)
+			crs = config.network().getInputCRS();
+		if (crs == null)
+			crs = config.global().getCoordinateSystem();
+
+			//print coordinate system
+			printer.printComment(crs);
+	}
+
 }
diff --git a/src/main/java/org/matsim/dashboard/KelheimEmissionsDashboard.java b/src/main/java/org/matsim/dashboard/KelheimEmissionsDashboard.java
@@ -23,7 +23,6 @@
 import org.matsim.analysis.postAnalysis.emissions.KelheimOfflineAirPollutionAnalysisByEngineInformation;
 import org.matsim.application.prepare.network.CreateGeoJsonNetwork;
 import org.matsim.simwrapper.Dashboard;
-import org.matsim.simwrapper.Data;
 import org.matsim.simwrapper.Header;
 import org.matsim.simwrapper.Layout;
 import org.matsim.simwrapper.viz.GridMap;