This repository has been archived by the owner on May 7, 2020. It is now read-only.
adds kW·h as Unit #5346
Closed
adds kW·h as Unit #5346
Conversation
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
|
Travis fails in unrelkated JSON storage test. |
|
Retriggering build |
|
I don‘t understand why so many builds fail lately. This is clearly unrelated, unfortunately before the core tests. |
|
retriggering build after tests are finally fixed |
fixes #5341 Signed-off-by: Jan N. Klug <[email protected]>
htreu
reviewed
Apr 6, 2018
| @@ -122,13 +123,19 @@ public String getName() { | |||
| public static final Unit<Time> WEEK = addUnit(Units.WEEK); | |||
| public static final Unit<Time> YEAR = addUnit(Units.YEAR); | |||
| public static final Unit<Volume> LITRE = addUnit(Units.LITRE); | |||
| public static final Unit<Energy> WATT_SECOND = addUnit(new ProductUnit<Energy>(Units.WATT.multiply(Units.SECOND))); | |||
| public static final Unit<Energy> WATT_HOUR = addUnit(WATT_SECOND.multiply(3600)); | |||
| public static final Unit<Energy> KILOWATT_HOUR = addUnit(WATT_HOUR.multiply(1000)); | |||
There was a problem hiding this comment.
I would prefer to use the KILO prefix here:
import static org.eclipse.smarthome.core.library.unit.MetricPrefix.KILO;
// and
public static final Unit<Energy> KILOWATT_HOUR = addUnit(KILO(WATT_HOUR));
| @@ -122,13 +123,19 @@ public String getName() { | |||
| public static final Unit<Time> WEEK = addUnit(Units.WEEK); | |||
| public static final Unit<Time> YEAR = addUnit(Units.YEAR); | |||
| public static final Unit<Volume> LITRE = addUnit(Units.LITRE); | |||
| public static final Unit<Energy> WATT_SECOND = addUnit(new ProductUnit<Energy>(Units.WATT.multiply(Units.SECOND))); | |||
| public static final Unit<Energy> WATT_HOUR = addUnit(WATT_SECOND.multiply(3600)); | |||
There was a problem hiding this comment.
I'm not sure but maybe we should define WATT_HOUR also by ProductUnit with Units.HOUR. It already has the factor defined.
|
done. and integrated in #5336 to avoid merge conflicts |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
fixes #5341
Signed-off-by: Jan N. Klug [email protected]