romanov73/git-extractor
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

#91 -- Add markup page menu item #94

Merged
romanov73 merged 29 commits from 91-markup into master 2023-04-23 23:43:14 +04:00
Conversation 1 Commits 29 Files Changed 31 +2 -3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 80904e6221 - Show all commits

3
src/main/java/ru/ulstu/extractor/assessment/service/AssessmentService.java
View File

@ -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())));

2
src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
View File

@ -54,7 +54,7 @@ public class RuleController {
} }
@GetMapping(DELETE_RULE) @GetMapping(DELETE_RULE)
public String deleteRule(Model model, @RequestParam Integer id) { public String deleteRule(@RequestParam Integer id) {
ruleService.deleteById(id); ruleService.deleteById(id);
return "redirect:/" + LIST_RULE; return "redirect:/" + LIST_RULE;
} }