Resolve "Score of order depends on remaining time"

Closes #128 (closed)

cooperative_cuisine/configs/study/study_config.yaml

@@ -6,16 +6,15 @@ levels:
     name: "Level 1"
     seed: 12345
     config_overwrite:
-      player_config:
-        speed_units_per_seconds: 5
       game:
         time_limit_seconds: 300
-        validate_recipes: false
+        validate_recipes: true
       plates:
         clean_plates: 0
         dirty_plates: 0
         return_dirty: true
       orders:
+        serving_not_ordered_meals: false
         meals:
           all: false
           list:
@@ -29,8 +28,22 @@ levels:
           sample_on_dur_random_func:
             func: uniform
             kwargs:
-              a: 45
-              b: 35
+              a: 20
+              b: 30
+
+      hook_callbacks:
+        orders:
+          hooks: [ completed_order ]
+          callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
+          callback_class_kwargs:
+            time_dependence_func: !!python/name:cooperative_cuisine.scores.stepped_score ''
+            time_dependence_kwargs:
+              score_ratios: [ 0.5, 1, 1 ]
+              steps: [ 0, 0.25, 0.66 ]
+              round_decimals: 0
+            static_score: 20
+            score_on_specific_kwarg: meal_name
+            score_map: [ ]
 
   - config_path: CONFIGS_DIR/environment_config.yaml
     layout_path: LAYOUTS_DIR/study_layouts/1-4-bottleneck.layout
@@ -38,8 +51,6 @@ levels:
     name: "Level 2"
     seed: 12345
     config_overwrite:
-      player_config:
-        speed_units_per_seconds: 5
       game:
         time_limit_seconds: 300
       plates:
@@ -47,6 +58,7 @@ levels:
         dirty_plates: 0
         return_dirty: true
       orders:
+        serving_not_ordered_meals: false
         meals:
           all: false
           list:
@@ -61,8 +73,24 @@ levels:
           sample_on_dur_random_func:
             func: uniform
             kwargs:
-              a: 45
-              b: 35
+              a: 20
+              b: 30
+      hook_callbacks:
+        orders:
+          hooks: [ completed_order ]
+          callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
+          callback_class_kwargs:
+            time_dependence_func: !!python/name:cooperative_cuisine.scores.stepped_score ''
+            time_dependence_kwargs:
+              score_ratios: [ 0.5, 1, 1 ]
+              steps: [ 0, 0.25, 0.66 ]
+              round_decimals: 0
+            static_score: 20
+            score_on_specific_kwarg: meal_name
+            score_map:
+              Burger: 40
+              Salad: 20
+              TomatoSoup: 35
 
   - config_path: CONFIGS_DIR/environment_config.yaml
     layout_path: LAYOUTS_DIR/study_layouts/1-5-circle.layout
@@ -70,8 +98,6 @@ levels:
     name: "Level 3"
     seed: 12345
     config_overwrite:
-      player_config:
-        speed_units_per_seconds: 5
       game:
         time_limit_seconds: 300
         validate_recipes: true
@@ -80,6 +106,7 @@ levels:
         dirty_plates: 0
         return_dirty: true
       orders:
+        serving_not_ordered_meals: false
         meals:
           all: false
           list:
@@ -93,9 +120,21 @@ levels:
           sample_on_dur_random_func:
             func: uniform
             kwargs:
-              a: 45
-              b: 35
-
+              a: 20
+              b: 30
+      hook_callbacks:
+        orders:
+          hooks: [ completed_order ]
+          callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
+          callback_class_kwargs:
+            time_dependence_func: !!python/name:cooperative_cuisine.scores.stepped_score ''
+            time_dependence_kwargs:
+              score_ratios: [ 0.5, 1, 1 ]
+              steps: [ 0, 0.25, 0.66 ]
+              round_decimals: 0
+            static_score: 20
+            score_on_specific_kwarg: meal_name
+            score_map: [ ]
 
   - config_path: CONFIGS_DIR/environment_config.yaml
     layout_path: LAYOUTS_DIR/study_layouts/forced-cooperation.layout
@@ -103,15 +142,14 @@ levels:
     name: "Level 4"
     seed: 12345
     config_overwrite:
-      player_config:
-        speed_units_per_seconds: 300
       game:
-        time_limit_seconds: 10
+        time_limit_seconds: 300
       plates:
         clean_plates: 0
         dirty_plates: 0
         return_dirty: true
       orders:
+        serving_not_ordered_meals: false
         meals:
           all: false
           list:
@@ -127,8 +165,25 @@ levels:
           sample_on_dur_random_func:
             func: uniform
             kwargs:
-              a: 40
-              b: 50
+              a: 20
+              b: 30
+      hook_callbacks:
+        orders:
+          hooks: [ completed_order ]
+          callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
+          callback_class_kwargs:
+            time_dependence_func: !!python/name:cooperative_cuisine.scores.stepped_score ''
+            time_dependence_kwargs:
+              score_ratios: [ 0.5, 1, 1 ]
+              steps: [ 0, 0.25, 0.66 ]
+              round_decimals: 0
+            static_score: 20
+            score_on_specific_kwarg: meal_name
+            score_map:
+              Burger: 40
+              Salad: 20
+              Chips: 10
+              BurgerWithChips: 60
 
 num_players: 1
 num_bots: 0