Skip to content
Snippets Groups Projects
Commit 2c824f03 authored by Fabian Heinrich's avatar Fabian Heinrich
Browse files

Merge remote-tracking branch 'origin/main' into...

Merge remote-tracking branch 'origin/main' into 102-too-large-number-of-selected-players-does-not-break-the-gui-and-environment

# Conflicts:
#	cooperative_cuisine/environment.py
parents c45545fb a103b0ad
No related branches found
No related tags found
1 merge request!72Resolve "Too large number of selected players does not break the gui and environment"
......@@ -14,8 +14,7 @@ meals:
# if all: false -> only orders for these meals are generated
# TODO: what if this list is empty?
list:
- Salad
- TomatoSoup
- Burger
layout_chars:
_: Free
......
......@@ -379,11 +379,15 @@ class RandomOrderGeneration(OrderGeneration):
self.number_cur_orders = self.kwargs.num_start_meals
if not self.kwargs.sample_on_serving:
self.create_random_next_time_delta(now)
return self.create_orders_for_meals(
self.random.choices(self.available_meals, k=self.kwargs.num_start_meals),
now,
self.kwargs.sample_on_serving,
)
if self.available_meals:
return self.create_orders_for_meals(
self.random.choices(
self.available_meals, k=self.kwargs.num_start_meals
),
now,
self.kwargs.sample_on_serving,
)
return []
def get_orders(
self,
......@@ -392,6 +396,8 @@ class RandomOrderGeneration(OrderGeneration):
new_finished_orders: list[Order],
expired_orders: list[Order],
) -> list[Order]:
if not self.available_meals:
return []
self.number_cur_orders -= len(new_finished_orders)
self.number_cur_orders -= len(expired_orders)
if self.kwargs.sample_on_serving:
......
......@@ -265,6 +265,8 @@ class Validation:
# print("FINAL MEALS:", meals_to_be_ordered)
def get_recipe_graphs(self) -> list[MealGraphDict]:
if not self.order_manager.available_meals:
return []
os.makedirs(ROOT_DIR / "generated", exist_ok=True)
# time_start = time.time()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment