From eb46755940c9d92d66d761e9e6fd6fc0900c7022 Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Wed, 3 Apr 2024 10:36:37 +0200
Subject: [PATCH] Adjusted processing times for study

---
 cooperative_cuisine/configs/item_info.yaml    | 18 +++++-----
 .../configs/study/study_config.yaml           | 33 ++++++++++---------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/cooperative_cuisine/configs/item_info.yaml b/cooperative_cuisine/configs/item_info.yaml
index 5bfe9904..6cd26e3b 100644
--- a/cooperative_cuisine/configs/item_info.yaml
+++ b/cooperative_cuisine/configs/item_info.yaml
@@ -74,55 +74,55 @@ Sausage:
 ChoppedTomato:
   type: Ingredient
   needs: [ Tomato ]
-  seconds: 4.0
+  seconds: 2.6
   equipment: CuttingBoard
 
 ChoppedLettuce:
   type: Ingredient
   needs: [ Lettuce ]
-  seconds: 3.0
+  seconds: 2.6
   equipment: CuttingBoard
 
 ChoppedOnion:
   type: Ingredient
   needs: [ Onion ]
-  seconds: 4.0
+  seconds: 2.6
   equipment: CuttingBoard
 
 RawPatty:
   type: Ingredient
   needs: [ Meat ]
-  seconds: 4.0
+  seconds: 2.6
   equipment: CuttingBoard
 
 RawChips:
   type: Ingredient
   needs: [ Potato ]
-  seconds: 4.0
+  seconds: 2.6
   equipment: CuttingBoard
 
 ChoppedFish:
   type: Ingredient
   needs: [ Fish ]
-  seconds: 4.0
+  seconds: 2.6
   equipment: CuttingBoard
 
 PizzaBase:
   type: Ingredient
   needs: [ Dough ]
-  seconds: 4.0
+  seconds: 2.6
   equipment: CuttingBoard
 
 GratedCheese:
   type: Ingredient
   needs: [ Cheese ]
-  seconds: 4.0
+  seconds: 2.6
   equipment: CuttingBoard
 
 ChoppedSausage:
   type: Ingredient
   needs: [ Sausage ]
-  seconds: 4.0
+  seconds: 2.6
   equipment: CuttingBoard
 
 CookedPatty:
diff --git a/cooperative_cuisine/configs/study/study_config.yaml b/cooperative_cuisine/configs/study/study_config.yaml
index d491af88..13849e1a 100644
--- a/cooperative_cuisine/configs/study/study_config.yaml
+++ b/cooperative_cuisine/configs/study/study_config.yaml
@@ -2,6 +2,7 @@ levels:
 
   - config_path: CONFIGS_DIR/environment_config.yaml
     layout_path: LAYOUTS_DIR/study_layouts/1-1-far-apart.layout
+    #    layout_path: LAYOUTS_DIR/zztest_layouts/screenshot_tutorial.layout
     item_info_path: CONFIGS_DIR/item_info.yaml
     name: "Level 1"
     seed: 12345
@@ -23,13 +24,13 @@ levels:
         order_gen_kwargs:
           order_duration_random_func:
             kwargs:
-              a: 60
-              b: 70
+              a: 55
+              b: 65
           sample_on_dur_random_func:
             func: uniform
             kwargs:
-              a: 20
-              b: 30
+              a: 18
+              b: 28
 
       hook_callbacks:
         orders:
@@ -68,13 +69,13 @@ levels:
         order_gen_kwargs:
           order_duration_random_func:
             kwargs:
-              a: 60
-              b: 70
+              a: 54
+              b: 64
           sample_on_dur_random_func:
             func: uniform
             kwargs:
-              a: 20
-              b: 30
+              a: 18
+              b: 28
       hook_callbacks:
         orders:
           hooks: [ completed_order ]
@@ -115,13 +116,13 @@ levels:
         order_gen_kwargs:
           order_duration_random_func:
             kwargs:
-              a: 60
-              b: 70
+              a: 54
+              b: 60
           sample_on_dur_random_func:
             func: uniform
             kwargs:
-              a: 20
-              b: 30
+              a: 18
+              b: 26
       hook_callbacks:
         orders:
           hooks: [ completed_order ]
@@ -160,13 +161,13 @@ levels:
         order_gen_kwargs:
           order_duration_random_func:
             kwargs:
-              a: 60
-              b: 70
+              a: 50
+              b: 60
           sample_on_dur_random_func:
             func: uniform
             kwargs:
-              a: 20
-              b: 30
+              a: 22
+              b: 24
       hook_callbacks:
         orders:
           hooks: [ completed_order ]
-- 
GitLab