Fix typo in energy calculation (#25259)
* New energy calculation * more tests and stricter tests. change priority order * more test and fix errorpull/25261/head
parent
1c12aea8f6
commit
cd3e4f55e2
|
@ -1062,7 +1062,7 @@ export const computeConsumptionSingle = (data: {
|
||||||
// Grid_In -> Battery_In
|
// Grid_In -> Battery_In
|
||||||
grid_to_battery = Math.min(from_grid, to_battery);
|
grid_to_battery = Math.min(from_grid, to_battery);
|
||||||
from_grid -= grid_to_battery;
|
from_grid -= grid_to_battery;
|
||||||
to_battery -= to_battery;
|
to_battery -= grid_to_battery;
|
||||||
|
|
||||||
// Solar -> Consumption
|
// Solar -> Consumption
|
||||||
used_solar = Math.min(used_total_remaining, solar);
|
used_solar = Math.min(used_total_remaining, solar);
|
||||||
|
|
|
@ -462,6 +462,8 @@ describe("Energy Usage Calculation Tests", () => {
|
||||||
used_total: 9,
|
used_total: 9,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
});
|
||||||
|
it("Solar -> Battery -> Grid", () => {
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
checkConsumptionResult({
|
checkConsumptionResult({
|
||||||
from_grid: 0,
|
from_grid: 0,
|
||||||
|
@ -482,4 +484,25 @@ describe("Energy Usage Calculation Tests", () => {
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
it("Solar -> Grid && Grid -> Battery", () => {
|
||||||
|
assert.deepEqual(
|
||||||
|
checkConsumptionResult({
|
||||||
|
from_grid: 1,
|
||||||
|
to_grid: 1,
|
||||||
|
solar: 1,
|
||||||
|
to_battery: 1,
|
||||||
|
from_battery: 0,
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
grid_to_battery: 1,
|
||||||
|
battery_to_grid: 0,
|
||||||
|
used_solar: 0,
|
||||||
|
used_grid: 0,
|
||||||
|
used_battery: 0,
|
||||||
|
solar_to_battery: 0,
|
||||||
|
solar_to_grid: 1,
|
||||||
|
used_total: 0,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue