fix

PierpaoloSpadafora · Dec 12, 2024 · f6159f3 · f6159f3
1 parent 651ae95
commit f6159f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Backend/src/main/java/unical/demacs/rdm/utils/ScheduleConstraintConfiguration.java b/Backend/src/main/java/unical/demacs/rdm/utils/ScheduleConstraintConfiguration.java
@@ -19,7 +19,7 @@ public class ScheduleConstraintConfiguration {
     private HardSoftScore jobDueDate = HardSoftScore.ofHard(1);
 
     @ConstraintWeight("High priority jobs first")
-    private HardSoftScore highPriorityJobsFirst = HardSoftScore.ofSoft(1);
+    private HardSoftScore highPriorityJobsFirst = HardSoftScore.ofSoft(2500);
 
     @ConstraintWeight("Short duration jobs first")
     private HardSoftScore shortDurationJobsFirst = HardSoftScore.ofSoft(1);

diff --git a/Backend/src/main/java/unical/demacs/rdm/utils/ScheduleConstraintProvider.java b/Backend/src/main/java/unical/demacs/rdm/utils/ScheduleConstraintProvider.java
@@ -100,16 +100,22 @@ private Constraint balanceMachineLoad(ConstraintFactory constraintFactory) {
                 .forEach(JobAssignment.class)
                 .groupBy(JobAssignment::getAssignedMachine,
                         sum(ja -> Math.toIntExact(ja.getSchedule().getDuration())))
-                .penalize(HardSoftScore.ONE_SOFT.multiply(100),
+                .penalize(HardSoftScore.ONE_SOFT.multiply(50),  // Reduced weight
                         (machine, totalDuration) -> totalDuration / 3600)
                 .asConstraint("Balance machine load");
     }
 
     private Constraint prioritizeHighPriorityJobs(ConstraintFactory constraintFactory) {
         return constraintFactory
                 .forEach(JobAssignment.class)
-                .reward(HardSoftScore.ONE_SOFT.multiply(3),
-                        ja -> ja.getSchedule().getJob().getPriority().ordinal() * 100)
+                .filter(ja -> ja.getStartTimeGrain() != null)
+                .penalize(HardSoftScore.ONE_SOFT.multiply(2000),
+                        ja -> {
+                            int priorityFactor = (3 - ja.getSchedule().getJob().getPriority().ordinal());
+                            long timeDelay = (ja.getStartTimeInSeconds() - 
+                                ja.getSchedule().getStartTime().toEpochSecond(ZoneOffset.UTC)) / 3600;
+                            return (int)(priorityFactor * timeDelay * timeDelay);
+                        })
                 .asConstraint("High priority jobs first");
     }
 
@@ -127,7 +133,7 @@ private Constraint distributeJobsAcrossMachines(ConstraintFactory constraintFact
                 .groupBy(
                     ja -> ja.getSchedule().getMachineType().getId()
                 )
-                .reward(HardSoftScore.ONE_SOFT.multiply(1000))
+                .reward(HardSoftScore.ONE_SOFT.multiply(500))
                 .asConstraint("Distribute jobs across machines");
     }