refactor: rename package mcmin to mcmax

entur · Jun 19, 2024 · 78c4a17 · 78c4a17
1 parent 960f243
commit 78c4a17
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 20 deletions.
diff --git a/...lterchain/filters/system/mcmin/Group.java → ...lterchain/filters/system/mcmax/Group.java b/...lterchain/filters/system/mcmin/Group.java → ...lterchain/filters/system/mcmax/Group.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin;
+package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -25,7 +25,6 @@ boolean isEmpty() {
     return items.isEmpty();
   }
 
-
   boolean isSingleItemGroup() {
     return items.size() == 1;
   }

diff --git a/...ilterchain/filters/system/mcmin/Item.java → ...ilterchain/filters/system/mcmax/Item.java b/...ilterchain/filters/system/mcmin/Item.java → ...ilterchain/filters/system/mcmax/Item.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin;
+package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax;
 
 import org.opentripplanner.model.plan.Itinerary;
 

diff --git a/...mcmin/McMinimumNumberItineraryFilter.java → ...mcmax/McMinimumNumberItineraryFilter.java b/...mcmin/McMinimumNumberItineraryFilter.java → ...mcmax/McMinimumNumberItineraryFilter.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin;
+package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax;
 
 import java.util.List;
 import java.util.function.Predicate;

diff --git a/...lterchain/filters/system/mcmin/State.java → ...lterchain/filters/system/mcmax/State.java b/...lterchain/filters/system/mcmin/State.java → ...lterchain/filters/system/mcmax/State.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin;
+package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -12,6 +12,7 @@
  * simple bookkeeping for the state of the filter.
  */
 class State {
+
   private final List<Item> items;
   private final List<Group> groups;
   private final List<Item> result = new ArrayList<>();
@@ -86,7 +87,6 @@ private void removeGroupsWitchContainsItem(Item item) {
     groups.removeIf(Group::isEmpty);
   }
 
-
   /**
    * The best item is the one witch exists in most groups, and in case of a tie, the sort order/
    * itinerary index is used.
@@ -108,7 +108,12 @@ private static Item findBestItem(List<Group> groups) {
    */
   @Nullable
   private static Item findItemInFirstSingleItemGroup(List<Group> groups) {
-    return groups.stream().filter(Group::isSingleItemGroup).findFirst().map(Group::first).orElse(null);
+    return groups
+      .stream()
+      .filter(Group::isSingleItemGroup)
+      .findFirst()
+      .map(Group::first)
+      .orElse(null);
   }
 
   private static ArrayList<Item> createListOfItems(List<Itinerary> itineraries) {
@@ -119,7 +124,10 @@ private static ArrayList<Item> createListOfItems(List<Itinerary> itineraries) {
     return items;
   }
 
-  private static List<Group> createGroups(Collection<Item> items, List<SingeCriteriaComparator> comparators) {
+  private static List<Group> createGroups(
+    Collection<Item> items,
+    List<SingeCriteriaComparator> comparators
+  ) {
     List<Group> groups = new ArrayList<>();
     for (SingeCriteriaComparator comparator : comparators) {
       if (comparator.strictOrder()) {
@@ -135,7 +143,10 @@ private static List<Group> createGroups(Collection<Item> items, List<SingeCriter
    * In a strict ordered group only one optimal value exist for the criteria defined by the given
    * {@code comparator}. All items that have this value should be included in the group created.
    */
-  private static Group createOrderedGroup(Collection<Item> items, SingeCriteriaComparator comparator) {
+  private static Group createOrderedGroup(
+    Collection<Item> items,
+    SingeCriteriaComparator comparator
+  ) {
     Group group = null;
     for (Item item : items) {
       if (group == null) {

diff --git a/...rchain/filters/system/mcmin/ItemTest.java → ...rchain/filters/system/mcmax/ItemTest.java b/...rchain/filters/system/mcmin/ItemTest.java → ...rchain/filters/system/mcmax/ItemTest.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin;
+package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

diff --git a/...n/McMinimumNumberItineraryFilterTest.java → ...x/McMinimumNumberItineraryFilterTest.java b/...n/McMinimumNumberItineraryFilterTest.java → ...x/McMinimumNumberItineraryFilterTest.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin;
+package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary;
@@ -153,10 +153,10 @@ private static String toStr(List<Itinerary> list) {
       .stream()
       .map(i ->
         "[ %d %d %s ]".formatted(
-          i.getGeneralizedCost(),
-          i.getNumberOfTransfers(),
-          groupsToString(i.getGeneralizedCost2().orElse(-1))
-        )
+            i.getGeneralizedCost(),
+            i.getNumberOfTransfers(),
+            groupsToString(i.getGeneralizedCost2().orElse(-1))
+          )
       )
       .collect(Collectors.joining(", "));
   }
@@ -182,11 +182,11 @@ Itinerary create() {
     public String toString() {
       // The red-x is a unicode character(U+274C) and should be visible in most IDEs.
       return "%s %d %d %s".formatted(
-        expected ? "" : "❌",
-        c1,
-        nTransfers,
-        groupsToString(transitGroupIds)
-      );
+          expected ? "" : "❌",
+          c1,
+          nTransfers,
+          groupsToString(transitGroupIds)
+        );
     }
   }
 }