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
|
4cef005934
|
Merge branch 'feature/node_impl' into develop
|
2020-12-27 17:21:24 +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 |
|
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 |
|
Nikita Iryupin
|
88543d0c68
|
Adding TODO and fixing after-merging code
|
2020-12-25 19:03:26 +01:00 |
|
Nikita Iryupin
|
270654e5ea
|
Merge branch 'feature/channel_impl' into develop
# Conflicts:
# src/main/java/cz/cvut/fel/sit/omo/foodchain/FoodChain.java
# src/main/java/cz/cvut/fel/sit/omo/foodchain/node/NodeBase.java
|
2020-12-25 18:56:21 +01:00 |
|
Nikita Iryupin
|
9d4bb41b54
|
Merge branch 'feature/factory_impl' into develop
|
2020-12-25 18:51:34 +01:00 |
|
Nikita Iryupin
|
43dd1adb91
|
Merge branch 'feature/scenario_impl' into develop
|
2020-12-25 18:50:31 +01:00 |
|
Tomáš Musil
|
9e8627cb86
|
Added money to Product
|
2020-12-25 18:46:06 +01:00 |
|
Daniel Poustka
|
8aa2c490c1
|
Fixed Product constructor usage
|
2020-12-25 18:45:57 +01:00 |
|
Tomáš Musil
|
ba84dfefe4
|
Added configuration and ChannelSubstcriptionType
|
2020-12-25 18:39:29 +01:00 |
|
Daniel Poustka
|
76ca92e676
|
Removed stuff
|
2020-12-25 17:48:46 +01:00 |
|
Daniel Poustka
|
7a92d623ac
|
Added config parse of channels to the FoodChain
Fixed stuff in factories
|
2020-12-25 17:46:55 +01:00 |
|
Daniel Poustka
|
71ef11f7e2
|
Added NodeFactory
|
2020-12-25 17:21:42 +01:00 |
|
Tomáš Musil
|
e3e289b9fd
|
Implemented more Steps, fixed some bugs, added helper methods
|
2020-12-25 17:17:49 +01:00 |
|
Nikita Iryupin
|
5e96891696
|
Start working on scenario, steps, iterator
|
2020-12-25 16:44:15 +01:00 |
|
Daniel Poustka
|
bce2b74ef2
|
Added ChannelFactory and ProductFactory make methods
|
2020-12-25 16:33:25 +01:00 |
|
Daniel Poustka
|
a6d4a423e0
|
Merge branch 'develop' into feature/factory_impl
|
2020-12-25 15:55:31 +01:00 |
|
Daniel Poustka
|
43eb9a2464
|
Added nothing in fact...
|
2020-12-25 15:53:17 +01:00 |
|
Nikita Iryupin
|
d9d15d2428
|
Merge branch 'feature/pool_parser_impl' into develop
|
2020-12-25 15:39:05 +01:00 |
|
Nikita Iryupin
|
2013cad84a
|
Merge branch 'feature/operation_impl' into develop
|
2020-12-25 15:38:41 +01:00 |
|
Nikita Iryupin
|
f1cad5d636
|
Merge branch 'feature/node_impl' into develop
|
2020-12-25 15:38:24 +01:00 |
|
Nikita Iryupin
|
e73762eec4
|
Some more fixes of NodeBase
|
2020-12-25 12:30:21 +01:00 |
|