[jboss-svn-commits] JBL Code SVN: r35674 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src: test/java/org/drools/planner/examples/nurserostering/solver and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 22 13:42:56 EDT 2010
Author: ge0ffrey
Date: 2010-10-22 13:42:56 -0400 (Fri, 22 Oct 2010)
New Revision: 35674
Added:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/NurseRosteringMoveHelper.java
Removed:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/NurseRosterMoveHelper.java
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/AssignmentSwitchMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/EmployeeChangeMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/EmployeeMultipleChangeMove.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nurserostering/solver/NurseRosteringScoreRulesTest.java
Log:
rename NurseRosterMoveHelper to NurseRosteringMoveHelper
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/AssignmentSwitchMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/AssignmentSwitchMove.java 2010-10-22 17:27:30 UTC (rev 35673)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/AssignmentSwitchMove.java 2010-10-22 17:42:56 UTC (rev 35674)
@@ -52,8 +52,8 @@
public void doMove(WorkingMemory workingMemory) {
Employee oldLeftEmployee = leftAssignment.getEmployee();
Employee oldRightEmployee = rightAssignment.getEmployee();
- NurseRosterMoveHelper.moveEmployee(workingMemory, leftAssignment, oldRightEmployee);
- NurseRosterMoveHelper.moveEmployee(workingMemory, rightAssignment, oldLeftEmployee);
+ NurseRosteringMoveHelper.moveEmployee(workingMemory, leftAssignment, oldRightEmployee);
+ NurseRosteringMoveHelper.moveEmployee(workingMemory, rightAssignment, oldLeftEmployee);
}
public Collection<? extends Object> getTabuProperties() {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/EmployeeChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/EmployeeChangeMove.java 2010-10-22 17:27:30 UTC (rev 35673)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/EmployeeChangeMove.java 2010-10-22 17:42:56 UTC (rev 35674)
@@ -50,7 +50,7 @@
}
public void doMove(WorkingMemory workingMemory) {
- NurseRosterMoveHelper.moveEmployee(workingMemory, assignment, toEmployee);
+ NurseRosteringMoveHelper.moveEmployee(workingMemory, assignment, toEmployee);
}
public Collection<? extends Object> getTabuProperties() {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/EmployeeMultipleChangeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/EmployeeMultipleChangeMove.java 2010-10-22 17:27:30 UTC (rev 35673)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/EmployeeMultipleChangeMove.java 2010-10-22 17:42:56 UTC (rev 35674)
@@ -58,7 +58,7 @@
throw new IllegalStateException("The assignment (" + assignment + ") should have the same employee ("
+ fromEmployee + ") as the fromEmployee (" + fromEmployee + ").");
}
- NurseRosterMoveHelper.moveEmployee(workingMemory, assignment, toEmployee);
+ NurseRosteringMoveHelper.moveEmployee(workingMemory, assignment, toEmployee);
}
}
Deleted: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/NurseRosterMoveHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/NurseRosterMoveHelper.java 2010-10-22 17:27:30 UTC (rev 35673)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/NurseRosterMoveHelper.java 2010-10-22 17:42:56 UTC (rev 35674)
@@ -1,39 +0,0 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.planner.examples.nurserostering.solver.move;
-
-
-import org.drools.WorkingMemory;
-import org.drools.planner.examples.nurserostering.domain.Assignment;
-import org.drools.planner.examples.nurserostering.domain.Employee;
-import org.drools.runtime.rule.FactHandle;
-
-/**
- * @author Geoffrey De Smet
- */
-public class NurseRosterMoveHelper {
-
- public static void moveEmployee(WorkingMemory workingMemory, Assignment assignment, Employee toEmployee) {
- FactHandle factHandle = workingMemory.getFactHandle(assignment);
- assignment.setEmployee(toEmployee);
- workingMemory.update(factHandle, assignment);
- }
-
- private NurseRosterMoveHelper() {
- }
-
-}
Copied: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/NurseRosteringMoveHelper.java (from rev 35630, labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/NurseRosterMoveHelper.java)
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/NurseRosteringMoveHelper.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/solver/move/NurseRosteringMoveHelper.java 2010-10-22 17:42:56 UTC (rev 35674)
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.drools.planner.examples.nurserostering.solver.move;
+
+
+import org.drools.WorkingMemory;
+import org.drools.planner.examples.nurserostering.domain.Assignment;
+import org.drools.planner.examples.nurserostering.domain.Employee;
+import org.drools.runtime.rule.FactHandle;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class NurseRosteringMoveHelper {
+
+ public static void moveEmployee(WorkingMemory workingMemory, Assignment assignment, Employee toEmployee) {
+ FactHandle factHandle = workingMemory.getFactHandle(assignment);
+ assignment.setEmployee(toEmployee);
+ workingMemory.update(factHandle, assignment);
+ }
+
+ private NurseRosteringMoveHelper() {
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nurserostering/solver/NurseRosteringScoreRulesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nurserostering/solver/NurseRosteringScoreRulesTest.java 2010-10-22 17:27:30 UTC (rev 35673)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/java/org/drools/planner/examples/nurserostering/solver/NurseRosteringScoreRulesTest.java 2010-10-22 17:42:56 UTC (rev 35674)
@@ -35,7 +35,7 @@
import org.drools.planner.examples.nurserostering.domain.Employee;
import org.drools.planner.examples.nurserostering.domain.NurseRoster;
import org.drools.planner.examples.nurserostering.persistence.NurseRosteringDaoImpl;
-import org.drools.planner.examples.nurserostering.solver.move.NurseRosterMoveHelper;
+import org.drools.planner.examples.nurserostering.solver.move.NurseRosteringMoveHelper;
/**
* @author Geoffrey De Smet
@@ -59,12 +59,12 @@
Employee rightEmployee = findEmployeeById(nurseRoster, 12L);
Assignment rightAssignment = findAssignmentById(nurseRoster, 200204002L);
assertEquals(rightEmployee, rightAssignment.getEmployee());
- NurseRosterMoveHelper.moveEmployee(workingMemory, leftAssignment, rightEmployee);
- NurseRosterMoveHelper.moveEmployee(workingMemory, rightAssignment, leftEmployee);
+ NurseRosteringMoveHelper.moveEmployee(workingMemory, leftAssignment, rightEmployee);
+ NurseRosteringMoveHelper.moveEmployee(workingMemory, rightAssignment, leftEmployee);
localSearchSolverScope.calculateScoreFromWorkingMemory();
// undo AssignmentSwitchMove;
- NurseRosterMoveHelper.moveEmployee(workingMemory, rightAssignment, rightEmployee);
- NurseRosterMoveHelper.moveEmployee(workingMemory, leftAssignment, leftEmployee);
+ NurseRosteringMoveHelper.moveEmployee(workingMemory, rightAssignment, rightEmployee);
+ NurseRosteringMoveHelper.moveEmployee(workingMemory, leftAssignment, leftEmployee);
Score secondScore = localSearchSolverScope.calculateScoreFromWorkingMemory();
assertEquals(firstScore, secondScore);
}
More information about the jboss-svn-commits
mailing list