fix ttb test

msmobility · Mar 23, 2021 · 503687a · 503687a
1 parent 181b582
commit 503687a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/de/tum/bgu/msm/modules/travelTimeBudget/TravelTimeBudgetModule.java b/src/main/java/de/tum/bgu/msm/modules/travelTimeBudget/TravelTimeBudgetModule.java
@@ -45,8 +45,8 @@ private void calculateTravelTimeBudgets() {
             if (Purpose.getDiscretionaryPurposes().contains(purpose)){
                 results.add(service.submit(new DiscretionaryBudgetCalculator(purpose, dataSet.getHouseholds().values())));
             } else if (Purpose.getMandatoryPurposes().contains(purpose)){
-                results.add(service.submit(new MandatoryBudgetCalculator(dataSet.getHouseholds().values(), Purpose.HBW, dataSet.getTravelTimes(), dataSet.getPeakHour())));
-                results.add(service.submit((new MandatoryBudgetCalculator(dataSet.getHouseholds().values(), Purpose.HBE, dataSet.getTravelTimes(), dataSet.getPeakHour()))));
+                results.add(service.submit(new MandatoryBudgetCalculator(dataSet.getHouseholds().values(), purpose, dataSet.getTravelTimes(), dataSet.getPeakHour())));
+                //results.add(service.submit((new MandatoryBudgetCalculator(dataSet.getHouseholds().values(), Purpose.HBE, dataSet.getTravelTimes(), dataSet.getPeakHour()))));
             }
         }
         service.shutdown();
@@ -68,12 +68,6 @@ private void calculateTravelTimeBudgets() {
 
     public void adjustDiscretionaryPurposeBudgets() {
 
-        for (Purpose purpose : purposes){
-            if (Purpose.getMandatoryPurposes().contains(purpose)){
-                throw new RuntimeException("This method is not applicable if mandatory purposes are being processed");
-            }
-        }
-
         for (MitoHousehold household : dataSet.getHouseholds().values()) {
             try {
                 double totalTravelTimeBudget = travelTimeCalc.calculateBudget(household, "Total");
@@ -83,15 +77,20 @@ public void adjustDiscretionaryPurposeBudgets() {
 
                 double calcDiscretionaryTTB = 0;
                 for (Purpose purpose : purposes) {
-                    calcDiscretionaryTTB += household.getTravelTimeBudgetForPurpose(purpose);
+                    if (Purpose.getDiscretionaryPurposes().contains(purpose)) {
+                        calcDiscretionaryTTB += household.getTravelTimeBudgetForPurpose(purpose);
+                    }
                 }
                 for (Purpose purpose : purposes) {
-                    double budget = household.getTravelTimeBudgetForPurpose(purpose);
-                    if (budget != 0) {
-                        budget = budget * discretionaryTTB / calcDiscretionaryTTB;
-                        household.setTravelTimeBudgetByPurpose(purpose, budget);
+                    if (Purpose.getDiscretionaryPurposes().contains(purpose)) {
+                        double budget = household.getTravelTimeBudgetForPurpose(purpose);
+                        if (budget != 0) {
+                            budget = budget * discretionaryTTB / calcDiscretionaryTTB;
+                            household.setTravelTimeBudgetByPurpose(purpose, budget);
+                        }
                     }
                 }
+
             } catch (NullPointerException e) {
                 System.out.println("upps");
             }

diff --git a/src/test/java/de/tum/bgu/msm/modules/travelTimeBudget/TravelTimeBudgetModuleTest.java b/src/test/java/de/tum/bgu/msm/modules/travelTimeBudget/TravelTimeBudgetModuleTest.java
@@ -61,6 +61,7 @@ public TravelTimes duplicate() {
 
         TravelTimeBudgetModule travelTimeBudget = new TravelTimeBudgetModule(dataSet, Purpose.getAllPurposes());
         travelTimeBudget.run();
+        travelTimeBudget.adjustDiscretionaryPurposeBudgets();
     }
 
     @Test
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,7 @@ public TravelTimes duplicate() { @@
             TravelTimeBudgetModule travelTimeBudget = new TravelTimeBudgetModule(dataSet, Purpose.getAllPurposes());
             travelTimeBudget.run();
+            travelTimeBudget.adjustDiscretionaryPurposeBudgets();
         }
         @Test
@@ Expand Down @@