PLANNER-352 use field annotations on the cheap time example (=> integ…

…ration test) + add in docs overview
kiegroup · Jun 16, 2015 · b738a21 · b738a21
1 parent 7487a5f
commit b738a21
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 17 deletions.
diff --git a/.../src/main/docbook/en-US/Chapter-Use_cases_and_examples/Chapter-Use_cases_and_examples.xml b/.../src/main/docbook/en-US/Chapter-Use_cases_and_examples/Chapter-Use_cases_and_examples.xml
@@ -206,7 +206,7 @@
 
             <entry><itemizedlist>
                 <listitem>
-                  <para>Decision Table spreadsheet for score constraints</para>
+                  <para>Decision Table spreadsheet (XLS) for score constraints</para>
                 </listitem>
               </itemizedlist></entry>
           </row>
@@ -396,12 +396,20 @@
 
             <entry><itemizedlist>
                 <listitem>
-                  <para><link linkend="customVariableListener">VariableListener</link></para>
+                  <para><link linkend="shadowVariable">Shadow variable</link></para>
                 </listitem>
 
                 <listitem>
                   <para><link linkend="realTimePlanning">Real-time planning</link></para>
                 </listitem>
+
+                <listitem>
+                  <para><link linkend="nearbySelection">Nearby selection</link></para>
+                </listitem>
+
+                <listitem>
+                  <para>Real road distances</para>
+                </listitem>
               </itemizedlist></entry>
           </row>
 
@@ -438,13 +446,9 @@
                 </listitem>
               </itemizedlist></entry>
 
-            <entry><itemizedlist>
+            <entry><para>Extra on Vehicle routing:</para><itemizedlist>
-                <listitem>
-                  <para><link linkend="customVariableListener">VariableListener</link></para>
-                </listitem>
-
                 <listitem>
-                  <para><link linkend="realTimePlanning">Real-time planning</link></para>
+                  <para>Custom <link linkend="customVariableListener">VariableListener</link></para>
                 </listitem>
               </itemizedlist></entry>
           </row>
@@ -496,7 +500,11 @@
                 </listitem>
 
                 <listitem>
-                  <para><link linkend="customVariableListener">VariableListener</link></para>
+                  <para>Custom <link linkend="customVariableListener">VariableListener</link></para>
+                </listitem>
+
+                <listitem>
+                  <para><link linkend="valueRangeFactory">ValueRangeFactory</link></para>
                 </listitem>
               </itemizedlist></entry>
           </row>
@@ -585,7 +593,7 @@
 
             <entry><itemizedlist>
                 <listitem>
-                  <para><link linkend="customVariableListener">VariableListener</link></para>
+                  <para>Custom <link linkend="customVariableListener">VariableListener</link></para>
                 </listitem>
               </itemizedlist></entry>
           </row>
@@ -675,7 +683,11 @@
                 </listitem>
               </itemizedlist></entry>
 
-            <entry>None</entry>
+            <entry><itemizedlist>
+                <listitem>
+                  <para>Custom <link linkend="moveListFactory">MoveListFactory</link></para>
+                </listitem>
+              </itemizedlist></entry>
           </row>
 
           <row>
@@ -715,7 +727,15 @@
                 </listitem>
               </itemizedlist></entry>
 
-            <entry>None</entry>
+            <entry><itemizedlist>
+                <listitem>
+                  <para><link linkend="annotationAlternatives">Field annotations</link></para>
+                </listitem>
+
+                <listitem>
+                  <para><link linkend="valueRangeFactory">ValueRangeFactory</link></para>
+                </listitem>
+              </itemizedlist></entry>
           </row>
         </tbody>
       </tgroup>
@@ -1723,6 +1743,7 @@ testdata11 has 4 specialisms, 4 equipments, 4 departments, 107 rooms, 318 beds,
 testdata12 has 4 specialisms, 4 equipments, 4 departments, 105 rooms, 310 beds, 84 nights, 2750 patients and 2750 admissions with a search space of 10^6851.
 testdata13 has 5 specialisms, 4 equipments, 5 departments, 125 rooms, 368 beds, 28 nights,  907 patients and 1109 admissions with a search space of 10^2845.</programlisting>
       </section>
+
       <section xml:id="bedAllocationDomainModel">
         <title>Domain Model</title>
 

diff --git a/...r-examples/src/main/java/org/optaplanner/examples/cheaptime/domain/CheapTimeSolution.java b/...r-examples/src/main/java/org/optaplanner/examples/cheaptime/domain/CheapTimeSolution.java
@@ -40,13 +40,15 @@ public class CheapTimeSolution extends AbstractPersistable implements Solution<H
     private int globalPeriodRangeTo; // Exclusive
 
     private List<Resource> resourceList;
+    @ValueRangeProvider(id = "machineRange")
     private List<Machine> machineList;
     private List<MachineCapacity> machineCapacityList;
     private List<Task> taskList;
     private List<TaskRequirement> taskRequirementList;
     // Order is equal to global periodRange so int period can be used for the index
     private List<PeriodPowerPrice> periodPowerPriceList;
 
+    @PlanningEntityCollectionProperty
     private List<TaskAssignment> taskAssignmentList;
 
     @XStreamConverter(value = XStreamScoreConverter.class, types = {HardMediumSoftLongScoreDefinition.class})
@@ -80,7 +82,6 @@ public List<Resource> getResourceList() {
         return resourceList;
     }
 
-    @ValueRangeProvider(id = "machineRange")
     public List<Machine> getMachineList() {
         return machineList;
     }
@@ -125,7 +126,6 @@ public void setPeriodPowerPriceList(List<PeriodPowerPrice> periodPowerPriceList)
         this.periodPowerPriceList = periodPowerPriceList;
     }
 
-    @PlanningEntityCollectionProperty
     public List<TaskAssignment> getTaskAssignmentList() {
         return taskAssignmentList;
     }

diff --git a/...nner-examples/src/main/java/org/optaplanner/examples/cheaptime/domain/TaskAssignment.java b/...nner-examples/src/main/java/org/optaplanner/examples/cheaptime/domain/TaskAssignment.java
@@ -32,7 +32,9 @@ public class TaskAssignment extends AbstractPersistable {
     private Task task;
 
     // Planning variables: changes during planning, between score calculations.
+    @PlanningVariable(valueRangeProviderRefs = {"machineRange"})
     private Machine machine;
+    @PlanningVariable(valueRangeProviderRefs = {"startPeriodRange"})
     private Integer startPeriod;
 
     public Task getTask() {
@@ -43,7 +45,6 @@ public void setTask(Task task) {
         this.task = task;
     }
 
-    @PlanningVariable(valueRangeProviderRefs = {"machineRange"})
     public Machine getMachine() {
         return machine;
     }
@@ -52,7 +53,6 @@ public void setMachine(Machine machine) {
         this.machine = machine;
     }
 
-    @PlanningVariable(valueRangeProviderRefs = {"startPeriodRange"})
     public Integer getStartPeriod() {
         return startPeriod;
     }
@@ -85,7 +85,7 @@ public String getLabel() {
     // ************************************************************************
 
     @ValueRangeProvider(id = "startPeriodRange")
-    public CountableValueRange<Integer> getDelayRange() {
+    public CountableValueRange<Integer> getStartPeriodRange() {
         return ValueRangeFactory.createIntValueRange(task.getStartPeriodRangeFrom(), task.getStartPeriodRangeTo());
     }