|
|
@ -71,9 +71,8 @@ public class AssessmentService {
|
|
|
|
Map<String, Double> variableValues = new HashMap<>();
|
|
|
|
Map<String, Double> variableValues = new HashMap<>();
|
|
|
|
timeSeries
|
|
|
|
timeSeries
|
|
|
|
.stream()
|
|
|
|
.stream()
|
|
|
|
.filter(ts -> (ts.getTimeSeriesType() == dbRule.getFirstAntecedent()
|
|
|
|
.filter(ts -> ts.getTimeSeriesType() == dbRule.getFirstAntecedent()
|
|
|
|
|| ts.getTimeSeriesType() == dbRule.getSecondAntecedent())
|
|
|
|
|| ts.getTimeSeriesType() == dbRule.getSecondAntecedent())
|
|
|
|
&& ts.getValues().size() > 0)
|
|
|
|
|
|
|
|
.forEach(ts -> variableValues.put(ts.getTimeSeriesType().name(), timeSeriesService
|
|
|
|
.forEach(ts -> variableValues.put(ts.getTimeSeriesType().name(), timeSeriesService
|
|
|
|
.getLastTimeSeriesTendency(ts)
|
|
|
|
.getLastTimeSeriesTendency(ts)
|
|
|
|
.orElse(ts.getValues().get(ts.getValues().size() - 1).getValue())));
|
|
|
|
.orElse(ts.getValues().get(ts.getValues().size() - 1).getValue())));
|
|
|
|