Fix bug on slot-forced topics, and adds test

gaelrenoux · May 7, 2023 · cec81c0 · cec81c0
1 parent f7e492b
commit cec81c0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/main/scala/fr/renoux/gaston/model/impl/ProblemImpl.scala b/src/main/scala/fr/renoux/gaston/model/impl/ProblemImpl.scala
@@ -46,8 +46,8 @@ final class ProblemImpl(
     val couples = for {
       slot <- slots
       topic <- topics
-      if topic.mandatory.exists(!slot.personsPresent.contains(_))
-      if topic.slots.exists(!_.contains(slot))
+      if !topic.virtual // Virtual topics are never moved anyway
+      if topic.mandatory.exists(!slot.personsPresent.contains(_)) || topic.slots.exists(!_.contains(slot))
     } yield (slot, topic)
     couples.groupToMap.toBitMap(Set.empty)
   }

diff --git a/src/test/scala/fr/renoux/gaston/input/InputTranscriptionSpec.scala b/src/test/scala/fr/renoux/gaston/input/InputTranscriptionSpec.scala
@@ -194,4 +194,25 @@ class InputTranscriptionSpec extends AnyFlatSpec with Matchers {
     }
   }
 
+
+
+  behavior of "Incompatible topics per slot"
+
+  {
+    it should "work for slot-specific topics" in {
+      val inputSlots = List(List(InputSlot("one"), InputSlot("two")))
+      val inputTopics = List(InputTopic("alpha", slots = Some(Set("two"))), InputTopic("beta"))
+      val inputPersons = List(InputPerson("Arnold", mandatory = Set("alpha")))
+      val inputModel = InputModel(
+        slots = inputSlots,
+        topics = inputTopics,
+        persons = inputPersons
+      )
+      implicit val problem: Problem = from(inputModel)
+      problem.incompatibleTopicsBySlot.get(slot"one").get should be(Set(t"alpha"))
+      problem.incompatibleTopicsBySlot.get(slot"two").get should be(Set.empty)
+    }
+
+  }
+
 }