From 7351a05730955232679423458a34898439aa5e5e Mon Sep 17 00:00:00 2001 From: oblonski Date: Fri, 19 Jul 2019 10:41:20 +0200 Subject: [PATCH] clean up --- .../solution/route/activity/TourActivities.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivities.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivities.java index 949e70fd..9730de76 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivities.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/activity/TourActivities.java @@ -46,8 +46,7 @@ public class TourActivities { @Override public boolean hasNext() { - if (currentIndex >= 0) return true; - return false; + return currentIndex >= 0; } @Override @@ -67,9 +66,9 @@ public class TourActivities { } } - private final ArrayList tourActivities = new ArrayList(); + private final ArrayList tourActivities = new ArrayList<>(); - private final Set jobs = new HashSet(); + private final Set jobs = new HashSet<>(); private ReverseActivityIterator backward; @@ -123,7 +122,7 @@ public class TourActivities { * @return true if job has been removed, otherwise false. */ public boolean removeJob(Job job) { - boolean jobRemoved = false; + boolean jobRemoved; if (!jobs.contains(job)) { return false; } else { @@ -161,7 +160,7 @@ public class TourActivities { } boolean jobIsAlsoAssociateToOtherActs = false; boolean actRemoved = false; - List acts = new ArrayList(tourActivities); + List acts = new ArrayList<>(tourActivities); for (TourActivity act : acts) { if (act == activity) { tourActivities.remove(act);