1 files changed, 17 insertions, 38 deletions

diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java
index 425e1e01..5f7f61b8 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java
@@ -1,12 +1,8 @@
-/*******************************************************************************
- * Copyright (c) 2010-2016, Andras Szabolcs Nagy, Zoltan Ujhelyi and Daniel Varro
- * Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-v20.html.
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
+ */
 package tools.refinery.store.dse.strategy;
 
 import tools.refinery.store.dse.DesignSpaceExplorationAdapter;
@@ -17,38 +13,31 @@ public class DepthFirstStrategy implements Strategy {
 
         private DesignSpaceExplorationAdapter dseAdapter;
 
-        private int maxDepth;
-        private int maxSolutions;
-        private boolean backTrackIfSolution = true;
+        private int maxDepth = Integer.MAX_VALUE;
+        private int maxSolutions = Integer.MAX_VALUE;
+        private boolean backtrackFromSolution = true;
 
-        public DepthFirstStrategy() {
-                this(-1);
-        }
-
-        public DepthFirstStrategy(int maxDepth) {
-                this(maxDepth, -1);
-        }
-
-        public DepthFirstStrategy(int maxDepth, int maxSolutions) {
-                if (maxDepth < 0) {
-                        this.maxDepth = Integer.MAX_VALUE;
-                } else {
+        public DepthFirstStrategy withDepthLimit(int maxDepth) {
+                if (maxDepth >= 0) {
                         this.maxDepth = maxDepth;
                 }
-                if (maxSolutions < 0) {
-                        this.maxSolutions = Integer.MAX_VALUE;
-                } else {
+                return this;
+        }
+
+        public DepthFirstStrategy withSolutionLimit(int maxSolutions) {
+                if (maxSolutions >= 0) {
                         this.maxSolutions = maxSolutions;
                 }
+                return this;
         }
 
         public DepthFirstStrategy continueIfHardObjectivesFulfilled() {
-                backTrackIfSolution = false;
+                backtrackFromSolution = false;
                 return this;
         }
 
         @Override
-        public void initStrategy(DesignSpaceExplorationAdapter designSpaceExplorationAdapter) {
+        public void initialize(DesignSpaceExplorationAdapter designSpaceExplorationAdapter) {
                 this.dseAdapter = designSpaceExplorationAdapter;
         }
 
@@ -59,22 +48,18 @@ public class DepthFirstStrategy implements Strategy {
                 }
                 while (dseAdapter.getSolutions().size() < maxSolutions) {
                         if (!checkAndHandleGlobalConstraints()) {
-                                // Global constraint is not satisfied and cannot backtrack.
                                 return;
                         }
-                        // Global constraint is not satisfied, backtrack.
 
                         Fitness fitness = dseAdapter.getFitness();
                         if (fitness.isSatisfiesHardObjectives()) {
                                 dseAdapter.newSolution();
-                                if (backTrackIfSolution && !dseAdapter.backtrack()) {
-                                        // Found a solution but cannot backtrack.
+                                if (backtrackFromSolution && !dseAdapter.backtrack()) {
                                         return;
                                 }
                         }
 
                         if (!checkAndHandleDepth()) {
-                                // Reached max depth but cannot backtrack.
                                 return;
                         }
 
@@ -87,24 +72,18 @@ public class DepthFirstStrategy implements Strategy {
         }
 
         private boolean checkAndHandleGlobalConstraints() {
-                // Global constraint is not satisfied and cannot backtrack.
                 return dseAdapter.checkGlobalConstraints() || dseAdapter.backtrack();
-                // Global constraint is satisfied or backtrack.
         }
 
         private boolean checkAndHandleDepth() {
-                // Reached max depth but cannot backtrack.
                 return dseAdapter.getDepth() < maxDepth || dseAdapter.backtrack();
-                // Reached max depth or backtrack.
         }
 
         private boolean backtrackToLastUntraversed() {
                 while (dseAdapter.getUntraversedActivations().isEmpty()) {
                         if (!dseAdapter.backtrack()) {
-                                // No more transitions from current state and cannot backtrack.
                                 return false;
                         }
-                        // No more transitions from current state, backtrack.
                 }
                 return true;
         }