Skip to content
Snippets Groups Projects
Commit d98c7894 authored by Felix Blanke's avatar Felix Blanke
Browse files

Rename method to AKCategory.create_category_optimizer_constraints

parent 831f2416
No related branches found
No related tags found
No related merge requests found
Pipeline #279714 passed
...@@ -364,7 +364,7 @@ class Event(models.Model): ...@@ -364,7 +364,7 @@ class Event(models.Model):
:yield: Block of optimizer timeslots as the discretization result. :yield: Block of optimizer timeslots as the discretization result.
:ytype: list of OptimizerTimeslot :ytype: list of OptimizerTimeslot
""" """
all_category_constraints = AKCategory.create_category_constraints( all_category_constraints = AKCategory.create_category_optimizer_constraints(
AKCategory.objects.filter(event=self).all() AKCategory.objects.filter(event=self).all()
) )
...@@ -389,7 +389,7 @@ class Event(models.Model): ...@@ -389,7 +389,7 @@ class Event(models.Model):
slot_index = 0 slot_index = 0
for block_slot in DefaultSlot.objects.filter(event=self).order_by("start", "end"): for block_slot in DefaultSlot.objects.filter(event=self).order_by("start", "end"):
category_constraints = AKCategory.create_category_constraints( category_constraints = AKCategory.create_category_optimizer_constraints(
block_slot.primary_categories.all() block_slot.primary_categories.all()
) )
...@@ -760,7 +760,7 @@ class AKCategory(models.Model): ...@@ -760,7 +760,7 @@ class AKCategory(models.Model):
return self.name return self.name
@staticmethod @staticmethod
def create_category_constraints(categories: Iterable["AKCategory"]) -> set[str]: def create_category_optimizer_constraints(categories: Iterable["AKCategory"]) -> set[str]:
"""Create a set of constraint strings from an AKCategory iterable. """Create a set of constraint strings from an AKCategory iterable.
:param categories: The iterable of categories to derive the constraint strings from. :param categories: The iterable of categories to derive the constraint strings from.
...@@ -1265,7 +1265,7 @@ class AKSlot(models.Model): ...@@ -1265,7 +1265,7 @@ class AKSlot(models.Model):
data["time_constraints"].extend(_owner_time_constraints(owner)) data["time_constraints"].extend(_owner_time_constraints(owner))
if self.ak.category: if self.ak.category:
category_constraints = AKCategory.create_category_constraints([self.ak.category]) category_constraints = AKCategory.create_category_optimizer_constraints([self.ak.category])
data["time_constraints"].extend(category_constraints) data["time_constraints"].extend(category_constraints)
if self.fixed and self.room is not None: if self.fixed and self.room is not None:
......
...@@ -328,7 +328,7 @@ class JSONExportTest(TestCase): ...@@ -328,7 +328,7 @@ class JSONExportTest(TestCase):
# add time constraints for AK category # add time constraints for AK category
if slot.ak.category: if slot.ak.category:
category_constraints = AKCategory.create_category_constraints( category_constraints = AKCategory.create_category_optimizer_constraints(
[slot.ak.category] [slot.ak.category]
) )
time_constraints |= category_constraints time_constraints |= category_constraints
...@@ -597,7 +597,7 @@ class JSONExportTest(TestCase): ...@@ -597,7 +597,7 @@ class JSONExportTest(TestCase):
# add category constraints # add category constraints
fulfilled_time_constraints |= ( fulfilled_time_constraints |= (
AKCategory.create_category_constraints( AKCategory.create_category_optimizer_constraints(
[ [
cat cat
for cat in AKCategory.objects.filter( for cat in AKCategory.objects.filter(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment