Fixed score calculation

antoninkriz · Aug 29, 2023 · 30f4d4a · 30f4d4a
1 parent a6b43f0
commit 30f4d4a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/ctu-timetable-generator/src/app/generator/_worker/processing.ts b/ctu-timetable-generator/src/app/generator/_worker/processing.ts
@@ -8,6 +8,8 @@ function scoreTimetable(timetable: LinkedList<EventCompact>[]) {
 
   for (const dayList of timetable) {
     if (dayList.isEmpty()) continue;
+    // Penalty for each day, therefore fewer days taken equals better score
+    score += 24 * 60;
 
     const { start } = dayList.begin().value;
     let { end } = dayList.begin().value;
@@ -36,7 +38,6 @@ function timeTableAddParallel(
       continue;
     }
 
-    // TODO: Fix time compare type + logic
     let success = false;
     for (const lle of singleDay) {
       if (lle.value.start >= eventNew.end) {

diff --git a/ctu-timetable-generator/src/app/generator/_worker/worker.ts b/ctu-timetable-generator/src/app/generator/_worker/worker.ts
@@ -36,21 +36,21 @@ addEventListener('message', async (event: MessageEvent<MessageData>) => {
             // Push both S and L version when the week is null
             arr.push({
               day: timeTableEvent.day,
-              start: timeTableEvent.start[0] * 100 + timeTableEvent.start[1],
-              end: timeTableEvent.end[0] * 100 + timeTableEvent.end[1],
+              start: timeTableEvent.start[0] * 60 + timeTableEvent.start[1],
+              end: timeTableEvent.end[0] * 60 + timeTableEvent.end[1],
               week: true,
             } as EventCompact);
             arr.push({
               day: timeTableEvent.day,
-              start: timeTableEvent.start[0] * 100 + timeTableEvent.start[1],
-              end: timeTableEvent.end[0] * 100 + timeTableEvent.end[1],
+              start: timeTableEvent.start[0] * 60 + timeTableEvent.start[1],
+              end: timeTableEvent.end[0] * 60 + timeTableEvent.end[1],
               week: false,
             } as EventCompact);
           } else {
             arr.push({
               day: timeTableEvent.day,
-              start: timeTableEvent.start[0] * 100 + timeTableEvent.start[1],
-              end: timeTableEvent.end[0] * 100 + timeTableEvent.end[1],
+              start: timeTableEvent.start[0] * 60 + timeTableEvent.start[1],
+              end: timeTableEvent.end[0] * 60 + timeTableEvent.end[1],
               week: timeTableEvent.week === WeekType.Odd,
             } as EventCompact);
           }