From 0bc98c79e3de981b476172493d7ac589942e425f Mon Sep 17 00:00:00 2001
From: Zoltan Ujhelyi
Date: Sun, 18 Feb 2018 09:24:07 +0100
Subject: Further code cleanup in DSE

---
 .../src/org/eclipse/viatra/dse/evolutionary/EvolutionaryStrategy.java | 2 +-
 .../org/eclipse/viatra/dse/api/strategy/impl/BestFirstStrategy.java   | 1 -
 .../eclipse/viatra/dse/api/strategy/impl/RandomSearchStrategy.java    | 2 +-
 .../src/org/eclipse/viatra/dse/designspace/api/TrajectoryInfo.java    | 4 +---
 .../viatra/dse/objectives/impl/ModelQueriesGlobalConstraint.java      | 2 --
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/dse/plugins/org.eclipse.viatra.dse.genetic/src/org/eclipse/viatra/dse/evolutionary/EvolutionaryStrategy.java b/dse/plugins/org.eclipse.viatra.dse.genetic/src/org/eclipse/viatra/dse/evolutionary/EvolutionaryStrategy.java
index 7056b3b4e..cb4c17175 100644
--- a/dse/plugins/org.eclipse.viatra.dse.genetic/src/org/eclipse/viatra/dse/evolutionary/EvolutionaryStrategy.java
+++ b/dse/plugins/org.eclipse.viatra.dse.genetic/src/org/eclipse/viatra/dse/evolutionary/EvolutionaryStrategy.java
@@ -216,7 +216,7 @@ public class EvolutionaryStrategy implements IStrategy {
     }
 
     protected void startThreads() {
-        context.startAllThreads(() -> new EvolutionaryStrategy());
+        context.startAllThreads(EvolutionaryStrategy::new);
     }
 
     protected void generateChildren() {
diff --git a/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/strategy/impl/BestFirstStrategy.java b/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/strategy/impl/BestFirstStrategy.java
index 160e4dc08..1ce0a88dd 100644
--- a/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/strategy/impl/BestFirstStrategy.java
+++ b/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/strategy/impl/BestFirstStrategy.java
@@ -11,7 +11,6 @@ package org.eclipse.viatra.dse.api.strategy.impl;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.Iterator;
 import java.util.PriorityQueue;
 
diff --git a/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/strategy/impl/RandomSearchStrategy.java b/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/strategy/impl/RandomSearchStrategy.java
index b07a8357b..07fff7db5 100644
--- a/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/strategy/impl/RandomSearchStrategy.java
+++ b/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/api/strategy/impl/RandomSearchStrategy.java
@@ -145,7 +145,7 @@ public class RandomSearchStrategy implements IStrategy {
     }
 
     private void startThreads() {
-        context.startAllThreads(() -> new RandomSearchStrategy());
+        context.startAllThreads(RandomSearchStrategy::new);
     }
 
     private static Object getByIndex(Collection<Object> availableTransitions, int index) {
diff --git a/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/designspace/api/TrajectoryInfo.java b/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/designspace/api/TrajectoryInfo.java
index bdb8ec821..800200386 100644
--- a/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/designspace/api/TrajectoryInfo.java
+++ b/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/designspace/api/TrajectoryInfo.java
@@ -71,9 +71,7 @@ public class TrajectoryInfo {
         stateIds.add(newStateId);
         trajectory.add(activationId);
         rules.add(rule);
-        if (!measuredCosts.isEmpty()) {
-            this.measuredCosts.add(measuredCosts);
-        }
+        this.measuredCosts.add(measuredCosts);
     }
 
     public void backtrack() {
diff --git a/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/objectives/impl/ModelQueriesGlobalConstraint.java b/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/objectives/impl/ModelQueriesGlobalConstraint.java
index 567857728..9d4e0f275 100644
--- a/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/objectives/impl/ModelQueriesGlobalConstraint.java
+++ b/dse/plugins/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/objectives/impl/ModelQueriesGlobalConstraint.java
@@ -23,8 +23,6 @@ import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
 import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher;
 import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
 
-import com.google.common.base.Preconditions;
-
 /**
  * This global constraint collects a list of VIATRA Query pattern and checks if any of them has a match on along a trajectory.
  * If any of the patterns has a match then it is unsatisfied and the exploration should backtrack.
-- 
cgit v1.2.3