From 7efb7b9e997e0977c8343718cd8b5149805ea57b Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Sat, 13 Mar 2021 09:11:12 -0500 Subject: Add more documentation Also, changed my mind on the way DiePool and its implementations should be structured. The implementations go in the die pool file as internal classes, because nobody should particularly care the specifics about their die pool, only that it does what it says it should --- .../dicelang/neodice/diepool/ExpandDiePool.java | 25 ---------- .../bjc/dicelang/neodice/diepool/FixedDiePool.java | 56 ---------------------- .../bjc/dicelang/neodice/diepool/TimesDiePool.java | 54 --------------------- .../dicelang/neodice/diepool/TransformDiePool.java | 52 -------------------- 4 files changed, 187 deletions(-) delete mode 100644 dice/src/main/java/bjc/dicelang/neodice/diepool/ExpandDiePool.java delete mode 100644 dice/src/main/java/bjc/dicelang/neodice/diepool/FixedDiePool.java delete mode 100644 dice/src/main/java/bjc/dicelang/neodice/diepool/TimesDiePool.java delete mode 100644 dice/src/main/java/bjc/dicelang/neodice/diepool/TransformDiePool.java (limited to 'dice/src/main/java/bjc/dicelang/neodice/diepool') diff --git a/dice/src/main/java/bjc/dicelang/neodice/diepool/ExpandDiePool.java b/dice/src/main/java/bjc/dicelang/neodice/diepool/ExpandDiePool.java deleted file mode 100644 index 97acc79..0000000 --- a/dice/src/main/java/bjc/dicelang/neodice/diepool/ExpandDiePool.java +++ /dev/null @@ -1,25 +0,0 @@ -package bjc.dicelang.neodice.diepool; - -import java.util.*; -import java.util.function.*; -import java.util.stream.*; - -import bjc.dicelang.neodice.*; - -public class ExpandDiePool implements DiePool { - private final Die contained; - - private final BiFunction, Random, Stream> expander; - - public ExpandDiePool(Die contained, - BiFunction, Random, Stream> expander) { - this.contained = contained; - this.expander = expander; - } - - - @Override - public Stream roll(Random rng) { - return expander.apply(contained, rng); - } -} diff --git a/dice/src/main/java/bjc/dicelang/neodice/diepool/FixedDiePool.java b/dice/src/main/java/bjc/dicelang/neodice/diepool/FixedDiePool.java deleted file mode 100644 index 4950407..0000000 --- a/dice/src/main/java/bjc/dicelang/neodice/diepool/FixedDiePool.java +++ /dev/null @@ -1,56 +0,0 @@ -package bjc.dicelang.neodice.diepool; - -import java.util.*; -import java.util.stream.*; - -import bjc.dicelang.neodice.*; - -public class FixedDiePool implements DiePool { - private final List> dice; - - public FixedDiePool(List> dice) { - this.dice = dice; - } - - @SafeVarargs - public FixedDiePool(Die...dice) { - this.dice = new ArrayList<>(dice.length); - for (Die die : dice) { - this.dice.add(die); - } - } - - @Override - public Stream roll(Random rng) { - return dice.stream().map((die) -> die.roll(rng)); - } - - @Override - public List> contained() { - return dice; - } - - - @Override - public String toString() { - return dice.stream() - .map(Die::toString) - .collect(Collectors.joining(", ")); - } - - @Override - public int hashCode() { - return Objects.hash(dice); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null) return false; - if (getClass() != obj.getClass()) return false; - - FixedDiePool other = (FixedDiePool) obj; - - return Objects.equals(dice, other.dice); - } -} \ No newline at end of file diff --git a/dice/src/main/java/bjc/dicelang/neodice/diepool/TimesDiePool.java b/dice/src/main/java/bjc/dicelang/neodice/diepool/TimesDiePool.java deleted file mode 100644 index e039e47..0000000 --- a/dice/src/main/java/bjc/dicelang/neodice/diepool/TimesDiePool.java +++ /dev/null @@ -1,54 +0,0 @@ -package bjc.dicelang.neodice.diepool; - -import java.util.*; -import java.util.stream.*; - -import bjc.dicelang.neodice.*; - -public class TimesDiePool implements DiePool { - private final Die contained; - private final int numDice; - - public TimesDiePool(Die contained, int numDice) { - this.contained = contained; - this.numDice = numDice; - } - - @Override - public Stream roll(Random rng) { - return Stream.generate(() -> contained.roll(rng)) - .limit(numDice); - } - - @Override - public List> contained() { - List> results = new ArrayList<>(numDice); - - for (int index = 0; index < numDice; index++) { - results.add(contained); - } - - return results; - } - - @Override - public String toString() { - return String.format("%d%s", numDice, contained); - } - - @Override - public int hashCode() { - return Objects.hash(contained, numDice); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null) return false; - if (getClass() != obj.getClass()) return false; - - TimesDiePool other = (TimesDiePool) obj; - - return Objects.equals(contained, other.contained) && numDice == other.numDice; - } -} \ No newline at end of file diff --git a/dice/src/main/java/bjc/dicelang/neodice/diepool/TransformDiePool.java b/dice/src/main/java/bjc/dicelang/neodice/diepool/TransformDiePool.java deleted file mode 100644 index 80b563f..0000000 --- a/dice/src/main/java/bjc/dicelang/neodice/diepool/TransformDiePool.java +++ /dev/null @@ -1,52 +0,0 @@ -package bjc.dicelang.neodice.diepool; - -import java.util.*; -import java.util.function.*; -import java.util.stream.*; - -import bjc.dicelang.neodice.*; - -public class TransformDiePool implements DiePool { - private final DiePool contained; - - private UnaryOperator> transform; - - public TransformDiePool(DiePool contained, - UnaryOperator> transform) { - super(); - this.contained = contained; - this.transform = transform; - } - - @Override - public Stream roll(Random rng) { - return transform.apply(contained.roll(rng)); - } - - @Override - public List> contained() { - return contained.contained(); - } - - @Override - public int hashCode() { - return Objects.hash(contained, transform); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null) return false; - if (getClass() != obj.getClass()) return false; - - TransformDiePool other = (TransformDiePool) obj; - - return Objects.equals(contained, other.contained) - && Objects.equals(transform, other.transform); - } - - @Override - public String toString() { - return contained.toString() + "(transformed)"; - } -} -- cgit v1.2.3