#84 -- change page route and semantic

src/main/java/ru/ulstu/extractor/core/Route.java

@@ -19,7 +19,7 @@ public class Route {
     public static final String STATISTIC = "statistic";
     public static final String LIST_RULE = "listRules";
     public static final String ADD_RULE = "addRule";
-    public static final String RECOMMENDATIONS = "recommendations";
+    public static final String ASSESSMENTS = "assessments";
     public static final String DELETE_RULE = "deleteRule";
 
     public static String getLIST_INDEXED_REPOSITORIES() {
@@ -42,7 +42,7 @@ public class Route {
         return STATISTIC;
     }
 
-    public static String getRECOMMENDATIONS() {
+    public static String getASSESSMENTS() {
-        return RECOMMENDATIONS;
+        return ASSESSMENTS;
     }
 }

src/main/java/ru/ulstu/extractor/recommendation/controller/RecommendationController.java

@@ -11,7 +11,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Optional;
 
-import static ru.ulstu.extractor.core.Route.RECOMMENDATIONS;
+import static ru.ulstu.extractor.core.Route.ASSESSMENTS;
 
 @Controller
 @ApiIgnore
@@ -25,15 +25,15 @@ public class RecommendationController {
         this.branchService = branchService;
     }
 
-    @GetMapping(RECOMMENDATIONS)
+    @GetMapping(ASSESSMENTS)
     public String getRecommendations(Model model, @RequestParam Optional<Integer> branchId) {
         model.addAttribute("branches", branchService.findAll());
         if (branchId.isPresent()) {
-            model.addAttribute("recommendations", fuzzyInferenceService.getRecommendations(branchId.get()));
+            model.addAttribute("assessments", fuzzyInferenceService.getAssessments(branchId.get()));
             model.addAttribute("filterBranchForm", new FilterBranchForm(branchId.get()));
         } else {
             model.addAttribute("filterBranchForm", new FilterBranchForm());
         }
-        return RECOMMENDATIONS;
+        return ASSESSMENTS;
     }
 }

src/main/java/ru/ulstu/extractor/recommendation/model/Assessment.java

@@ -0,0 +1,31 @@
+package ru.ulstu.extractor.recommendation.model;
+
+import ru.ulstu.extractor.ts.model.TimeSeriesType;
+
+public class Assessment {
+    private String consequent;
+    private TimeSeriesType firstAntecedent;
+    private String firstAntecedentTendency;
+    private TimeSeriesType secondAntecedent;
+    private String secondAntecedentTendency;
+
+    public String getConsequent() {
+        return consequent;
+    }
+
+    public TimeSeriesType getFirstAntecedent() {
+        return firstAntecedent;
+    }
+
+    public String getFirstAntecedentTendency() {
+        return firstAntecedentTendency;
+    }
+
+    public TimeSeriesType getSecondAntecedent() {
+        return secondAntecedent;
+    }
+
+    public String getSecondAntecedentTendency() {
+        return secondAntecedentTendency;
+    }
+}

src/main/java/ru/ulstu/extractor/rule/service/FuzzyInferenceService.java

@@ -109,7 +109,7 @@ public class FuzzyInferenceService {
         return engine;
     }
 
-    public String getRecommendations(Integer branchId) {
+    public String getAssessments(Integer branchId) {
         List<TimeSeries> timeSeries = timeSeriesService.getByBranch(branchId);
         Engine engine = getFuzzyEngine();
         List<AntecedentValue> antecedentValues = antecedentValueService.getList();