Nikita Iryupin
|
0b240ab296
|
Remove unnecessary visit on Channel
|
2021-01-03 12:42:55 +01:00 |
|
Nikita Iryupin
|
172075612b
|
Merge branch 'develop' into feature/text_report_impl
# Conflicts:
# src/main/java/cz/cvut/fel/sit/omo/foodchain/FoodChain.java
|
2021-01-03 12:24:39 +01:00 |
|
Nikita Iryupin
|
79d7afecc5
|
[Draft] Recononstruct Reporting for 3 types of Visitors, add ReportBuilder
|
2021-01-03 12:22:33 +01:00 |
|
Daniel Poustka
|
2b297efc38
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/cz/cvut/fel/sit/omo/foodchain/FoodChain.java
|
2021-01-03 11:48:48 +01:00 |
|
Daniel Poustka
|
f5c2ad80a7
|
Refactored document parsing in main().
Added configuration file paths from args.
|
2021-01-03 11:48:31 +01:00 |
|
Nikita Iryupin
|
5e9113cb98
|
Merge branch 'develop' into feature/text_report_impl
|
2021-01-03 11:43:02 +01:00 |
|
Nikita Iryupin
|
a2b5c2bc92
|
Merge branch 'feature/node_impl' into develop
|
2021-01-03 11:34:56 +01:00 |
|
Tomáš Musil
|
3d19e55912
|
Added product type to actions
|
2021-01-03 11:27:52 +01:00 |
|
Daniel Poustka
|
d045767027
|
Added containsProduct in Storage.
|
2021-01-03 11:08:23 +01:00 |
|
Nikita Iryupin
|
bfde92e92c
|
Merge branch 'feature/node_impl' into develop
|
2020-12-29 12:04:21 +01:00 |
|
Daniel Poustka
|
ad71021bd5
|
Separated products into Storage entity (for each Node).
Added some JavaDoc
|
2020-12-28 18:49:58 +01:00 |
|
Tomáš Musil
|
63a4697a64
|
Changed NodeBase structure a bit
|
2020-12-28 16:54:34 +01:00 |
|
Nikita Iryupin
|
06dc9e86f0
|
Merge branch 'feature/node_impl' into develop
|
2020-12-28 10:14:35 +01:00 |
|
Tomáš Musil
|
1bea53d11b
|
Added refusedRequirements
|
2020-12-27 20:42:02 +01:00 |
|
Tomáš Musil
|
4fba75b0e1
|
Added setStateToInRequirement that I forgot earlier
|
2020-12-27 19:11:07 +01:00 |
|
Tomáš Musil
|
1771fc0fdb
|
Added new ProductState and improved product state machine
|
2020-12-27 19:06:57 +01:00 |
|
Nikita Iryupin
|
b9c5f92045
|
Added EAR diagram (Product State Machine)
|
2020-12-27 19:03:45 +01:00 |
|
Nikita Iryupin
|
fadc4732a9
|
[Draft] Work on visitors (need some renovation)
|
2020-12-27 19:01:40 +01:00 |
|
Nikita Iryupin
|
3118f91a42
|
Merge branch 'develop' into feature/text_report_impl
|
2020-12-27 17:21:56 +01:00 |
|
Nikita Iryupin
|
4cef005934
|
Merge branch 'feature/node_impl' into develop
|
2020-12-27 17:21:24 +01:00 |
|
Nikita Iryupin
|
7f5dace718
|
Start implimentating report on Node
|
2020-12-27 17:20:00 +01:00 |
|
Daniel Poustka
|
59246406a6
|
Added simple error if node cannot do a action due to ProductTypeOperation restrictions
|
2020-12-27 12:22:59 +01:00 |
|
Daniel Poustka
|
e25879bcb6
|
Added new enum instances of ProductOperationType,
Added NodeType for each Node
Added NodeBase.doAction over whole stock
Added check if action is allowed to NodeBase.doAction
|
2020-12-27 12:18:46 +01:00 |
|
Tomáš Musil
|
8f8bc9f4aa
|
Solved double spending, added haggling
|
2020-12-27 11:37:39 +01:00 |
|
Nikita Iryupin
|
5426ffcf02
|
Prepare visitor and objects for reporting
|
2020-12-27 11:13:17 +01:00 |
|
Tomáš Musil
|
c0fc73218e
|
[Draft] Implemented receiveTransaction
|
2020-12-26 20:05:33 +01:00 |
|
Nikita Iryupin
|
c81e2b0332
|
Merge branch 'feature/factory_impl' into develop
|
2020-12-26 17:00:51 +01:00 |
|
Tomáš Musil
|
12fc7a1309
|
Implemented requirement acceptance
|
2020-12-26 16:59:00 +01:00 |
|
Daniel Poustka
|
faffec4f1c
|
Fixed NodeFactory enum check
|
2020-12-26 15:46:57 +01:00 |
|
Nikita Iryupin
|
853bf05ee5
|
Moving nodes classes to directories, create new enum, limit sellers and purchasers
|
2020-12-26 15:43:33 +01:00 |
|
Nikita Iryupin
|
3aaa5c72e6
|
Merge branch 'feature/factory_impl' into develop
|
2020-12-26 15:08:36 +01:00 |
|
Daniel Poustka
|
6acad973fd
|
Added small fixes in ScenarioFactory
|
2020-12-26 14:39:14 +01:00 |
|
Daniel Poustka
|
cbfe3617f2
|
Merge remote-tracking branch 'origin/feature/factory_impl' into feature/factory_impl
|
2020-12-26 14:34:58 +01:00 |
|
Tomáš Musil
|
0fbe472261
|
Implemeneted tick (basic)
|
2020-12-26 14:23:14 +01:00 |
|
Nikita Iryupin
|
624b18bd79
|
Merge branch 'feature/factory_impl' into develop
# Conflicts:
# src/main/java/cz/cvut/fel/sit/omo/foodchain/product/Product.java
|
2020-12-26 12:43:37 +01:00 |
|
Tomáš Musil
|
21f5d14406
|
Implemented ScenarioFactory
|
2020-12-26 12:40:31 +01:00 |
|
Daniel Poustka
|
a459317c69
|
Merge remote-tracking branch 'origin/feature/factory_impl' into feature/factory_impl
|
2020-12-26 11:39:00 +01:00 |
|
Tomáš Musil
|
e58392f5be
|
Improved object generation
|
2020-12-26 11:36:06 +01:00 |
|
Tomáš Musil
|
0ba95a1728
|
Improved object generation
|
2020-12-26 11:31:57 +01:00 |
|
Nikita Iryupin
|
d6eb56a3ad
|
Replace bulder of Money to Money.of
|
2020-12-26 11:28:04 +01:00 |
|
Daniel Poustka
|
3fd3e36c76
|
Merge branch 'develop' into feature/factory_impl
|
2020-12-26 11:17:56 +01:00 |
|
Nikita Iryupin
|
e31a80ec69
|
Fix Money dependency in pom
|
2020-12-26 11:17:32 +01:00 |
|
Daniel Poustka
|
cfbe22d6c1
|
Fixed config path
|
2020-12-26 11:09:59 +01:00 |
|
Daniel Poustka
|
01e43e20a7
|
Fixed path to config
|
2020-12-26 10:35:53 +01:00 |
|
Daniel Poustka
|
b77e9a690a
|
Fixed startMoney for Nodes and Product
|
2020-12-26 10:30:22 +01:00 |
|
Daniel Poustka
|
015d558afe
|
Merge branch 'develop' into feature/factory_impl
# Conflicts:
# src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/NodeFactory.java
# src/main/java/cz/cvut/fel/sit/omo/foodchain/product/Product.java
|
2020-12-26 10:26:27 +01:00 |
|
Daniel Poustka
|
bd5c5f1a98
|
Fixed Node subscription
|
2020-12-26 10:22:36 +01:00 |
|
Tomáš Musil
|
0bb5af4968
|
Changed constructors
|
2020-12-26 10:19:30 +01:00 |
|
Daniel Poustka
|
22369d7b70
|
Fixed some stuff
|
2020-12-26 10:16:42 +01:00 |
|
Daniel Poustka
|
643bf23c0b
|
Added channel and nodes parsing into main
Small refactoring
|
2020-12-25 20:47:39 +01:00 |
|