[jboss-svn-commits] JBL Code SVN: r32856 - labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence.

[jboss-svn-commits at lists.jboss.org]

Author: ge0ffrey
Date: 2010-05-13 07:01:53 -0400 (Thu, 13 May 2010)
New Revision: 32856

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringEvaluatorHelper.java
Log:
eval helper

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringEvaluatorHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringEvaluatorHelper.java	2010-05-13 10:59:29 UTC (rev 32855)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringEvaluatorHelper.java	2010-05-13 11:01:53 UTC (rev 32856)
@@ -78,6 +78,12 @@
         }
 
         private void processLine(String line) {
+            int employeeIndex = line.indexOf("Employee: ");
+            if (employeeIndex >= 0) {
+                lastEmployeeCode = line.substring(employeeIndex).replaceAll("Employee: (.+)", "$1");
+            } else if (line.contains("Penalty:")) {
+                lastEmployeeCode = null;
+            }
             if (lineContainsFilter == null || line.contains(lineContainsFilter)) {
                 int excessIndex = line.indexOf("excess = ");
                 if (excessIndex >= 0) {
@@ -92,12 +98,6 @@
                         excess[1] += value;
                     }
                 }
-                int employeeIndex = line.indexOf("Employee: ");
-                if (employeeIndex >= 0) {
-                    lastEmployeeCode = line.substring(employeeIndex).replaceAll("Employee: (.+)", "$1");
-                } else if (line.contains("Penalty:")) {
-                    lastEmployeeCode = null;
-                }
                 if (lastEmployeeCode != null) {
                     System.out.print("E(" + lastEmployeeCode + ")  ");
                 }