[jboss-svn-commits] JBL Code SVN: r18038 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main: java/org/drools/solver/examples/itc2007/examination/domain and 2 other directories.

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

Author: ge0ffrey
Date: 2008-01-22 15:22:05 -0500 (Tue, 22 Jan 2008)
New Revision: 18038

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/app/ExaminationBenchmarkApp.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Period.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Topic.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationInputConvertor.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl
Log:
remove InMinutes from duration

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/app/ExaminationBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/app/ExaminationBenchmarkApp.java	2008-01-22 19:03:31 UTC (rev 18037)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/app/ExaminationBenchmarkApp.java	2008-01-22 20:22:05 UTC (rev 18038)
@@ -10,10 +10,10 @@
  */
 public class ExaminationBenchmarkApp extends CommonBenchmarkApp {
 
+//    public static final String SOLVER_BENCHMARK_CONFIG
+//            = "/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml";
     public static final String SOLVER_BENCHMARK_CONFIG
-            = "/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml";
-//    public static final String SOLVER_BENCHMARK_CONFIG
-//            = "/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml";
+            = "/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml";
     public static final File SOLVER_BENCHMARK_RESULT_FILE
             = new File("local/data/itc2007/examination/examinationSolverBenchmarkResult.xml");
 

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java	2008-01-22 19:03:31 UTC (rev 18037)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java	2008-01-22 20:22:05 UTC (rev 18038)
@@ -125,12 +125,16 @@
         return topic + " @ " + period + " in " + room;
     }
 
+    public int getTopicDuration() {
+        return getTopic().getDuration();
+    }
+
     public int getTopicStudentListSize() {
         return getTopic().getStudentListSize();
     }
 
-    public int getPeriodDurationInMinutes() {
-        return getPeriod().getDurationInMinutes();
+    public int getPeriodDuration() {
+        return getPeriod().getDuration();
     }
 
 }

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Period.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Period.java	2008-01-22 19:03:31 UTC (rev 18037)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Period.java	2008-01-22 20:22:05 UTC (rev 18038)
@@ -11,7 +11,7 @@
     private String startDateTimeString;
     private int periodIndex;
     private int dayIndex;
-    private int durationInMinutes;
+    private int duration; // in minutes
     private int penalty;
     private boolean frontLoadLast;
 
@@ -39,12 +39,12 @@
         this.dayIndex = dayIndex;
     }
 
-    public int getDurationInMinutes() {
-        return durationInMinutes;
+    public int getDuration() {
+        return duration;
     }
 
-    public void setDurationInMinutes(int durationInMinutes) {
-        this.durationInMinutes = durationInMinutes;
+    public void setDuration(int duration) {
+        this.duration = duration;
     }
 
     public int getPenalty() {
@@ -71,7 +71,7 @@
 
     @Override
     public String toString() {
-        return startDateTimeString + " {" + durationInMinutes + "}";
+        return startDateTimeString + " {" + duration + "}";
     }
 
 }

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Topic.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Topic.java	2008-01-22 19:03:31 UTC (rev 18037)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Topic.java	2008-01-22 20:22:05 UTC (rev 18038)
@@ -11,7 +11,7 @@
  */
 public class Topic extends AbstractPersistable implements Comparable<Topic> {
 
-    private int duration;
+    private int duration; // in minutes
     private List<Student> studentList;
 
     // Calculated during initialization, not modified during score calculation.

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationInputConvertor.java	2008-01-22 19:03:31 UTC (rev 18037)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationInputConvertor.java	2008-01-22 20:22:05 UTC (rev 18038)
@@ -179,7 +179,7 @@
                 throw new IllegalStateException("The periods should be in ascending order.");
             }
             period.setDayIndex(dayIndex);
-            period.setDurationInMinutes(Integer.parseInt(lineTokens[2]));
+            period.setDuration(Integer.parseInt(lineTokens[2]));
             period.setPenalty(Integer.parseInt(lineTokens[3]));
             periodList.add(period);
         }

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl	2008-01-22 19:03:31 UTC (rev 18037)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl	2008-01-22 20:22:05 UTC (rev 18038)
@@ -63,7 +63,7 @@
 // More time required during a period than available in that period.
 rule "periodDurationTooShort"
     when
-        $exam : Exam($periodDuration : periodDurationInMinutes, eval(topic.getDuration() > (Integer) $periodDuration));
+        $exam : Exam(eval(topicDuration > periodDuration));
     then
         insertLogical(new IntConstraintOccurrence("periodDurationTooShort", ConstraintType.NEGATIVE_HARD,
             $exam));