diff --git a/src/main/java/ru/ulstu/fc/rule/controller/InferenceMvcController.java b/src/main/java/ru/ulstu/fc/rule/controller/InferenceMvcController.java index 5bc7614..0c37cf9 100644 --- a/src/main/java/ru/ulstu/fc/rule/controller/InferenceMvcController.java +++ b/src/main/java/ru/ulstu/fc/rule/controller/InferenceMvcController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import ru.ulstu.fc.rule.model.InferenceForm; -import ru.ulstu.fc.rule.model.Term; +import ru.ulstu.fc.rule.model.FuzzyTerm; import ru.ulstu.fc.rule.model.Variable; import ru.ulstu.fc.rule.service.FuzzyInferenceService; @@ -44,21 +44,21 @@ public class InferenceMvcController { return "index"; } - private List getAgeValues() { + private List getAgeValues() { Variable var = new Variable("Age"); var.getTerms().addAll(Arrays.asList( - new Term("молодой", 30.0), - new Term("средний", 45.0), - new Term("старый", 60.0))); + new FuzzyTerm("молодой", 30.0), + new FuzzyTerm("средний", 45.0), + new FuzzyTerm("старый", 60.0))); return var.getTerms(); } - private List getIncomeValues() { + private List getIncomeValues() { Variable var = new Variable("Income"); var.getTerms().addAll(Arrays.asList( - new Term("небольшой", 20000.0), - new Term("средний", 90000.0), - new Term("высокий", 200000.0))); + new FuzzyTerm("небольшой", 20000.0), + new FuzzyTerm("средний", 90000.0), + new FuzzyTerm("высокий", 200000.0))); return var.getTerms(); } } diff --git a/src/main/java/ru/ulstu/fc/rule/model/Term.java b/src/main/java/ru/ulstu/fc/rule/model/FuzzyTerm.java similarity index 81% rename from src/main/java/ru/ulstu/fc/rule/model/Term.java rename to src/main/java/ru/ulstu/fc/rule/model/FuzzyTerm.java index edfe7b1..296a205 100644 --- a/src/main/java/ru/ulstu/fc/rule/model/Term.java +++ b/src/main/java/ru/ulstu/fc/rule/model/FuzzyTerm.java @@ -4,14 +4,14 @@ import jakarta.persistence.Entity; import ru.ulstu.fc.core.model.BaseEntity; @Entity -public class Term extends BaseEntity { +public class FuzzyTerm extends BaseEntity { private String description; private Double value; - public Term() { + public FuzzyTerm() { } - public Term(String description, Double value) { + public FuzzyTerm(String description, Double value) { this.description = description; this.value = value; } diff --git a/src/main/java/ru/ulstu/fc/rule/model/Variable.java b/src/main/java/ru/ulstu/fc/rule/model/Variable.java index 7a7e2f5..a78a798 100644 --- a/src/main/java/ru/ulstu/fc/rule/model/Variable.java +++ b/src/main/java/ru/ulstu/fc/rule/model/Variable.java @@ -14,7 +14,7 @@ public class Variable extends BaseEntity { private Project project; private boolean isInput; @OneToMany - private List terms = new ArrayList<>(); + private List terms = new ArrayList<>(); public Variable() { } @@ -23,7 +23,7 @@ public class Variable extends BaseEntity { this.name = name; } - public Variable(String name, List terms) { + public Variable(String name, List terms) { this.name = name; this.terms = terms; } @@ -36,11 +36,11 @@ public class Variable extends BaseEntity { this.name = name; } - public List getTerms() { + public List getTerms() { return terms; } - public void setTerms(List terms) { + public void setTerms(List terms) { this.terms = terms; } diff --git a/src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java b/src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java index 5287623..30c053b 100644 --- a/src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java +++ b/src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java @@ -15,7 +15,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import ru.ulstu.fc.rule.model.OutputValue; -import ru.ulstu.fc.rule.model.Term; +import ru.ulstu.fc.rule.model.FuzzyTerm; import ru.ulstu.fc.rule.model.Variable; import java.util.List; @@ -131,20 +131,20 @@ public class FuzzyInferenceService { public List getFuzzyInference(Map vals) { return getFuzzyInference(getDemoRules(), vals, List.of(new Variable("возраст", List.of( - new Term("молодой", 35.0), - new Term("средний", 60.0), - new Term("старый", 100.0)) + new FuzzyTerm("молодой", 35.0), + new FuzzyTerm("средний", 60.0), + new FuzzyTerm("старый", 100.0)) ), new Variable("доход", List.of( - new Term("небольшой", 35000.0), - new Term("средний", 100000.0), - new Term("высокий", 500000.0)) + new FuzzyTerm("небольшой", 35000.0), + new FuzzyTerm("средний", 100000.0), + new FuzzyTerm("высокий", 500000.0)) ) ), new Variable("кредит", List.of( - new Term("небольшой", 20000.0), - new Term("средний", 100000.0), - new Term("большой", 1000000.0))) + new FuzzyTerm("небольшой", 20000.0), + new FuzzyTerm("средний", 100000.0), + new FuzzyTerm("большой", 1000000.0))) ); } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 9ac57fb..1208e58 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -29,7 +29,7 @@ data-width="90%"> @@ -44,7 +44,7 @@ data-width="90%">