smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix

Browse source
This commit is contained in:
omenem 2020-05-26 15:40:22 +02:00
parent e006ff83d2
commit 7eeab40ff9
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
View file

@ -49,7 +49,7 @@ public class Sensor extends InputDevice implements RangeTriggerable {
private BigDecimal err = new BigDecimal(1); private BigDecimal err = new BigDecimal(1);
@Column(nullable = false, precision = 11, scale = 1) @Column(nullable = false, precision = 11, scale = 1)
private BigDecimal typical = new BigDecimal(17); private BigDecimal typical = BigDecimal.valueOf(17);
/** The type of this sensor */ /** The type of this sensor */
@Column(nullable = false) @Column(nullable = false)
@Enumerated(value = EnumType.STRING) @Enumerated(value = EnumType.STRING)

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
View file

@ -84,7 +84,7 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
private BigDecimal err = new BigDecimal(1); private BigDecimal err = new BigDecimal(1);
@Column(nullable = false, precision = 11, scale = 1) @Column(nullable = false, precision = 11, scale = 1)
private BigDecimal typical = new BigDecimal(17.0); private BigDecimal typical = BigDecimal.valueOf(17);
/** Creates a thermostat with a temperature sensor and its initial OFF state */ /** Creates a thermostat with a temperature sensor and its initial OFF state */
public Thermostat() { public Thermostat() {

6
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
View file

@ -19,14 +19,16 @@ public class SensorService {
@Autowired private SensorSocketEndpoint endpoint; @Autowired private SensorSocketEndpoint endpoint;
private Random ran = new Random();
private void randomJitter(Sensor sensor) { private void randomJitter(Sensor sensor) {
double x; double x;
Random ran = new Random();
x = x =
(ran.nextInt(sensor.getTypical().intValue()) + sensor.getError().intValue()) * 0.975 (ran.nextInt(sensor.getTypical().intValue()) + sensor.getError().intValue()) * 0.975
+ 1; + 1;
updateValueFromSensor(sensor, new BigDecimal(x)); updateValueFromSensor(sensor, BigDecimal.valueOf(x));
} }
public void sensorFakeUpdate() { public void sensorFakeUpdate() {

5
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
View file

@ -22,6 +22,8 @@ public class ThermostatService {
private final ThermostatRepository thermostatRepository; private final ThermostatRepository thermostatRepository;
private Random ran = new Random();
@Autowired @Autowired
public ThermostatService( public ThermostatService(
SensorSocketEndpoint endpoint, SensorSocketEndpoint endpoint,
@ -37,12 +39,11 @@ public class ThermostatService {
private void randomJitter(Thermostat thermostat) { private void randomJitter(Thermostat thermostat) {
double x; double x;
Random ran = new Random();
x = x =
(ran.nextInt(thermostat.getTypical().intValue()) + thermostat.getErr().intValue()) (ran.nextInt(thermostat.getTypical().intValue()) + thermostat.getErr().intValue())
* 0.975 * 0.975
+ 1; + 1;
updateValueForThermostat(thermostat, new BigDecimal(x)); updateValueForThermostat(thermostat, BigDecimal.valueOf(x));
} }
private void updateValueForThermostat(Thermostat thermostat, BigDecimal value) { private void updateValueForThermostat(Thermostat thermostat, BigDecimal value) {