Zoned date time #3
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,41 @@ | ||
| package tw.joi.energy.config; | ||
|
|
||
| import java.math.BigDecimal; | ||
| import java.time.Clock; | ||
| import java.time.temporal.ChronoUnit; | ||
| import java.util.Random; | ||
| import java.util.stream.Stream; | ||
| import tw.joi.energy.domain.ElectricityReading; | ||
|
|
||
| public class ElectricityReadingsGenerator { | ||
|
|
||
| public static final double AVG_HOURLY_USAGE = 0.3; | ||
| public static final double VARIANCE = 0.2; | ||
| public static final double MIN_HOURLY_USAGE = AVG_HOURLY_USAGE - VARIANCE; | ||
| public static final double MAX_HOURLY_USAGE = AVG_HOURLY_USAGE + VARIANCE; | ||
|
|
||
| private ElectricityReadingsGenerator() {} | ||
|
|
||
| public static Stream<ElectricityReading> generateElectricityReadingStream(int days) { | ||
| return generateElectricityReadingStream(Clock.systemDefaultZone(), BigDecimal.ZERO, days); | ||
| } | ||
|
|
||
| // we'll provide hourly readings for the specified number of days assuming 24 hours a day | ||
| // we'll assume that a house consumes ca 2700 kWh a year, so about 0.3 kWh per hour | ||
|
|
||
| // the assumed starting point is the time on the clock, the ending point 24 hours later - so for 1 day, we'll get 25 | ||
| // readings | ||
| public static Stream<ElectricityReading> generateElectricityReadingStream( | ||
| Clock clock, BigDecimal initialReading, int days) { | ||
| var now = clock.instant(); | ||
| var readingRandomiser = new Random(); | ||
| var seed = new ElectricityReading(now, initialReading); | ||
| var lastTimeToBeSupplied = now.plus(days * 24L, ChronoUnit.HOURS); | ||
| return Stream.iterate(seed, er -> !er.time().isAfter(lastTimeToBeSupplied), er -> { | ||
| var hoursWorthOfEnergy = | ||
| BigDecimal.valueOf(readingRandomiser.nextDouble(MIN_HOURLY_USAGE, MAX_HOURLY_USAGE)); | ||
| return new ElectricityReading( | ||
| er.time().plus(1, ChronoUnit.HOURS), er.readingInKwH().add(hoursWorthOfEnergy)); | ||
| }); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,16 @@ | ||
| package tw.joi.energy.domain; | ||
|
|
||
| import java.math.BigDecimal; | ||
| import java.time.Clock; | ||
| import java.time.Instant; | ||
|
|
||
| /** | ||
| * @param time point in time | ||
| * @param readingInKwH energy consumed in total to this point in time in kWh | ||
| */ | ||
| public record ElectricityReading(Instant time, BigDecimal readingInKwH) { | ||
|
|
||
| public ElectricityReading(Clock clock, double readingInKwH) { | ||
|
There was a problem hiding this comment. Is this constructor meant to be for testing purposes (faking the current time, lighter syntax for the reading) or also for production usage? |
||
| this(clock.instant(), BigDecimal.valueOf(readingInKwH)); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package tw.joi.energy.domain; | ||
|
|
||
| import java.math.BigDecimal; | ||
| import java.time.DayOfWeek; | ||
|
|
||
| public record PeakTimeMultiplier(DayOfWeek dayOfWeek, BigDecimal multiplier) {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,64 +1,55 @@ | ||||||
| package tw.joi.energy.domain; | ||||||
|
|
||||||
| import java.math.BigDecimal; | ||||||
| import java.time.DayOfWeek; | ||||||
| import java.time.ZonedDateTime; | ||||||
| import java.util.Collections; | ||||||
| import java.util.HashMap; | ||||||
| import java.util.Map; | ||||||
|
|
||||||
| public class PricePlan { | ||||||
|
|
||||||
| private final String energySupplier; | ||||||
| private final String planName; | ||||||
| private final BigDecimal unitRate; // unit price per kWh | ||||||
| private final Map<DayOfWeek, BigDecimal> peakTimeMultipliers; | ||||||
|
|
||||||
| public PricePlan(String planName, String energySupplier, BigDecimal unitRate) { | ||||||
| this.planName = planName; | ||||||
| this.energySupplier = energySupplier; | ||||||
| this.unitRate = unitRate; | ||||||
| this.peakTimeMultipliers = Collections.emptyMap(); | ||||||
| } | ||||||
|
|
||||||
| public PricePlan( | ||||||
| String planName, | ||||||
| String energySupplier, | ||||||
| BigDecimal unitRate, | ||||||
| Map<DayOfWeek, BigDecimal> peakTimeMultipliers) { | ||||||
| this.planName = planName; | ||||||
| this.energySupplier = energySupplier; | ||||||
| this.unitRate = unitRate; | ||||||
| this.peakTimeMultipliers = Collections.unmodifiableMap(new HashMap<>(peakTimeMultipliers)); | ||||||
|
There was a problem hiding this comment.
Suggested change
Credit goes to IntelliJ for that suggestion... |
||||||
| } | ||||||
|
|
||||||
| public String getEnergySupplier() { | ||||||
| return energySupplier; | ||||||
| } | ||||||
|
|
||||||
| public String getPlanName() { | ||||||
| return planName; | ||||||
| } | ||||||
|
|
||||||
| public BigDecimal getUnitRate() { | ||||||
| return unitRate; | ||||||
| } | ||||||
|
|
||||||
| public BigDecimal getPrice(ZonedDateTime dateTime) { | ||||||
| return unitRate; | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public String toString() { | ||||||
| return "Name: '" + planName + "', Unit Rate: " + unitRate + ", Supplier: '" + energySupplier + "'"; | ||||||
| } | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure I buy returning a stream here. The implementation doesn't look much simpler, and every single caller wants a
Listinstead of aStream.The name also adds a lot of stutter (unless every caller switches to a static import).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd recommend the static import 😄 which was sort of my assumption anyway.
Lets think a bit more about streams - they're trivially convertible to lists anyway. To be honest, the functions also need some more possible parameters - eg the interval between the readings to generate and the function to generate the values. I hadn't quite finished removing all dependencies on hidden state such as Random...