Please consider reading this README-file at our github repo, where it is formatted in a more pleasent way.
We had only some small changes.
We've introduced a door-class. The door is the gate into the bar. It will reject customers when the bar is closed. The landlord will get a list of customers inside the bar by asking the door.
We have many classes in our solution. However, they are quite small. That also makes the code much more maintainiable and very nice overall.
Furthermore we are using unittesting.
We have unfortunately not tested all classes and all behaviours. We have tested the following:
- Door - We tested overall functionality, in these tests we also simultenously tested Person class
- Table - We tested overall functionality
- Cupboard - We tested thoroughly all possible ways to make ingredients by randomized testing. And therfor 'proved' that there won't be any deadlock.
The classes TestPerson
and TestAll
are pure testclasses.
Imporant Note: We have used semaphores and synchronized at places sometimes, and if they are not used for statstics they are used for testing!
That should be ok. ~~ Nicholas Smallbone, 2011
One source of deadlock is the taking of ingredients in a bad order. Its simple to see that it never happens unless you somehow take the ingredients in different orders for the LL and BM. Furthermor we have actually tested it (see testing above).
The assistant is having it's own cycle and is always cleaning the tables, therfor the customers cant get stuck waiting to put down their glasses. And the customers wont get stuck in the queue because of that the servants don't lock as stated in the paragraph above.
The Cupboard has only one inni, so it really cant get stuck without being able to listen. That means it will always appreciate putbacks of glasses and cups, therfor the Mixologists won't ever get deadlocked waiting for beverageware.
Sensible constants are already into Global.jr
. So the simulation should start by simply running the main of Simulation.jr
. The predefined values are so the closing time should be in 18 irl seconds, that is a half hour in the simulation.
Please first look at the planing and the pictures below.
By now you have a pretty good understanding of our intentions. However we will now dig into some details.
We only use one process for each thing, we don't share any memory except for the read-only variables in Item/Beverage/BeverageWare. One exception is that the persons write down their waiting time into a commong list which the LL later reads.
Below is a list of all classes and a short summary.
It is very like our flow chart, only that it doesn't leave upon closal, no, it leaves when the landlord tells him too. He don't even care about calls for closing. The landlord tells the assistant to go home when only those two are left in the bar.
Needs no explenation, as it elegantly matches our flow chart below.
There are totally 3 beverage objects in the simulation. They contain a list of ingredients and what beverageware it should served in and how long it takes to drink it.
extends Item
Contains how much space it takes. (1 for glasses 2 for cups), there are only 2 objects of this ever created.
Unchanged
One can aquire one item and put back one item. It will only receive aquitre-messages if it already contains that item. It contains methods to access its start and end contents, it's used by the landlord to gather statistics.
We solved the last orders problem as recommended in the assignment description. Codewise this results in that we listen to the closing time channel at two different places.
This is a class with constants, references and more.
Global contains a reference to everything static in the bar, that is everything but the customers. Also it declares constants for the all kinds of items, which are references used all over the program where appropriate.
It also contains the lists of ingredients needed to make a drink or what beverageware a drink comes in.
Either an ingredient or a beverageware.
This quite similar to our flowchart, only that the landlord tells the assistant to do his final round when everybody else have left the bar. The door kindly informs the landlord of both when two persons are left (LL + assistant) and when only LL is left.
The landlord does not put the tables and cupboard to sleep, the deadlock detection kills them.
Important Note: We have serious problems shutdowning the clock, most likely it's a JR bug. Please see the comments in the code where we've explained the matter in more detail. The result of this is that the landlord never exits the bar as it should, but again it's probably JRs fault.
BM and LL derives from this abstract class. It contains a method for mixing drinks.
Unchanged.
Abstract class that each person implements, it captures the common essence of entering/leaving the door and their loopical lifestyles.
Kickstarts the simulation creating 1 customer per simulation minute.
Contains one simple method for sleeping x simulation seconds.
The table only takes glasses when the table have space for them.
Runs all the tests. Will only pass if it prints all tests passed. (Otherwise it might just be deadlock detection terminating the program)
A class Door uses in the testing. This was a poor choice as it's no longer unit testing anymore.
This is what we first did before starting coding, and of course the diagrams below don't always exactly correspond to our current code, but they are pictorially describing how our code works quite accurately.