Skip to content
GitLab

Mr fix metering power states

Merged andreas.fenkart requested to merge MR_fix_metering_power_states into master
1 unresolved thread
Compare
and
2 files
+ 85
− 25
src/metering/power-states-test.cpp
+ 66
− 15
@@ -113,36 +113,87 @@ SCENARIO("trigger state changes", TAGS) {
powerStates->trigger(MeteringSystem::apartmentSummation, TotalPower{.production = 100, .consumption = 0});
}
WHEN("createPowerState production/on:5/off:7") {
powerStates->createState(MeteringSystem::apartmentSummation,
{.category = Category::production, .setThreshold = 5, .resetThreshold = 7});
auto state1 = apartment.tryGetState(StateType_Circuit, "apartment-power-production-on5-off7"s);
SECTION("hysteresis power states ") {
auto x = GENERATE(PowerStateConfig{.category = Category::production, .setThreshold = 15, .resetThreshold = 7},
PowerStateConfig{.category = Category::consumption, .setThreshold = 15, .resetThreshold = 7});
CHECK(x.resetThreshold <= x.setThreshold); // lower smaller than higher limit
powerStates->createState(MeteringSystem::apartmentSummation, PowerStateConfig(x));
Please register or sign in to reply
auto state1 = apartment.tryGetState(
StateType_Circuit, ds::str("apartment-power-", x.category, "-on", x.setThreshold, "-off", x.resetThreshold));
CHECK(state1 != nullptr);
auto makeTotalPower = [](Category category, auto categoryLevel, auto otherLevel) -> TotalPower {
if (category == Category::consumption) {
return {.production = otherLevel, .consumption = categoryLevel};
} else {
return {.production = categoryLevel, .consumption = otherLevel};
}
};
auto average = [](auto left, auto right) -> decltype(left) { return (left + right) / 2; };
WHEN("state not active") {
WHEN("production < setThreshold") {
THEN("state is remains unchanged") {
DS_NOTICE("start");
powerStates->trigger(MeteringSystem::apartmentSummation, TotalPower{.production = 2, .consumption = 0});
CHECK(state1->getState() == State_Inactive);
WHEN("powerValue < setThreshold") {
THEN("state remains unchanged") {
powerStates->trigger(MeteringSystem::apartmentSummation, makeTotalPower(x.category, x.setThreshold - 1, 0u));
CHECK(state1->getState() == State_Inactive);
}
}
WHEN("production > setThreshold") {
WHEN("powerValue > setThreshold") {
THEN("state is active") {
CHECK(state1->getState() == State_Inactive);
powerStates->trigger(MeteringSystem::apartmentSummation, TotalPower{.production = 10, .consumption = 0});
powerStates->trigger(MeteringSystem::apartmentSummation, makeTotalPower(x.category, x.setThreshold + 1, 0u));
CHECK(state1->getState() == State_Active);
}
WHEN("incorrect meteringSystem") {
THEN("state remains unchanged") {
CHECK(state1->getState() == State_Inactive);
powerStates->trigger(MeteringSystem::digitalStromMeter, TotalPower{.production = 10, .consumption = 0});
powerStates->trigger(MeteringSystem::digitalStromMeter, makeTotalPower(x.category, x.setThreshold + 1, 0u));
CHECK(state1->getState() == State_Inactive);
}
}
}
WHEN("wrong category powerValue > setThreshold") {
THEN("state remains unchanged") {
powerStates->trigger(
MeteringSystem::apartmentSummation,
makeTotalPower(x.category, average(x.resetThreshold, x.setThreshold), x.setThreshold + 1));
CHECK(state1->getState() == State_Inactive);
}
}
}
WHEN("state is active") {
state1->setState(CallOrigin::system, State_Active);
CHECK(state1->getState() == State_Active);
WHEN("powerValue < resetThreshold") {
THEN("state becomes inactive") {
powerStates->trigger(MeteringSystem::apartmentSummation,
makeTotalPower(x.category, x.resetThreshold - 1, 0u));
CHECK(state1->getState() == State_Inactive);
}
WHEN("incorrect meteringSystem") {
THEN("state remains unchanged") {
powerStates->trigger(MeteringSystem::digitalStromMeter,
makeTotalPower(x.category, x.resetThreshold - 1, 0u));
CHECK(state1->getState() == State_Active);
}
}
}
WHEN("powerValue between [resetThreshold,setThreshold]") {
THEN("state remains active") {
powerStates->trigger(MeteringSystem::apartmentSummation,
makeTotalPower(x.category, average(x.resetThreshold, x.setThreshold), 0u));
CHECK(state1->getState() == State_Active);
}
}
WHEN("wrong category < resetThreshold)") {
THEN("state remains unchanged") {
powerStates->trigger(
MeteringSystem::apartmentSummation,
makeTotalPower(x.category, average(x.resetThreshold, x.setThreshold), x.resetThreshold - 1));
}
}
}
}
}
src/metering/power-states.cpp
+ 19
− 10
@@ -35,6 +35,7 @@ public:
std::shared_ptr<State> createState(MeteringSystem meteringSystem, PowerStateConfig&& powerStateConfig) override;
void removeState(MeteringSystem meteringSystem, const PowerStateConfig& powerStateConfig) override;
void trigger(MeteringSystem meteringSystem, TotalPower&& totalPower) override;
void checkHysteresis(unsigned int value, PowerStateConfig& config, std::shared_ptr<State> state);
};
std::shared_ptr<State> PowerStatesImpl::createState(MeteringSystem meteringSystem,
@@ -80,6 +81,21 @@ void PowerStatesImpl::removeState(MeteringSystem meteringSystem, const PowerStat
DS_INFO_LEAVE();
}
void PowerStatesImpl::checkHysteresis(unsigned int meteringValue, PowerStateConfig& config,
std::shared_ptr<State> state) {
if (state->getState() != State_Active) {
if (meteringValue > config.setThreshold) {
DS_NOTICE(" ->active", state);
state->setState(CallOrigin::system, State_Active);
}
} else {
if (meteringValue < config.resetThreshold) {
DS_NOTICE("->inactive", state);
state->setState(CallOrigin::system, State_Inactive);
}
}
}
void PowerStatesImpl::trigger(MeteringSystem meteringSystem, TotalPower&& totalPower) {
DS_DEBUG(meteringSystem, totalPower);
@@ -89,17 +105,10 @@ void PowerStatesImpl::trigger(MeteringSystem meteringSystem, TotalPower&& totalP
}
DS_DEBUG(config, state, state->getState());
auto value = state->getState();
if (value != State_Active) {
if (totalPower.production > config.setThreshold) {
DS_NOTICE(" ->active", state);
state->setState(CallOrigin::system, State_Active);
}
if (config.category == Category::consumption) {
checkHysteresis(totalPower.consumption, config, state);
} else {
if (totalPower.production < config.resetThreshold) {
DS_NOTICE("->inactive", state);
state->setState(CallOrigin::system, State_Inactive);
}
checkHysteresis(totalPower.production, config, state);
}
}
}