WIP: страницы для правил #62

Closed
Ghost wants to merge 132 commits from master into 61-rules-pages

132 Commits

Author SHA1 Message Date
c29650935c Merge pull request 'Add generation' (#97) from 96-generation into master
Reviewed-on: #97
2024-05-13 00:54:17 +04:00
1192201a69 #96 -- Fix time series generation 2024-05-13 00:52:04 +04:00
8bcdff3ba1 #96 -- Fix time series generation 2024-05-13 00:07:41 +04:00
eb37dd0c8c #96 -- Add time series generation 2024-05-10 23:12:22 +04:00
e5d5d7312b #96 -- Add generation page 2024-05-10 12:11:17 +04:00
5a97d107c3 #96 -- Add db records for generated time series 2024-05-10 11:43:40 +04:00
c5cb94f009 wrong action 2023-06-09 06:39:27 +04:00
6377e18779 test ts add 2023-05-12 11:54:03 +04:00
28697b68aa test ts add 2023-05-12 11:32:23 +04:00
422864e489 #91 -- fix ts classes 2023-05-08 00:52:35 +04:00
23b41ba283 #91 -- fix markup UI 2023-04-25 16:15:34 +04:00
6dbf60cb57 #91 -- add accordion 2023-04-25 15:53:25 +04:00
14e0266d0b #91 -- fix api call 2023-04-25 12:32:59 +04:00
9cc721849c #91 -- show assessments 2023-04-24 16:09:12 +04:00
a4f4679f1e #91 -- fix time series tendency estimation 2023-04-24 13:57:37 +04:00
09abd351fb #91 -- remove copyrights 2023-04-24 10:31:31 +04:00
cd5e8ec0a7 Merge pull request '#91 -- Add markup page menu item' (#94) from 91-markup into master
Reviewed-on: #94
2023-04-23 23:43:14 +04:00
d2f898d758 #91 -- fix markup 2023-04-23 23:41:44 +04:00
07cd5abe9c #91 -- Fix format 2023-04-23 15:09:00 +04:00
e506566a5d #91 -- Fix data for markup 2023-04-23 15:08:26 +04:00
9c3a64b0d0 #91 -- Fix smoothing 2023-04-22 12:58:12 +04:00
1c62c520e9 #91 -- Fix db 2023-04-22 12:26:54 +04:00
8d31dc36b3 #91 -- Fix time series types 2023-04-21 23:11:09 +04:00
3bb4f5c49c #91 -- Run scheduled time series creators 2023-04-21 22:49:33 +04:00
1dc44f7988 #91 -- Fix fuzzy inference 2023-04-21 15:47:27 +04:00
6823f34997 #91 -- Fix fuzzy sets 2023-04-21 15:00:14 +04:00
d03cb194ee #91 -- Fix fuzzy inference 2023-04-21 13:23:48 +04:00
4596a25a59 #91 -- Fix fuzzy inference 2023-04-11 16:36:05 +04:00
5c6b388901 #91 -- Reformat 2023-03-16 23:09:26 +04:00
d111121e24 #91 -- Use new models 2023-03-16 23:09:04 +04:00
ddedfc9751 #91 -- Fix form 2023-03-15 14:36:47 +04:00
941a251536 Merge pull request '80-checkts' (#83) from 80-checkts into master
Reviewed-on: #83
2023-03-15 14:22:55 +04:00
394873f63b #91 -- Remove copyright 2023-03-15 14:21:37 +04:00
2d374e1e20 Merge branch 'master' into 91-markup
# Conflicts:
#	src/main/java/ru/ulstu/extractor/ts/service/TimeSeriesService.java
2023-03-15 14:21:06 +04:00
9e43175704 #80 -- Add validation 2023-03-15 14:18:23 +04:00
80904e6221 #91 -- Restore 2023-03-14 23:20:57 +04:00
71652c7b79 #91 -- Add some rule generator 2023-03-11 00:55:43 +04:00
d7790dff70 #91 -- Save markup 2023-03-07 16:59:17 +04:00
211a8b004c #91 -- Add get markups form 2023-03-03 11:10:35 +04:00
0239b0afd4 #91 -- Add save operation 2023-03-03 10:44:26 +04:00
0883c5193b #91 -- Add dtos 2023-03-02 22:03:29 +04:00
ed68fa47f7 #91 -- Add markup table 2023-03-02 21:02:10 +04:00
704366f11a #91 -- Group list of ts tendencies 2023-02-27 23:35:31 +04:00
f4600c2ba5 #91 -- Group ts tendencies 2023-02-27 14:47:51 +04:00
41b23570c0 #91 -- Fix buttons 2023-02-25 12:26:48 +04:00
a701f943eb #91 -- Fix mvc config 2023-02-25 11:30:08 +04:00
f08e5447fd #91 -- Fix menu 2023-02-22 23:01:56 +04:00
4bd2f46046 #91 -- Add markup page menu item 2023-02-22 22:31:53 +04:00
7ad962494a #92 -- Restore 2023-02-22 15:59:32 +04:00
ba747cfed3 Merge remote-tracking branch 'origin/master' into master 2023-02-22 15:49:18 +04:00
9972f5e925 #92 -- Add api call 2023-02-22 15:49:10 +04:00
9d5672cdcf #91 -- Add markup page 2023-02-21 18:22:41 +04:00
d72cf99fa6 #92 -- Fix saving in transaction 2023-02-21 17:46:55 +04:00
bc58d72481 #92 -- Fix .git removing for git 2023-02-21 14:43:27 +04:00
513c2cb7ba Merge pull request '#92 -- gitlab repository id' (#93) from 92-id-gitlab into master
Reviewed-on: #93
2023-02-20 14:25:20 +04:00
1e69baea80 #92 -- Fix scheduled time 2023-02-20 14:22:38 +04:00
de6c83c239 #92 -- Move id repository to model 2023-02-20 14:18:37 +04:00
220854401e #92 -- Fix .git removing 2023-02-20 11:08:49 +04:00
a3a032b70b Merge pull request '89-time-series-by-cron' (#90) from 89-time-series-by-cron into master
Reviewed-on: #90
2023-02-20 10:16:32 +04:00
a5c9d15d4f #89 -- Fix logs 2023-02-20 10:10:41 +04:00
78016741cf #89 -- Fix scheduled time series 2023-02-19 23:59:30 +04:00
3de664abb1 #89 -- Divide git api services 2023-02-16 00:39:13 +04:00
aeab50cfb8 #89 -- Create a valid class hierarchy 2023-02-15 18:28:39 +04:00
0d43bf8ccd #89 -- Use git service api to create time series 2023-02-15 00:55:06 +04:00
b8c6aaf9da Merge pull request 'async indexing' (#88) from 81-async-indexing into master
Reviewed-on: #88
2023-02-13 17:56:22 +04:00
616eaaa23a #81 -- Add async tasks 2023-02-13 17:54:49 +04:00
425ff70683 #81 -- Add new time series type 2023-02-13 12:03:13 +04:00
11b42d7e09 #81 -- Start indexing on failed tasks 2023-02-07 23:29:13 +04:00
98ec821748 #81 -- Show indexing status 2023-02-07 22:44:04 +04:00
f9fd839a14 #81 -- Add branch indexing status 2023-02-07 22:30:47 +04:00
5f9b91fd87 Merge pull request 'Декомпозиция' (#87) from 86-bl-decomposition into master
Reviewed-on: #87
2023-02-07 16:40:38 +04:00
4143fcfb20 #86 -- fix fuzzy inference 2023-02-07 16:36:32 +04:00
4216356c35 #86 -- divide bl 2023-02-06 13:54:12 +04:00
09ce44c33e Merge pull request 'list of assessments' (#85) from 84-list-of-consequents into master
Reviewed-on: #85
2023-02-02 13:05:27 +04:00
e4d32a3e92 #84 -- multiple assessments 2023-02-02 13:02:13 +04:00
36e2b09568 #84 -- fix integer cast 2023-02-02 01:01:03 +04:00
6bb39cc4d6 #84 -- fix output 2023-02-02 00:50:57 +04:00
14c17284bd #84 -- rename package 2023-02-01 22:51:12 +04:00
13ff304369 #84 -- change page content 2023-02-01 22:50:04 +04:00
f76976899d #84 -- change page route and semantic 2023-02-01 22:39:40 +04:00
9aa05b83e2 #80 -- fix forecasting 2023-02-01 14:36:07 +04:00
4d7f0f38b8 #80 -- fix forecasting 2023-02-01 01:40:34 +04:00
237a4f9980 fix time series name 2023-02-01 00:16:36 +04:00
412d22fafd #80 -- fix consequents 2023-02-01 00:15:59 +04:00
1cd53459ed #80 -- sout rules 2023-01-31 23:47:30 +04:00
9423af3863 #80 -- partially fix inference 2023-01-31 17:33:05 +04:00
ca3bfb62f8 #78 -- fix code 2022-12-22 16:52:40 +04:00
da3de8e4c8 #78 -- fix code 2022-12-22 16:33:54 +04:00
026299a370 Merge pull request '78-add-keeping-new-ts' (#79) from 78-add-keeping-new-ts into master
Reviewed-on: #79
2022-12-22 16:04:59 +04:00
df67684968 #78 -- fix code 2022-12-22 16:00:49 +04:00
23a852786a Merge branch 'master' into 78-add-keeping-new-ts
# Conflicts:
#	src/main/java/ru/ulstu/extractor/ts/model/TimeSeries.java
2022-12-22 15:59:12 +04:00
alexandra
33e426e7f5 #78 - Add Dummy 2022-12-22 15:53:08 +04:00
bf5220acd0 Merge pull request '74-add-jFuzzyLogic' (#75) from 74-add-jFuzzyLogic into master
Reviewed-on: #75
2022-11-28 01:00:07 +04:00
9ef1bb3072 #76 -- fix rules 2022-11-28 00:58:36 +04:00
0be5e9c77c #74 -- get time series tendency for rules 2022-11-27 22:09:07 +04:00
alexandra
4de0e37902 #78 - Add FileTS 2022-11-21 13:42:15 +04:00
BarminaA
3b7812a075 #76-create authorTS 2022-11-05 17:58:21 +04:00
8cb6fdf082 #76 -- fix part 2022-10-25 22:23:50 +04:00
c39bc3c6ca #74 -- fix 2022-10-25 16:51:51 +04:00
5ef8599576 #74 -- remove old dependencies 2022-10-25 16:31:31 +04:00
81bcc89096 #74 -- recommendations without time series data 2022-10-25 16:26:54 +04:00
591f183e8b #74 -- fix merge 2022-10-25 15:41:20 +04:00
12c28b9ba0 Merge branch 'master' into 74-add-jFuzzyLogic
# Conflicts:
#	src/main/java/ru/ulstu/extractor/core/Route.java
#	src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
#	src/main/resources/templates/listRules.html
2022-10-25 15:40:27 +04:00
1a0d57a78e #74 -- fix rules 2022-10-25 15:37:54 +04:00
5b080f41c2 #74 -- add new library, create middle service 2022-10-25 14:48:05 +04:00
f043e45b49 Merge remote-tracking branch 'origin/74-add-jFuzzyLogic' into 74-add-jFuzzyLogic
# Conflicts:
#	src/main/java/ru/ulstu/extractor/GitExtractorApplication.java
#	src/main/java/ru/ulstu/extractor/rule/service/FuzzyInferenceService.java
2022-10-25 14:46:24 +04:00
f2f53b1980 #74 -- add new library, create middle service 2022-10-25 14:44:27 +04:00
5e9afaaddd Merge pull request '76-edit-and-delete-rule' (#77) from 76-edit-and-delete-rule into master
Reviewed-on: #77
2022-10-24 17:05:15 +04:00
BarminaA
f7338f34c9 #76-fix removing rule 2022-10-24 17:03:43 +04:00
BarminaA
bf87d34f20 #76-add edit rule function 2022-10-24 16:55:43 +04:00
281d24bde2 #76 -- fix edit 2022-10-21 23:20:48 +04:00
301a32d610 #74 -- partially add middle logic 2022-10-21 23:02:27 +04:00
BarminaA
616bb3385e #76-add rule delete function 2022-10-21 13:07:34 +04:00
374415e154 #74 -- complete fis 2022-10-18 15:02:33 +04:00
00119b896c #74 -- add some fuzzy rules 2022-10-18 00:19:07 +04:00
f59dc9b523 Merge pull request 'ts types' (#73) from 72-ts-types into master
Reviewed-on: #73
2022-10-16 01:16:42 +04:00
49598824db #72 -- fix data model 2022-10-16 01:15:26 +04:00
bfec08c1f4 #72 -- add time series type 2022-10-15 23:37:22 +04:00
957c1bbc8c #72 -- classes refactor 2022-10-15 22:36:08 +04:00
9c6a7a170f Merge pull request '70-run-rules' (#71) from 70-run-rules into master
Reviewed-on: #71
2022-10-15 22:11:51 +04:00
BarminaA
76f1a60754 #70-add button 2022-10-15 20:43:33 +04:00
079babdf9c Merge pull request '68-add-rule' (#69) from 68-add-rule into master
Reviewed-on: #69
2022-10-15 20:04:12 +04:00
BarminaA
7dbe89169e #68-save rule in db 2022-10-15 14:26:53 +04:00
ff7c9ce665 Merge pull request '66-derivation-of-rules' (#67) from 66-derivation-of-rules into master
Reviewed-on: #67
2022-10-14 11:29:15 +04:00
BarminaA
2e18e34647 #66-view list rules 2022-10-14 11:27:27 +04:00
ac239d796c Merge pull request '64-model-rule' (#65) from #64-model-rule into master
Reviewed-on: #65
2022-10-13 15:34:05 +04:00
BarminaA
1621e151d9 #64-add model and changelog 2022-10-13 15:18:34 +04:00
BarminaA
c85c7e7917 #64-add model for rule 2022-10-09 08:01:10 +04:00
fd001da317 #59 -- sort time series values 2022-10-08 12:24:36 +04:00
cfe1197a3f Merge pull request '61-rules-pages' (#63) from 61-rules-pages into master
Reviewed-on: #63
2022-10-07 13:44:30 +04:00
BarminaA
ea6e77b9f9 #61-add pages for rules 2022-10-07 13:40:41 +04:00
b711d70eac fix time series name 2022-10-07 12:43:13 +04:00