use checkUnitRange in a couple of places

poseidon-fisheries · Nov 16, 2024 · 4559786 · 4559786
1 parent 483bd9a
commit 4559786
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/agents/src/main/java/uk/ac/ox/poseidon/agents/behaviours/choices/EpsilonGreedyChooser.java b/agents/src/main/java/uk/ac/ox/poseidon/agents/behaviours/choices/EpsilonGreedyChooser.java
@@ -25,9 +25,9 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static uk.ac.ox.poseidon.core.MasonUtils.oneOf;
+import static uk.ac.ox.poseidon.core.utils.Preconditions.checkUnitRange;
 
 public class EpsilonGreedyChooser<O> implements Supplier<O> {
 
@@ -49,11 +49,7 @@ public EpsilonGreedyChooser(
         this.options = ImmutableList.copyOf(options);
         this.optionValues = checkNotNull(optionValues);
         this.evaluator = checkNotNull(evaluator);
-        checkArgument(
-            epsilon >= 0 && epsilon <= 1,
-            "epsilon must be between 0 and 1"
-        );
-        this.epsilon = epsilon;
+        this.epsilon = checkUnitRange(epsilon, "epsilon");
         this.rng = checkNotNull(rng);
     }
 

diff --git a/agents/src/main/java/uk/ac/ox/poseidon/agents/vessels/gears/FixedBiomassProportionGear.java b/agents/src/main/java/uk/ac/ox/poseidon/agents/vessels/gears/FixedBiomassProportionGear.java
@@ -25,7 +25,7 @@
 
 import java.time.Duration;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import static uk.ac.ox.poseidon.core.utils.Preconditions.checkUnitRange;
 
 public class FixedBiomassProportionGear implements FishingGear<Biomass> {
 
@@ -36,8 +36,7 @@ public FixedBiomassProportionGear(
         final double proportion,
         final Duration duration
     ) {
-        checkArgument(proportion >= 0 && proportion <= 1);
-        this.proportion = proportion;
+        this.proportion = checkUnitRange(proportion, "proportion");
         this.duration = duration;
     }