fix
This commit is contained in:
parent
3bb8f1b394
commit
b2ef4e0904
1 changed files with 13 additions and 6 deletions
|
@ -5,6 +5,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatRepository;
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
|
import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
|
||||||
import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
|
import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.math.RoundingMode;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
@ -38,12 +39,18 @@ public class ThermostatService {
|
||||||
|
|
||||||
private void randomJitter(Thermostat thermostat) {
|
private void randomJitter(Thermostat thermostat) {
|
||||||
|
|
||||||
double x;
|
BigDecimal x =
|
||||||
x =
|
thermostat
|
||||||
(ran.nextInt(thermostat.getTypical().intValue()) + thermostat.getErr().intValue())
|
.getTypical()
|
||||||
* 0.975
|
.subtract(
|
||||||
+ 1;
|
thermostat
|
||||||
updateValueForThermostat(thermostat, BigDecimal.valueOf(x));
|
.getErr()
|
||||||
|
.divide(BigDecimal.valueOf(2), RoundingMode.CEILING))
|
||||||
|
.add(
|
||||||
|
BigDecimal.valueOf(
|
||||||
|
ran.nextDouble() * thermostat.getErr().doubleValue() * 2));
|
||||||
|
|
||||||
|
updateValueForThermostat(thermostat, x);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateValueForThermostat(Thermostat thermostat, BigDecimal value) {
|
private void updateValueForThermostat(Thermostat thermostat, BigDecimal value) {
|
||||||
|
|
Loading…
Reference in a new issue