3-parse-rule #10

Merged
romanov73 merged 17 commits from 3-parse-rule into master 2025-02-25 13:34:08 +04:00

17 Commits

Author SHA1 Message Date
1f3caff440 #3 -- Rename controller
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m5s
2025-02-25 12:43:12 +04:00
78fe8236be #3 -- Parse rule for list
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m10s
2025-02-25 12:21:16 +04:00
8d0b5cef99 #3 -- Add some controls
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 58s
2025-02-24 22:43:19 +04:00
1e58c907ca #3 -- Remove templates
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 58s
2025-02-24 21:59:14 +04:00
2d06ca9e24 #3 -- Fix models
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 59s
2025-02-24 21:49:56 +04:00
900cfdd036 Merge branch 'master' into 3-parse-rule
Some checks failed
CI fuzzy controller / container-test-job (push) Failing after 52s
# Conflicts:
#	src/main/java/ru/ulstu/fc/rule/controller/RuleController.java
#	src/main/java/ru/ulstu/fc/rule/model/Variable.java
#	src/main/java/ru/ulstu/fc/rule/repository/VariableRepository.java
#	src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java
#	src/main/java/ru/ulstu/fc/rule/service/VariableService.java
#	src/main/resources/templates/default.html
#	src/main/resources/templates/listRules.html
2025-02-24 21:42:35 +04:00
2e0478e9d2 Merge branch 'master' into 3-parse-rule
# Conflicts:
#	src/main/java/ru/ulstu/fc/rule/controller/RuleController.java
#	src/main/java/ru/ulstu/fc/rule/model/Variable.java
#	src/main/java/ru/ulstu/fc/rule/repository/VariableRepository.java
#	src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java
#	src/main/java/ru/ulstu/fc/rule/service/VariableService.java
#	src/main/resources/templates/default.html
#	src/main/resources/templates/listRules.html
2025-02-24 21:42:04 +04:00
936f4386b7 Merge branch 'master' into 3-parse-rule
# Conflicts:
#	src/main/java/ru/ulstu/fc/rule/controller/RuleController.java
#	src/main/java/ru/ulstu/fc/rule/model/Variable.java
#	src/main/java/ru/ulstu/fc/rule/repository/VariableRepository.java
#	src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java
#	src/main/java/ru/ulstu/fc/rule/service/VariableService.java
#	src/main/resources/templates/default.html
#	src/main/resources/templates/listRules.html
2025-02-24 21:40:59 +04:00
c635efaacf #3 -- Fix inference 2023-11-06 20:00:06 +04:00
24a59f204d Merge branch 'master' into 3-parse-rule
# Conflicts:
#	src/main/java/ru/ulstu/fc/rule/model/Variable.java
#	src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java
#	src/main/resources/templates/default.html
2023-11-06 19:21:39 +04:00
0bbe406486 #3 -- Save vars 2023-09-26 22:29:53 +04:00
df4fd6d0ff #3 -- Add models and pages 2023-09-26 21:58:00 +04:00
950dde7f83 #3 -- Add rule models 2023-09-11 19:47:41 +04:00
a705fe5fdb #3 -- Page title fixes 2023-09-11 19:33:42 +04:00
8fbd17c63e #3 -- Add term methods and model 2023-09-11 19:23:27 +04:00
b88ed0211f #3 -- Add rule controller 2023-09-11 19:05:13 +04:00
1c8eabfc08 #3 -- Config of fuzzy engine 2023-09-11 18:22:00 +04:00