From d32ce35178f1af27a54f1a0b70e58df808a15e7c Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 21 Jan 2022 17:14:06 +0100 Subject: [PATCH] [Minor] Cleanup DurationExecution, simplifying --- .../strolch/execution/policy/DurationExecution.java | 9 +-------- .../execution/policy/RandomDurationExecution.java | 13 ++----------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/DurationExecution.java b/li.strolch.service/src/main/java/li/strolch/execution/policy/DurationExecution.java index 053128ea7..465234107 100644 --- a/li.strolch.service/src/main/java/li/strolch/execution/policy/DurationExecution.java +++ b/li.strolch.service/src/main/java/li/strolch/execution/policy/DurationExecution.java @@ -1,10 +1,6 @@ package li.strolch.execution.policy; -import static li.strolch.model.StrolchModelConstants.PolicyConstants.BAG_OBJECTIVES; -import static li.strolch.model.StrolchModelConstants.PolicyConstants.PARAM_DURATION; - import li.strolch.model.activity.Action; -import li.strolch.model.parameter.DurationParameter; import li.strolch.persistence.api.StrolchTransaction; /** @@ -23,10 +19,7 @@ public class DurationExecution extends SimpleExecution { @Override public void toExecution(Action action) { - - DurationParameter durationP = action.findParameter(BAG_OBJECTIVES, PARAM_DURATION, true); - delayToExecutedBy(durationP.getDuration()); - + delayToExecuted(action); super.toExecution(action); } } diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/RandomDurationExecution.java b/li.strolch.service/src/main/java/li/strolch/execution/policy/RandomDurationExecution.java index c0557d407..40d0b6ff3 100644 --- a/li.strolch.service/src/main/java/li/strolch/execution/policy/RandomDurationExecution.java +++ b/li.strolch.service/src/main/java/li/strolch/execution/policy/RandomDurationExecution.java @@ -1,18 +1,12 @@ package li.strolch.execution.policy; -import static li.strolch.model.StrolchModelConstants.PolicyConstants.BAG_OBJECTIVES; -import static li.strolch.model.StrolchModelConstants.PolicyConstants.PARAM_DURATION; - -import java.util.concurrent.TimeUnit; - import li.strolch.model.activity.Action; -import li.strolch.model.parameter.DurationParameter; import li.strolch.persistence.api.StrolchTransaction; /** *

* Simple Execution Policy which starts the execution immediately, i.e. set state to in execution and completes after - * the {@link Action Action's} duration has passed. + * the {@link Action Action's} duration has passed, including a random min/max factor being applied to the duration *

* * @author Robert von Burg @@ -25,10 +19,7 @@ public class RandomDurationExecution extends SimpleExecution { @Override public void toExecution(Action action) { - - DurationParameter durationP = action.findParameter(BAG_OBJECTIVES, PARAM_DURATION, true); - delayToExecutedByRandom(durationP.toMillis(), 0.5, 2, TimeUnit.MILLISECONDS); - + delayToExecutedByRandom(action, 0.5, 2); super.toExecution(action); } }