code style + rename Period to PeriodWrapper after PLANNER-275 Add Dro…

…ols score rules for example CheapTime Scheduling

optaplanner-examples/src/main/java/org/optaplanner/examples/cheaptime/solver/drools/IdleCost.java

@@ -64,4 +64,5 @@ public int compareTo(IdleCost other) {
     public String toString() {
         return "machine = " + machine + ", activePeriodAfterIdle = " + activePeriodAfterIdle + ", cost = " + cost;
     }
+
 }

optaplanner-examples/src/main/java/org/optaplanner/examples/cheaptime/solver/drools/MachinePeriodPart.java

@@ -1,6 +1,5 @@
 package org.optaplanner.examples.cheaptime.solver.drools;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang.builder.CompareToBuilder;
@@ -12,6 +11,7 @@
 import org.optaplanner.examples.cheaptime.domain.TaskRequirement;
 
 public class MachinePeriodPart {
+
     private final Machine machine;
     private final int period;
 
@@ -34,32 +34,32 @@ public MachinePeriodPart(Machine machine, int period, int resourceListSize, List
             addTaskAssignment(taskAssignment);
         }
 
-	    resourceInShortTotal = 0;
-	    for (int resourceAvailable : resourceAvailableList) {
-	        if (resourceAvailable < 0) {
-	            resourceInShortTotal += resourceAvailable;
-	        }
-	    }
+        resourceInShortTotal = 0;
+        for (int resourceAvailable : resourceAvailableList) {
+            if (resourceAvailable < 0) {
+                resourceInShortTotal += resourceAvailable;
+            }
+        }
     }
 
     private void addTaskAssignment(TaskAssignment taskAssignment) {
         active = true;
         Task task = taskAssignment.getTask();
         for (int i = 0; i < resourceAvailableList.length; i++) {
             TaskRequirement taskRequirement = task.getTaskRequirementList().get(i);
-            resourceAvailableList[i] -=  taskRequirement.getResourceUsage();
+            resourceAvailableList[i] -= taskRequirement.getResourceUsage();
         }
     }
 
-	public boolean isActive() {
-		return active;
-	}
+    public boolean isActive() {
+        return active;
+    }
 
-	public void setActive(boolean active) {
-		this.active = active;
-	}
+    public void setActive(boolean active) {
+        this.active = active;
+    }
 
-	public int[] getResourceAvailableList() {
+    public int[] getResourceAvailableList() {
         return resourceAvailableList;
     }
 
@@ -68,8 +68,8 @@ public void setResourceAvailableList(int[] resourceAvailableList) {
     }
 
     public int getResourceInShortTotal() {
-		return resourceInShortTotal;
-	}
+        return resourceInShortTotal;
+    }
 
     public Machine getMachine() {
         return machine;

optaplanner-examples/src/main/java/org/optaplanner/examples/cheaptime/solver/drools/Period.java → optaplanner-examples/src/main/java/org/optaplanner/examples/cheaptime/solver/drools/PeriodWrapper.java

@@ -4,11 +4,11 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
-public class Period {
+public class PeriodWrapper {
 
     private int period;
 
-    public Period(int period) {
+    public PeriodWrapper(int period) {
         this.period = period;
     }
 
@@ -23,8 +23,8 @@ public void setPeriod(int period) {
     public boolean equals(Object o) {
         if (this == o) {
             return true;
-        } else if (o instanceof Period) {
-            Period other = (Period) o;
+        } else if (o instanceof PeriodWrapper) {
+            PeriodWrapper other = (PeriodWrapper) o;
             return new EqualsBuilder()
                     .append(period, other.period)
                     .isEquals();
@@ -39,7 +39,7 @@ public int hashCode() {
                 .toHashCode();
     }
 
-    public int compareTo(Period other) {
+    public int compareTo(PeriodWrapper other) {
         return new CompareToBuilder()
                 .append(period, other.period)
                 .toComparison();
@@ -49,4 +49,5 @@ public int compareTo(Period other) {
     public String toString() {
         return String.valueOf(period);
     }
+
 }

optaplanner-examples/src/main/resources/org/optaplanner/examples/cheaptime/solver/cheapTimeScoreRules.drl

@@ -31,7 +31,7 @@ import org.optaplanner.examples.cheaptime.domain.TaskAssignment;
 import org.optaplanner.examples.cheaptime.domain.TaskRequirement;
 import org.optaplanner.examples.cheaptime.solver.CheapTimeCostCalculator;
 import org.optaplanner.examples.cheaptime.solver.drools.IdleCost;
-import org.optaplanner.examples.cheaptime.solver.drools.Period;
+import org.optaplanner.examples.cheaptime.solver.drools.PeriodWrapper;
 import org.optaplanner.examples.cheaptime.solver.drools.MachinePeriodPart;
 
 global HardMediumSoftLongScoreHolder scoreHolder;
@@ -43,7 +43,7 @@ rule "period"
         CheapTimeSolution($globalPeriodRangeFrom : globalPeriodRangeFrom, $globalPeriodRangeTo : globalPeriodRangeTo)
     then
         for (int i = $globalPeriodRangeFrom; i < $globalPeriodRangeTo; i++) {
-            insert(new Period(i));
+            insert(new PeriodWrapper(i));
         }
 end
 
@@ -52,7 +52,7 @@ rule "machinePeriodPart"
     salience 2
     when
         CheapTimeSolution($resourceList : resourceList)
-        Period($period : period);
+        PeriodWrapper($period : period);
         $machine : Machine()
         $taskAssignmentList : ArrayList() from collect (
             TaskAssignment(
@@ -165,7 +165,7 @@ end
 // Task power cost: Each task consumes power too, which infers a power cost (depending on the power price during its time).
 rule "taskPowerCost"
     when
-        Period($period : period)
+        PeriodWrapper($period : period)
         TaskAssignment(startPeriod <= $period, endPeriod > $period, $task : task)
         $periodPowerPrice : PeriodPowerPrice(period == $period)
     then