Merge pull request #121 from Mala1180/feature/fix-problem-next

Feature/fix-problem-next

src/main/scala/satify/model/problems/NurseScheduling.scala

@@ -66,7 +66,7 @@ case class NurseScheduling(nurses: Int, days: Int, shifts: Int) extends Problem:
   )
 
   def toString(assignment: Assignment): String =
-    var output = s"There are $shifts shifts a day\n" +
+    var output = s"There are $shifts shifts per day\n" +
       "Min shifts per nurse " + minShiftsPerNurse + "\n" +
       "Max shifts per nurse " + maxShiftsPerNurse + "\n"
 
@@ -75,9 +75,9 @@ case class NurseScheduling(nurses: Int, days: Int, shifts: Int) extends Problem:
         variables.filter(_.value).foreach { v =>
           val name = v.name
           val nurse = "Nurse-" + name.split("_d")(0).replace("n", "")
-          val day = "Day " + name.split("_s")(0).last
+          val day = "day " + name.split("_s")(0).last
           val shift = name.split("_s")(1)
-          output += s"$nurse works $day at the shift number $shift\n"
+          output += s"$nurse works $day at the shift $shift\n"
         }
         output
       case _ => output

src/main/scala/satify/view/View.scala

@@ -34,7 +34,7 @@ object View:
           contents += new BoxPanel(Orientation.Vertical):
             contents += new ScrollPane(createOutputTextArea(sol.print, 30, 35))
             if model.problem.isDefined && model.solution.get.result == Result.SAT then
-              contents += createShowSection(model.problem.get, model.solution.get.assignment.head)
+              contents += createShowSection(model.problem.get, model.solution.get.assignment.last)
             sol.status match
               case PARTIAL => contents += createNextSection(model)
               case _ =>

src/test/scala/satify/problems/NurseSchedulingTest.scala

@@ -11,14 +11,14 @@ import satify.update.solver.{Solver, SolverType}
 
 class NurseSchedulingTest extends AnyFlatSpec with Matchers:
 
-  "NurseScheduling 2 nurses with 5 days and 2 shifts" should "be UNSAT" in {
-    val problem = NurseScheduling(2, 5, 2)
-    /*val sol = Solver(DPLL).solve(problem.exp)
-    sol should matchPattern { case Solution(UNSAT, _, _) => }*/
+  "Scheduling of 2 nurses, 2 days and 3 shifts" should "be UNSAT" in {
+    val problem = NurseScheduling(2, 2, 3)
+    val sol = Solver(DPLL).solve(problem.exp)
+    sol should matchPattern { case Solution(UNSAT, _, _) => }
   }
 
-  "NurseScheduling 3 nurses with 1 days and 3 shifts" should "be SAT" in {
+  "Scheduling of 3 nurses, 1 days and 3 shifts" should "be SAT" in {
     val problem = NurseScheduling(3, 1, 3)
-    /*val sol = Solver(DPLL).solve(problem.exp)
-    sol should matchPattern { case Solution(SAT, _, _) => }*/
+    val sol = Solver(DPLL).solve(problem.exp)
+    sol should matchPattern { case Solution(SAT, _, _) => }
   }