This website requires JavaScript.
1e745e6ad0
Refactoring
develop
Tomáš Musil
2021-01-11 11:47:39 +01:00
b6a51a68d6
Add javadoc
Nikita Iryupin
2021-01-06 19:00:57 +01:00
af9d2796c3
Implemented ScurityReport and TransactionReport
Tomáš Musil
2021-01-05 22:25:05 +01:00
6c11f188ee
Completed scenarios.xml. Added Customer protection against eating non existing food. Added blocking of logs from Money.class Fixed some stuff and bugs.
Daniel Poustka
2021-01-05 21:42:52 +01:00
f1e66fc4b7
Finished food chain and parties report
Nikita Iryupin
2021-01-05 20:04:36 +01:00
80a52752e0
Changed project structure, fixed some stuff
Tomáš Musil
2021-01-05 18:43:47 +01:00
5ca75548bc
Merge branch 'develop' of gitlab.fel.cvut.cz:iryupnik/foodchainomo into develop
Tomáš Musil
2021-01-05 14:37:45 +01:00
ca6d4ca71e
Finished readme
Tomáš Musil
2021-01-05 14:37:26 +01:00
98bafaaa5c
Rename SecurityReportVisitor
Nikita Iryupin
2021-01-05 13:33:16 +01:00
d247c0a7ce
Added readme.md with list of implemented design patterns.
Daniel Poustka
2021-01-04 16:03:30 +01:00
6fac514d61
Merge branch 'feature/text_report_impl' into develop
Nikita Iryupin
2021-01-04 15:52:02 +01:00
fa4ea75a21
Implemented parties report
feature/text_report_impl
Nikita Iryupin
2021-01-04 15:51:13 +01:00
f189be1833
Changed ClassDiagram
Tomáš Musil
2021-01-04 15:51:06 +01:00
099dd81246
Merge branch 'develop' into feature/text_report_impl
Nikita Iryupin
2021-01-04 13:22:06 +01:00
fa825c70e3
Delete forgotten visit
Nikita Iryupin
2021-01-03 16:16:16 +01:00
a6d22fc87b
Added ReportLogger Refactored all System.out and System.err to usage of logger
Daniel Poustka
2021-01-03 14:32:59 +01:00
a0eca3740d
Merge branch 'develop' of gitlab.fel.cvut.cz:iryupnik/foodchainomo into develop
Tomáš Musil
2021-01-03 13:08:30 +01:00
e1ff0508ea
Added most of Javadoc
Tomáš Musil
2021-01-03 13:05:53 +01:00
0b240ab296
Remove unnecessary visit on Channel
Nikita Iryupin
2021-01-03 12:42:55 +01:00
172075612b
Merge branch 'develop' into feature/text_report_impl
Nikita Iryupin
2021-01-03 12:24:39 +01:00
79d7afecc5
[Draft] Recononstruct Reporting for 3 types of Visitors, add ReportBuilder
Nikita Iryupin
2021-01-03 12:22:33 +01:00
2b297efc38
Merge remote-tracking branch 'origin/develop' into develop
Daniel Poustka
2021-01-03 11:48:48 +01:00
f5c2ad80a7
Refactored document parsing in main(). Added configuration file paths from args.
Daniel Poustka
2021-01-03 11:48:31 +01:00
5e9113cb98
Merge branch 'develop' into feature/text_report_impl
Nikita Iryupin
2021-01-03 11:43:02 +01:00
a2b5c2bc92
Merge branch 'feature/node_impl' into develop
Nikita Iryupin
2021-01-03 11:34:56 +01:00
3d19e55912
Added product type to actions
feature/node_impl
Tomáš Musil
2021-01-03 11:27:52 +01:00
d045767027
Added containsProduct in Storage.
Daniel Poustka
2021-01-03 11:08:23 +01:00
bfde92e92c
Merge branch 'feature/node_impl' into develop
Nikita Iryupin
2020-12-29 12:04:21 +01:00
ad71021bd5
Separated products into Storage entity (for each Node). Added some JavaDoc
Daniel Poustka
2020-12-28 18:49:58 +01:00
63a4697a64
Changed NodeBase structure a bit
Tomáš Musil
2020-12-28 16:54:34 +01:00
06dc9e86f0
Merge branch 'feature/node_impl' into develop
Nikita Iryupin
2020-12-28 10:14:35 +01:00
1bea53d11b
Added refusedRequirements
Tomáš Musil
2020-12-27 20:42:02 +01:00
4fba75b0e1
Added setStateToInRequirement that I forgot earlier
feature/channel_impl
Tomáš Musil
2020-12-27 19:11:07 +01:00
1771fc0fdb
Added new ProductState and improved product state machine
Tomáš Musil
2020-12-27 19:06:57 +01:00
b9c5f92045
Added EAR diagram (Product State Machine)
Nikita Iryupin
2020-12-27 19:03:45 +01:00
fadc4732a9
[Draft] Work on visitors (need some renovation)
Nikita Iryupin
2020-12-27 19:01:40 +01:00
3118f91a42
Merge branch 'develop' into feature/text_report_impl
Nikita Iryupin
2020-12-27 17:21:56 +01:00
4cef005934
Merge branch 'feature/node_impl' into develop
Nikita Iryupin
2020-12-27 17:21:24 +01:00
7f5dace718
Start implimentating report on Node
Nikita Iryupin
2020-12-27 17:20:00 +01:00
59246406a6
Added simple error if node cannot do a action due to ProductTypeOperation restrictions
Daniel Poustka
2020-12-27 12:22:59 +01:00
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
Daniel Poustka
2020-12-27 12:18:46 +01:00
8f8bc9f4aa
Solved double spending, added haggling
Tomáš Musil
2020-12-27 11:37:39 +01:00
5426ffcf02
Prepare visitor and objects for reporting
Nikita Iryupin
2020-12-27 11:13:17 +01:00
c0fc73218e
[Draft] Implemented receiveTransaction
Tomáš Musil
2020-12-26 20:05:33 +01:00
c81e2b0332
Merge branch 'feature/factory_impl' into develop
Nikita Iryupin
2020-12-26 17:00:51 +01:00
12fc7a1309
Implemented requirement acceptance
Tomáš Musil
2020-12-26 16:59:00 +01:00
faffec4f1c
Fixed NodeFactory enum check
feature/factory_impl
Daniel Poustka
2020-12-26 15:46:57 +01:00
853bf05ee5
Moving nodes classes to directories, create new enum, limit sellers and purchasers
Nikita Iryupin
2020-12-26 15:43:33 +01:00
3aaa5c72e6
Merge branch 'feature/factory_impl' into develop
Nikita Iryupin
2020-12-26 15:08:36 +01:00
6acad973fd
Added small fixes in ScenarioFactory
Daniel Poustka
2020-12-26 14:39:14 +01:00
cbfe3617f2
Merge remote-tracking branch 'origin/feature/factory_impl' into feature/factory_impl
Daniel Poustka
2020-12-26 14:34:58 +01:00
0fbe472261
Implemeneted tick (basic)
feature/pool_parser_impl
Tomáš Musil
2020-12-26 14:23:14 +01:00
624b18bd79
Merge branch 'feature/factory_impl' into develop
Nikita Iryupin
2020-12-26 12:43:37 +01:00
21f5d14406
Implemented ScenarioFactory
Tomáš Musil
2020-12-26 12:40:31 +01:00
a459317c69
Merge remote-tracking branch 'origin/feature/factory_impl' into feature/factory_impl
Daniel Poustka
2020-12-26 11:39:00 +01:00
e58392f5be
Improved object generation
Tomáš Musil
2020-12-26 11:36:06 +01:00
0ba95a1728
Improved object generation
Tomáš Musil
2020-12-26 11:31:57 +01:00
d6eb56a3ad
Replace bulder of Money to Money.of
Nikita Iryupin
2020-12-26 11:28:04 +01:00
3fd3e36c76
Merge branch 'develop' into feature/factory_impl
Daniel Poustka
2020-12-26 11:17:56 +01:00
e31a80ec69
Fix Money dependency in pom
Nikita Iryupin
2020-12-26 11:17:32 +01:00
cfbe22d6c1
Fixed config path
Daniel Poustka
2020-12-26 11:09:59 +01:00
01e43e20a7
Fixed path to config
Daniel Poustka
2020-12-26 10:35:53 +01:00
b77e9a690a
Fixed startMoney for Nodes and Product
Daniel Poustka
2020-12-26 10:30:22 +01:00
015d558afe
Merge branch 'develop' into feature/factory_impl
Daniel Poustka
2020-12-26 10:26:27 +01:00
bd5c5f1a98
Fixed Node subscription
Daniel Poustka
2020-12-26 10:22:36 +01:00
0bb5af4968
Changed constructors
Tomáš Musil
2020-12-26 10:19:30 +01:00
22369d7b70
Fixed some stuff
Daniel Poustka
2020-12-26 10:16:42 +01:00
643bf23c0b
Added channel and nodes parsing into main Small refactoring
Daniel Poustka
2020-12-25 20:47:39 +01:00
88543d0c68
Adding TODO and fixing after-merging code
Nikita Iryupin
2020-12-25 19:03:26 +01:00
270654e5ea
Merge branch 'feature/channel_impl' into develop
Nikita Iryupin
2020-12-25 18:56:21 +01:00
9d4bb41b54
Merge branch 'feature/factory_impl' into develop
Nikita Iryupin
2020-12-25 18:51:34 +01:00
43dd1adb91
Merge branch 'feature/scenario_impl' into develop
Nikita Iryupin
2020-12-25 18:50:31 +01:00
9e8627cb86
Added money to Product
Tomáš Musil
2020-12-25 18:46:06 +01:00
8aa2c490c1
Fixed Product constructor usage
Daniel Poustka
2020-12-25 18:45:57 +01:00
ba84dfefe4
Added configuration and ChannelSubstcriptionType
Tomáš Musil
2020-12-25 18:39:29 +01:00
76ca92e676
Removed stuff
Daniel Poustka
2020-12-25 17:48:46 +01:00
7a92d623ac
Added config parse of channels to the FoodChain Fixed stuff in factories
Daniel Poustka
2020-12-25 17:46:55 +01:00
71ef11f7e2
Added NodeFactory
Daniel Poustka
2020-12-25 17:21:42 +01:00
e3e289b9fd
Implemented more Steps, fixed some bugs, added helper methods
feature/scenario_impl
Tomáš Musil
2020-12-25 17:17:49 +01:00
5e96891696
Start working on scenario, steps, iterator
Nikita Iryupin
2020-12-25 16:44:15 +01:00
bce2b74ef2
Added ChannelFactory and ProductFactory make methods
Daniel Poustka
2020-12-25 16:33:25 +01:00
a6d4a423e0
Merge branch 'develop' into feature/factory_impl
Daniel Poustka
2020-12-25 15:55:31 +01:00
43eb9a2464
Added nothing in fact...
Daniel Poustka
2020-12-25 15:53:17 +01:00
d9d15d2428
Merge branch 'feature/pool_parser_impl' into develop
Nikita Iryupin
2020-12-25 15:39:05 +01:00
2013cad84a
Merge branch 'feature/operation_impl' into develop
Nikita Iryupin
2020-12-25 15:38:41 +01:00
f1cad5d636
Merge branch 'feature/node_impl' into develop
Nikita Iryupin
2020-12-25 15:38:24 +01:00
e73762eec4
Some more fixes of NodeBase
Nikita Iryupin
2020-12-25 12:30:21 +01:00
6a7fc972fd
Added functions (need consultation)
Nikita Iryupin
2020-12-23 16:46:08 +01:00
42cc9d6ebb
Implemented Requirement, added Ticker
feature/operation_impl
Tomáš Musil
2020-12-23 13:18:13 +01:00
666abbe2e1
Implemented ConfigurationParser + result, removed IPool
Tomáš Musil
2020-12-23 12:34:44 +01:00
4193fdade4
Initialize branch
Nikita Iryupin
2020-12-22 19:57:22 +01:00
de87d1780d
Initialize branch
Nikita Iryupin
2020-12-22 17:05:07 +01:00
6f7c11a878
After-merge repair, delete all unnecessary interfaces
Nikita Iryupin
2020-12-22 16:54:31 +01:00
e0b53db736
Merge branch 'feature/operation_impl' into develop
Nikita Iryupin
2020-12-22 16:37:51 +01:00
371b47ac31
Merge branch 'feature/node_impl' into develop
Nikita Iryupin
2020-12-22 16:37:15 +01:00
127bdd1270
Added end to Transaction and Action, improved Signature
Tomáš Musil
2020-12-22 16:33:40 +01:00
8b47edd07b
Merge remote-tracking branch 'origin/feature/channel_impl' into feature/channel_impl
Daniel Poustka
2020-11-30 16:11:43 +01:00
90ff7af47e
Added observer and observable interface, implemented observable on ChannelBase
Nikita Iryupin
2020-11-30 16:10:49 +01:00
d3378d37d4
Fixed intterface and abstract class after consultansion
Nikita Iryupin
2020-11-30 15:39:49 +01:00
32468b44f0
Changed current operation from IOperation to OperationBase
Daniel Poustka
2020-11-30 15:23:07 +01:00