]>
git.somenet.org - pub/jan/sbc.git/log
Jan Vales [Mon, 10 Jun 2013 18:38:47 +0000 (20:38 +0200)]
[JMS] Benchmark works somehow. (its run twice :/ )
Jan Vales [Mon, 10 Jun 2013 18:07:48 +0000 (20:07 +0200)]
[JMS] GroupGui now receives DeliveryOrder info
Jan Vales [Mon, 10 Jun 2013 17:24:41 +0000 (19:24 +0200)]
[JMS] Benchmarks are theoretically possible now. GroupGUI responsesmissing, so it wont work.
Jan Vales [Mon, 10 Jun 2013 16:29:35 +0000 (18:29 +0200)]
[JMS] added IF benchmark to Thread.sleep
Jan Vales [Mon, 10 Jun 2013 16:26:02 +0000 (18:26 +0200)]
[JMS] PizzeriaGUI now displays DeliveryOrders.
Gregor Riegler [Mon, 10 Jun 2013 15:26:22 +0000 (17:26 +0200)]
Merge it!
Gregor Riegler [Mon, 10 Jun 2013 15:23:56 +0000 (17:23 +0200)]
Merge branch 'master' of https://bitbucket.org/rgregor/sbc-ss-2013
Conflicts:
src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/DeliveryOverviewModel.java
Gregor Riegler [Mon, 10 Jun 2013 15:18:17 +0000 (17:18 +0200)]
[XVSM]Some NPE fixes, GUI fixes
Jan Vales [Mon, 10 Jun 2013 15:15:54 +0000 (17:15 +0200)]
[JMS] NEW WorkFlow works now.
Jan Vales [Mon, 10 Jun 2013 14:13:13 +0000 (16:13 +0200)]
[JMS] GG should be able to launch deliveryorders now.
Jan Vales [Mon, 10 Jun 2013 13:53:05 +0000 (15:53 +0200)]
[JMS] new WF works now (hopefully)
Someone [Mon, 10 Jun 2013 12:28:12 +0000 (14:28 +0200)]
[JMS] NEW Workflow: cook now gets the order.
Someone [Mon, 10 Jun 2013 11:59:47 +0000 (13:59 +0200)]
[JMS] Send DeliveryGroups to the waiter
Someone [Mon, 10 Jun 2013 00:39:10 +0000 (02:39 +0200)]
[JMS] NEW workflow outlined. implementation tomorrow.
Someone [Mon, 10 Jun 2013 00:01:41 +0000 (02:01 +0200)]
[JMS] OLD workflow now works with dynamic pizzerias.
Someone [Sun, 9 Jun 2013 23:04:13 +0000 (01:04 +0200)]
[JMS] debugging random behaviour
Someone [Sun, 9 Jun 2013 22:52:55 +0000 (00:52 +0200)]
[JMS] merged GroupAgent and added Util.runSimulation check.
Someone [Sun, 9 Jun 2013 22:41:18 +0000 (00:41 +0200)]
[JMS] added naming service + integrated with PG.
Gregor Riegler [Sun, 9 Jun 2013 17:08:53 +0000 (19:08 +0200)]
[XVSM] Some simulation result display
Gregor Riegler [Sun, 9 Jun 2013 16:42:19 +0000 (18:42 +0200)]
[XVSM] Some performance improvements for the simulation
Gregor Riegler [Sun, 9 Jun 2013 15:13:00 +0000 (17:13 +0200)]
Merge branch 'master' of https://bitbucket.org/rgregor/sbc-ss-2013
Gregor Riegler [Sun, 9 Jun 2013 15:11:53 +0000 (17:11 +0200)]
[XVSM] Some simulation support.
Someone [Sun, 9 Jun 2013 14:09:29 +0000 (16:09 +0200)]
more runscripts
Jan Vales [Sun, 9 Jun 2013 13:50:13 +0000 (15:50 +0200)]
[JMS] script to start scenario2.
Gregor Riegler [Sat, 8 Jun 2013 22:36:06 +0000 (00:36 +0200)]
[XVSM] Some GroupAgent Container Refactoring. Full Driver<->DeliveryCustomer communication lifecycle
Gregor Riegler [Fri, 7 Jun 2013 15:28:03 +0000 (17:28 +0200)]
[XVSM] Solve bug which made the GUI send customers to always the same Pizzeria
Gregor Riegler [Fri, 7 Jun 2013 12:02:46 +0000 (14:02 +0200)]
[XVSM] Delivery in progress, Delivery done updates in UIs, Delivery logic
Someone [Fri, 7 Jun 2013 02:31:37 +0000 (04:31 +0200)]
loadbalancer and some little changes.
Someone [Fri, 7 Jun 2013 01:46:19 +0000 (03:46 +0200)]
added my current auto-formatter rules so we get them consistent. feel free to change.
Someone [Fri, 7 Jun 2013 01:45:49 +0000 (03:45 +0200)]
added required server-URL parameter and Driver
Someone [Thu, 6 Jun 2013 22:46:13 +0000 (00:46 +0200)]
Erster Anlauf die Persistenz und Recovery von JMS zu beschreiben.
Gregor Riegler [Thu, 6 Jun 2013 22:28:57 +0000 (00:28 +0200)]
[XVSM] Crucial container communication changes
Gregor Riegler [Thu, 6 Jun 2013 14:50:18 +0000 (16:50 +0200)]
[XVSM] SpaceListener refactoring
Gregor Riegler [Thu, 6 Jun 2013 12:14:00 +0000 (14:14 +0200)]
[XVSM] Add forgotten file...
Gregor Riegler [Thu, 6 Jun 2013 12:13:05 +0000 (14:13 +0200)]
[XVSM] Create initial Pizzeria Recovery support.
Gregor Riegler [Thu, 6 Jun 2013 09:29:58 +0000 (11:29 +0200)]
[XVSM] Remove some containers of the Group Agent by introducing notifications of PIzzeria container changes for the Group Agent
Gregor Riegler [Fri, 31 May 2013 19:43:13 +0000 (21:43 +0200)]
Some UI Fixes in PizzeriaGUI inter-table communication.
[XVSM] Create delivery groups. Let the waiter answer the phone and take the order to the kitchen.
Gregor Riegler [Fri, 31 May 2013 11:55:25 +0000 (13:55 +0200)]
[XVSM] Pizzeria notifies on start Group agent that it exists. So the pizzeria can be selected in the group creation GUI.
[XVSM] Group Agent gets notified about changes in every pizzeria.
Gregor Riegler [Thu, 30 May 2013 14:53:25 +0000 (16:53 +0200)]
[XVSM] Waiters, Cooks and Pizzerias can be parameterized with a Space port. Group Agent can create groups for a specific pizzeria.
Gregor Riegler [Wed, 29 May 2013 16:27:09 +0000 (18:27 +0200)]
Adjust Pizzeria GUI to display delivery orders. Show pizzeria identifier in Group GUI.
Gregor Riegler [Tue, 28 May 2013 22:40:38 +0000 (00:40 +0200)]
Add wizard for creating delivery groups to GroupFrame
Gregor Riegler [Mon, 27 May 2013 16:16:32 +0000 (18:16 +0200)]
Create DeliveryGroup, DeliveryGroupData, DeliveryStatus. Add Deliveries overview table and model to Group GUI
Gregor Riegler [Mon, 27 May 2013 15:24:15 +0000 (17:24 +0200)]
Create Driver and DriverXVSM classes for XVSM
Gregor Riegler [Mon, 27 May 2013 15:07:26 +0000 (17:07 +0200)]
Make order ids pizzeria specific in XVSM implementation
Jan Vales [Tue, 14 May 2013 11:29:02 +0000 (13:29 +0200)]
hanged connectstring to be one global var.
Gregor Riegler [Sun, 12 May 2013 21:57:23 +0000 (23:57 +0200)]
Solve some bugs caused by incompatibilities of JMS and XVSM version
Gregor Riegler [Sun, 12 May 2013 21:43:34 +0000 (23:43 +0200)]
Merge branch 'master' of https://bitbucket.org/rgregor/sbc-ss-2013
Jan Vales [Sun, 12 May 2013 21:33:08 +0000 (23:33 +0200)]
A simple script to run a small JMS Pizzeria with 2 Cooks and 2 Waiters.
Jan Vales [Sun, 12 May 2013 21:27:56 +0000 (23:27 +0200)]
unified command line argument parsing a little.
Jan Vales [Sun, 12 May 2013 21:17:59 +0000 (23:17 +0200)]
added commandline argument parsing to allow custom IDs.
Gregor Riegler [Sun, 12 May 2013 18:14:13 +0000 (20:14 +0200)]
Merge branch 'master' of https://bitbucket.org/rgregor/sbc-ss-2013
Gregor Riegler [Sun, 12 May 2013 18:14:01 +0000 (20:14 +0200)]
Some small refactoring
Jan Vales [Sun, 12 May 2013 13:20:40 +0000 (15:20 +0200)]
JMS: pizzeriaGui now displays everything correctly.
Jan Vales [Sun, 12 May 2013 02:32:03 +0000 (04:32 +0200)]
removed debug create jms tables
Jan Vales [Sun, 12 May 2013 02:31:10 +0000 (04:31 +0200)]
fixed some synchronisation problems in jms.
Jan Vales [Sat, 11 May 2013 13:59:56 +0000 (15:59 +0200)]
GroupData changes now refresh the GroupGUI. Also synchronisation.
Jan Vales [Sat, 11 May 2013 13:46:54 +0000 (15:46 +0200)]
Waiters now deliver cooked orders
Jan Vales [Sat, 11 May 2013 13:37:08 +0000 (15:37 +0200)]
cook pizza orders and let the waiters to deliver them.
Jan Vales [Sat, 11 May 2013 13:17:34 +0000 (15:17 +0200)]
Waiter now sends the whole orderrequest to the Cook.
Gregor Riegler [Fri, 10 May 2013 23:47:30 +0000 (01:47 +0200)]
Solve some space concurrency bugs
Gregor Riegler [Fri, 10 May 2013 20:25:43 +0000 (22:25 +0200)]
Make cook and waiter look around for work to do if they are idle
Gregor Riegler [Fri, 10 May 2013 15:09:16 +0000 (17:09 +0200)]
Some space refactoring. Doing away with unnecessary containers. Auto-Reloading of Pizza and WaiterModels of pizzeriagui when pizza status changes
Gregor Riegler [Fri, 10 May 2013 01:41:24 +0000 (03:41 +0200)]
Space waiters pay and overall remaining space workflow refactoring
Gregor Riegler [Thu, 9 May 2013 20:00:56 +0000 (22:00 +0200)]
Space cooks prepare pizzas and Pizzeria GUI shows that
Gregor Riegler [Thu, 9 May 2013 13:32:15 +0000 (15:32 +0200)]
Space cook listens for pizza requests
Gregor Riegler [Thu, 9 May 2013 12:07:58 +0000 (14:07 +0200)]
Show orders in PizzeriaGUI
Gregor Riegler [Thu, 9 May 2013 00:42:52 +0000 (02:42 +0200)]
Waiter takes Order from guests
Gregor Riegler [Wed, 8 May 2013 22:12:37 +0000 (00:12 +0200)]
Show table and waiting group changes according to notifications in pizzeriaGUI and groupGUI
Gregor Riegler [Wed, 8 May 2013 15:25:50 +0000 (17:25 +0200)]
Waiter listens for free tables and for new guests. When a table gets free he tries to assign a waiting group to it. If a new guest arrives, he tries to found a free table and assign it.
Gregor Riegler [Mon, 6 May 2013 15:11:43 +0000 (17:11 +0200)]
XVSMConnector refactoring
Gregor Riegler [Mon, 6 May 2013 14:19:17 +0000 (16:19 +0200)]
Change the pizzeria models so that they display (more) correct values
Gregor Riegler [Mon, 6 May 2013 13:14:21 +0000 (15:14 +0200)]
Some debugging commenting/uncommenting
Gregor Riegler [Mon, 6 May 2013 12:13:15 +0000 (14:13 +0200)]
Merge branch 'master' of https://bitbucket.org/rgregor/sbc-ss-2013
Gregor Riegler [Mon, 6 May 2013 00:08:07 +0000 (02:08 +0200)]
Merge branch 'master' of
https://rgregor@bitbucket.org/rgregor/sbc-ss-2013.git
Conflicts:
src/main/java/at/ac/tuwien/sbc/valesriegler/group/Group.java
src/main/java/at/ac/tuwien/sbc/valesriegler/types/GroupData.java
Jan Vales [Mon, 6 May 2013 00:04:09 +0000 (02:04 +0200)]
added some not really helpful class descriptions + removed types that got duplicated. TODO remaining: fix pizzeriagui!
Gregor Riegler [Sun, 5 May 2013 23:50:20 +0000 (01:50 +0200)]
Support for space notifications for pizzeria and group agents. Change table model items type to a hash map. Replace primitive types in space class types to wrapper types.
Jan Vales [Sun, 5 May 2013 23:27:40 +0000 (01:27 +0200)]
the whole pizzeria workflow. EXCEPT cooking the pizzas.
Jan Vales [Sun, 5 May 2013 22:42:22 +0000 (00:42 +0200)]
added info to pizzeria when a püizza is done.
Gregor Riegler [Sun, 5 May 2013 20:40:15 +0000 (22:40 +0200)]
Merge branch 'master' of
https://rgregor@bitbucket.org/rgregor/sbc-ss-2013.git
Conflicts:
src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/PizzeriaAgent.java
src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/DEP_Table.java
src/main/java/at/ac/tuwien/sbc/valesriegler/types/GroupData.java
src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/XVSMConnector.java
Gregor Riegler [Sun, 5 May 2013 20:25:58 +0000 (22:25 +0200)]
Implement handleWaitingGroup+handleOrderRequest for XVSM waiter
Jan Vales [Sun, 5 May 2013 19:57:16 +0000 (21:57 +0200)]
GroupGui should display ordered pizzas correctly again.
Jan Vales [Sun, 5 May 2013 19:41:41 +0000 (21:41 +0200)]
Cook should now correctly produce pizzas.
Jan Vales [Sun, 5 May 2013 19:39:38 +0000 (21:39 +0200)]
implemented Workflow to "ordered", where the cook has pizzas to cook and another queue waiting for completed orders.
Jan Vales [Sun, 5 May 2013 19:14:36 +0000 (21:14 +0200)]
Hopefully storing all waiters that took care of a Group.
Jan Vales [Sun, 5 May 2013 19:08:06 +0000 (21:08 +0200)]
JMSCook now cooks Pizza out of PizzaOrder.
Jan Vales [Sun, 5 May 2013 18:17:56 +0000 (20:17 +0200)]
Implemented JMS OrderRequest sent by Group.
Jan Vales [Sun, 5 May 2013 18:03:23 +0000 (20:03 +0200)]
GroupAgent now handles Group creation and run-Group-as-Thread as expected
Jan Vales [Sun, 5 May 2013 17:10:43 +0000 (19:10 +0200)]
großer Brocken an GruppenGui-Änderungen kombiniert mit ersten Teil des Bestellworkflows.
Jan Vales [Sat, 4 May 2013 15:11:50 +0000 (17:11 +0200)]
prepare merge of jms branch.
Gregor Riegler [Wed, 1 May 2013 21:27:19 +0000 (23:27 +0200)]
First running MozartSpaces communication: PizzeriaGUI writes free tables to space after creation and a waiter can read it.
Gregor Riegler [Mon, 29 Apr 2013 12:04:26 +0000 (14:04 +0200)]
UI Fix: Handle the vertical size of tables correctly
Gregor Riegler [Fri, 26 Apr 2013 13:02:10 +0000 (15:02 +0200)]
Add logging file
Jan Vales [Fri, 26 Apr 2013 10:49:35 +0000 (12:49 +0200)]
early activemq producer/consumer implementation.
Jan Vales [Fri, 26 Apr 2013 10:49:02 +0000 (12:49 +0200)]
ignore persistent activemq data
Gregor Riegler [Thu, 25 Apr 2013 09:44:19 +0000 (11:44 +0200)]
Ask for number of tables on start of the Pizzeria GUI
Gregor Riegler [Wed, 24 Apr 2013 15:26:24 +0000 (17:26 +0200)]
Pizzeria GUI implemented
Gregor Riegler [Tue, 23 Apr 2013 17:20:49 +0000 (19:20 +0200)]
Basic Group GUI implementation
Gregor Riegler [Fri, 19 Apr 2013 13:48:36 +0000 (15:48 +0200)]
Make git store the directory structure needed by maven even if folders are empty
Gregor Riegler [Fri, 19 Apr 2013 13:42:48 +0000 (15:42 +0200)]
Import Maven Skeleton Project. Make Cook and Waiter executable by Maven plugin
Jan Vales [Mon, 15 Apr 2013 21:21:37 +0000 (23:21 +0200)]
Added .gitignore