Ispravke u solveru

Author: popovic-olivera

src/main/kotlin/data/Repository.kt

@@ -40,7 +40,7 @@ object Repository {
         override fun toString() = when(this) {
             L -> "Profesor matematike i računarstva"
             M -> "Teorijska matematika i primene"
-            R -> "Računrastvo i informatika"
+            R -> "Računarstvo i informatika"
             N -> "Primenjena matematika"
             V -> "Statistika, aktuarska matematika i finansijska matematika"
             I -> "Informatika"

src/main/kotlin/scheduler/Day.kt

@@ -4,19 +4,7 @@ import java.io.Serializable
 import java.time.DayOfWeek
 
 /**
- * Ovo će biti klasa koju planer neće moći da menja tj. da dodeljuje satima kurseve
+ * Ovo će biti klasa koju planer neće moći da menja
  */
 
-data class Day (var dayName: DayOfWeek = DayOfWeek.MONDAY) : Serializable {
-    override fun toString(): String {
-       return when (dayName) {
-           DayOfWeek.MONDAY -> "ponedeljak"
-           DayOfWeek.TUESDAY -> "utorak"
-           DayOfWeek.WEDNESDAY -> "sreda"
-           DayOfWeek.THURSDAY -> "četvrtak"
-           DayOfWeek.FRIDAY -> "petak"
-
-           else -> ""
-       }
-    }
-}
+data class Day (var dayName: DayOfWeek = DayOfWeek.MONDAY) : Serializable

src/main/kotlin/scheduler/Scheduler.kt

@@ -13,27 +13,28 @@ fun generateTimetablesTask(courses: List<Course>) = runAsync {
     val solverFactory : SolverFactory<Timetable> = SolverFactory.createFromXmlResource("scheduler/solver/timetableSolverConfig.xml")
     val solver : Solver<Timetable> = solverFactory.buildSolver()
 
-    val dayList : MutableList<Day> = mutableListOf( Day(DayOfWeek.MONDAY),
-                                                    Day(DayOfWeek.TUESDAY),
-                                                    Day(DayOfWeek.WEDNESDAY),
-                                                    Day(DayOfWeek.THURSDAY),
-                                                    Day(DayOfWeek.FRIDAY))
+    val dayList : List<Day> = listOf(Day(DayOfWeek.MONDAY),
+                                     Day(DayOfWeek.TUESDAY),
+                                     Day(DayOfWeek.WEDNESDAY),
+                                     Day(DayOfWeek.THURSDAY),
+                                     Day(DayOfWeek.FRIDAY))
 
     val unsolvedTimetable = Timetable(courses, dayList)
 
-    solver.addEventListener {
-        if (it.newBestScore?.isSolutionInitialized == true) {
-            updateBestSolution(it.newBestSolution)
-            println(it.newBestScore)
-        }
+    for(course in courses) {
+        println(course.toString())
     }
+
     val solvedTimetable : Timetable = solver.solve(unsolvedTimetable)
 
     for(course in solvedTimetable.courseList) {
         println(course.toString())
     }
 
-    println(solvedTimetable.score) // Najbolji pronađen rezultat
+    println(solvedTimetable.score?.hardScore) // Najbolji pronađen rezultat
+    println(solvedTimetable.score?.softScore)
+
+    updateBestSolution(solvedTimetable)
 }
 
 fun updateBestSolution(timetable: Timetable) {

src/main/resources/scheduler/solver/timetableSolverConfig.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <solver>
     <!-- Definisanje modela -->
-    <scanAnnotatedClasses>
-    </scanAnnotatedClasses>
+    <solutionClass>scheduler.Timetable</solutionClass>
+    <entityClass>data.Course</entityClass>
 
     <!-- Definisanje funkcije za računanje rezultata -->
     <scoreDirectorFactory>