commented out not compiling freight test

matsim-scenarios · Jul 8, 2023 · 52d7503 · 52d7503
1 parent b63d7d1
commit 52d7503
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 304 deletions.
diff --git a/src/main/java/org/matsim/prepare/parking/ParkingDemandPerZone.java b/src/main/java/org/matsim/prepare/parking/ParkingDemandPerZone.java
diff --git a/src/main/java/org/matsim/run/RunBerlinWithMobBudget.java b/src/main/java/org/matsim/run/RunBerlinWithMobBudget.java
@@ -45,7 +45,7 @@
 public class RunBerlinWithMobBudget {
 
     private static double dailyMobilityBudget;
-    private static double shareOfIncome;
+    private static double klimaTaler;
     private static Map<Id<Person>, Double> personsEligibleForMobilityBudget = new HashMap<>();
 
 
@@ -58,7 +58,7 @@ public static void main(String[] args) {
             };
         }
         dailyMobilityBudget = Double.parseDouble(args[0]);
-        shareOfIncome = Double.parseDouble(args[1]);
+        klimaTaler = Double.parseDouble(args[1]);
 
         String[] configArgs = new String[args.length - 2];
         for (int i = 2; i <= args.length - 1; i++) {

diff --git a/src/main/java/org/matsim/run/wasteCollection/Run_Abfall.java b/src/main/java/org/matsim/run/wasteCollection/Run_Abfall.java
@@ -1,3 +1,4 @@
+/*
 package org.matsim.run.wasteCollection;
 
 import java.util.Arrays;
@@ -30,6 +31,8 @@
  *         Abfallwirtschaft am Beispiel Berlins
  *
  */
+
+/*
 public class Run_Abfall {
 
 	static final Logger log = LogManager.getLogger(Run_Abfall.class);
@@ -66,7 +69,7 @@ public static void main(String[] args) throws Exception {
 		 * network, you have to select one of the Berlin cases. The beginning of the
 		 * name of the scenario shows you the needed network.
 		 */
-
+/*
 		netzwerkAuswahl netzwerkWahl = netzwerkAuswahl.berlinNetwork;
 		scenarioAuswahl scenarioWahl = null;
 		carrierChoice chosenCarrier = null;
@@ -224,6 +227,8 @@ public static void main(String[] args) throws Exception {
 		 * so that you can already have this information, while jsprit and matsim are
 		 * still running.
 		 */
+
+/*
 		AbfallUtils.outputSummaryShipments(scenario, day, carrierMap);
 		// jsprit
 
@@ -244,3 +249,4 @@ public static void main(String[] args) throws Exception {
 		AbfallUtils.createResultFile(scenario, carriers);
 	}
 }
+*/
diff --git a/src/test/java/org/matsim/run/wasteCollection/AbfallUtilsTest.java b/src/test/java/org/matsim/run/wasteCollection/AbfallUtilsTest.java
@@ -16,6 +16,8 @@
  *   See also COPYING, LICENSE and WARRANTY file                           *
  *                                                                         *
  * *********************************************************************** */
+/*
+
 package org.matsim.run.wasteCollection;
 
 import java.util.Collection;
@@ -42,6 +44,7 @@
  * @author nagel
  *
  */
+/*
 public class AbfallUtilsTest {
 
 	@Rule
@@ -157,3 +160,4 @@ public final void testShapeFile() {
 		Assert.assertEquals(96, districtsWithGarbage.size());
 	}
 }
+*/