|
@@ -1,8 +1,8 @@
|
|
|
<solver xmlns="https://www.optaplanner.org/xsd/solver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.optaplanner.org/xsd/solver https://www.optaplanner.org/xsd/solver/solver.xsd">
|
|
<solver xmlns="https://www.optaplanner.org/xsd/solver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.optaplanner.org/xsd/solver https://www.optaplanner.org/xsd/solver/solver.xsd">
|
|
|
<!-- Define the model -->
|
|
<!-- Define the model -->
|
|
|
- <solutionClass>fr.jaquin.bdlg.planner.domain.Planning</solutionClass>
|
|
|
|
|
- <entityClass>fr.jaquin.bdlg.planner.domain.MealAssignement</entityClass>
|
|
|
|
|
- <entityClass>fr.jaquin.bdlg.planner.domain.Assignement</entityClass>
|
|
|
|
|
|
|
+ <solutionClass>fr.jaquin.bdlg.planner.solver.domain.Planning</solutionClass>
|
|
|
|
|
+ <entityClass>fr.jaquin.bdlg.planner.solver.domain.MealAssignement</entityClass>
|
|
|
|
|
+ <entityClass>fr.jaquin.bdlg.planner.solver.domain.Assignement</entityClass>
|
|
|
|
|
|
|
|
<!-- Define the score function -->
|
|
<!-- Define the score function -->
|
|
|
<scoreDirectorFactory>
|
|
<scoreDirectorFactory>
|
|
@@ -19,12 +19,12 @@
|
|
|
<constructionHeuristic>
|
|
<constructionHeuristic>
|
|
|
<queuedEntityPlacer>
|
|
<queuedEntityPlacer>
|
|
|
<entitySelector>
|
|
<entitySelector>
|
|
|
- <entityClass>fr.jaquin.bdlg.planner.domain.MealAssignement</entityClass>
|
|
|
|
|
|
|
+ <entityClass>fr.jaquin.bdlg.planner.solver.domain.MealAssignement</entityClass>
|
|
|
</entitySelector>
|
|
</entitySelector>
|
|
|
<unionMoveSelector>
|
|
<unionMoveSelector>
|
|
|
<changeMoveSelector>
|
|
<changeMoveSelector>
|
|
|
<entitySelector>
|
|
<entitySelector>
|
|
|
- <entityClass>fr.jaquin.bdlg.planner.domain.MealAssignement</entityClass>
|
|
|
|
|
|
|
+ <entityClass>fr.jaquin.bdlg.planner.solver.domain.MealAssignement</entityClass>
|
|
|
</entitySelector>
|
|
</entitySelector>
|
|
|
<valueSelector variableName="mealSlot" />
|
|
<valueSelector variableName="mealSlot" />
|
|
|
</changeMoveSelector>
|
|
</changeMoveSelector>
|
|
@@ -35,12 +35,12 @@
|
|
|
<constructionHeuristic>
|
|
<constructionHeuristic>
|
|
|
<queuedEntityPlacer>
|
|
<queuedEntityPlacer>
|
|
|
<entitySelector>
|
|
<entitySelector>
|
|
|
- <entityClass>fr.jaquin.bdlg.planner.domain.Assignement</entityClass>
|
|
|
|
|
|
|
+ <entityClass>fr.jaquin.bdlg.planner.solver.domain.Assignement</entityClass>
|
|
|
</entitySelector>
|
|
</entitySelector>
|
|
|
<unionMoveSelector>
|
|
<unionMoveSelector>
|
|
|
<changeMoveSelector>
|
|
<changeMoveSelector>
|
|
|
<entitySelector>
|
|
<entitySelector>
|
|
|
- <entityClass>fr.jaquin.bdlg.planner.domain.Assignement</entityClass>
|
|
|
|
|
|
|
+ <entityClass>fr.jaquin.bdlg.planner.solver.domain.Assignement</entityClass>
|
|
|
</entitySelector>
|
|
</entitySelector>
|
|
|
<valueSelector variableName="volonteer" />
|
|
<valueSelector variableName="volonteer" />
|
|
|
</changeMoveSelector>
|
|
</changeMoveSelector>
|
|
@@ -52,19 +52,19 @@
|
|
|
<unionMoveSelector>
|
|
<unionMoveSelector>
|
|
|
<changeMoveSelector>
|
|
<changeMoveSelector>
|
|
|
<entitySelector>
|
|
<entitySelector>
|
|
|
- <entityClass>fr.jaquin.bdlg.planner.domain.MealAssignement</entityClass>
|
|
|
|
|
|
|
+ <entityClass>fr.jaquin.bdlg.planner.solver.domain.MealAssignement</entityClass>
|
|
|
</entitySelector>
|
|
</entitySelector>
|
|
|
<valueSelector variableName="mealSlot" />
|
|
<valueSelector variableName="mealSlot" />
|
|
|
</changeMoveSelector>
|
|
</changeMoveSelector>
|
|
|
<changeMoveSelector>
|
|
<changeMoveSelector>
|
|
|
<entitySelector>
|
|
<entitySelector>
|
|
|
- <entityClass>fr.jaquin.bdlg.planner.domain.Assignement</entityClass>
|
|
|
|
|
|
|
+ <entityClass>fr.jaquin.bdlg.planner.solver.domain.Assignement</entityClass>
|
|
|
</entitySelector>
|
|
</entitySelector>
|
|
|
<valueSelector variableName="volonteer" />
|
|
<valueSelector variableName="volonteer" />
|
|
|
</changeMoveSelector>
|
|
</changeMoveSelector>
|
|
|
<swapMoveSelector>
|
|
<swapMoveSelector>
|
|
|
<entitySelector>
|
|
<entitySelector>
|
|
|
- <entityClass>fr.jaquin.bdlg.planner.domain.Assignement</entityClass>
|
|
|
|
|
|
|
+ <entityClass>fr.jaquin.bdlg.planner.solver.domain.Assignement</entityClass>
|
|
|
</entitySelector>
|
|
</entitySelector>
|
|
|
</swapMoveSelector>
|
|
</swapMoveSelector>
|
|
|
</unionMoveSelector>
|
|
</unionMoveSelector>
|