nikita/food-chain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113 Commits 9 Branches 0 Tags
Commit Graph

113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Poustka
6c11f188ee Completed scenarios.xml. 
Added Customer protection against eating non existing food.
Added blocking of logs from Money.class
Fixed some stuff and bugs.
 2021-01-05 21:42:52 +01:00
Nikita Iryupin
f1e66fc4b7 Finished food chain and parties report 2021-01-05 20:04:36 +01:00
Tomáš Musil
80a52752e0 Changed project structure, fixed some stuff 2021-01-05 18:43:47 +01:00
Tomáš Musil
5ca75548bc Merge branch 'develop' of gitlab.fel.cvut.cz:iryupnik/foodchainomo into develop 2021-01-05 14:37:45 +01:00
Tomáš Musil
ca6d4ca71e Finished readme 2021-01-05 14:37:26 +01:00
Nikita Iryupin
98bafaaa5c Rename SecurityReportVisitor 2021-01-05 13:33:16 +01:00
Daniel Poustka
d247c0a7ce Added readme.md with list of implemented design patterns. 2021-01-04 16:03:30 +01:00
Nikita Iryupin
6fac514d61 Merge branch 'feature/text_report_impl' into develop 2021-01-04 15:52:02 +01:00
Nikita Iryupin
fa4ea75a21 Implemented parties report 2021-01-04 15:51:13 +01:00
Tomáš Musil
f189be1833 Changed ClassDiagram 2021-01-04 15:51:06 +01:00
Nikita Iryupin
099dd81246 Merge branch 'develop' into feature/text_report_impl 
# Conflicts:
#	src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/NodeBase.java
#	src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/OperationBase.java
 2021-01-04 13:22:06 +01:00
Nikita Iryupin
fa825c70e3 Delete forgotten visit 2021-01-03 16:16:16 +01:00
Daniel Poustka
a6d22fc87b Added ReportLogger 
Refactored all System.out and System.err to usage of logger
 2021-01-03 14:32:59 +01:00
Tomáš Musil
a0eca3740d Merge branch 'develop' of gitlab.fel.cvut.cz:iryupnik/foodchainomo into develop 2021-01-03 13:08:30 +01:00
Tomáš Musil
e1ff0508ea Added most of Javadoc 2021-01-03 13:05:53 +01:00
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