solver configuration, minimum group size constraint removed

UrszulaNeuman · Nov 18, 2015 · f25cd54 · f25cd54
1 parent 545385e
commit f25cd54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/src/main/resources/scheduling.drl b/src/main/resources/scheduling.drl
@@ -139,17 +139,6 @@ rule "groupSizeHard"
  scoreHolder.addHardConstraintMatch(kcontext,-groupHard*$total.intValue());
 end
 
-rule "groupSizeHard11"
- when
- Allocation($aid : ID, getShift() != null, $ashiftID : getShift().getID(), getPerson() != null, $aPersonID : getPerson().getID())
- $total : Number(intValue < 1) from accumulate(
- $a : Allocation(ID!=$aid, getShift() != null, getShift().getID() == $ashiftID, getPerson().getID() != $aPersonID), 
- count($a)
- )
- then
-
- scoreHolder.addHardConstraintMatch(kcontext, -1);
-end
 
 
 rule "noOverlappingAllocationsHard"

diff --git a/src/main/resources/solverConfig.xml b/src/main/resources/solverConfig.xml
@@ -20,8 +20,8 @@
 
  <termination>
  <terminationCompositionStyle>OR</terminationCompositionStyle>
- <hoursSpentLimit>3</hoursSpentLimit> 
- <unimprovedMinutesSpentLimit>30</unimprovedMinutesSpentLimit>
+ <minutesSpentLimit>3</minutesSpentLimit> 
+ <unimprovedMinutesSpentLimit>1</unimprovedMinutesSpentLimit>
  </termination>
  <constructionHeuristic>
  <constructionHeuristicType>FIRST_FIT</constructionHeuristicType>