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

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

Author: ge0ffrey
Date: 2008-01-20 15:46:50 -0500 (Sun, 20 Jan 2008)
New Revision: 17991

Added:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/solver/
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/solver/ExamBefore.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/solver/ExamCoincidence.java
Removed:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/ExamBefore.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/ExamCoincidence.java
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/solver/solution/initializer/ExaminationStartingSolutionInitializer.java
Log:
move examBefore and ExamCoincidence

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-20 19:30:13 UTC (rev 17990)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java	2008-01-20 20:46:50 UTC (rev 17991)
@@ -4,6 +4,8 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.drools.solver.examples.common.domain.AbstractPersistable;
+import org.drools.solver.examples.itc2007.examination.domain.solver.ExamBefore;
+import org.drools.solver.examples.itc2007.examination.domain.solver.ExamCoincidence;
 
 /**
  * @author Geoffrey De Smet

Deleted: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/ExamBefore.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/ExamBefore.java	2008-01-20 19:30:13 UTC (rev 17990)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/ExamBefore.java	2008-01-20 20:46:50 UTC (rev 17991)
@@ -1,26 +0,0 @@
-package org.drools.solver.examples.itc2007.examination.domain;
-
-import java.io.Serializable;
-import java.util.Set;
-
-/**
- * Calculated during initialization, not used for score calculation, used for move creation.
- * @author Geoffrey De Smet
- */
-public class ExamBefore implements Serializable {
-
-    private Set<Exam> afterExamSet;
-
-    public ExamBefore(Set<Exam> afterExamSet) {
-        this.afterExamSet = afterExamSet;
-    }
-
-    public Set<Exam> getAfterExamSet() {
-        return afterExamSet;
-    }
-
-    public void setAfterExamSet(Set<Exam> afterExamSet) {
-        this.afterExamSet = afterExamSet;
-    }
-
-}
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/ExamCoincidence.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/ExamCoincidence.java	2008-01-20 19:30:13 UTC (rev 17990)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/ExamCoincidence.java	2008-01-20 20:46:50 UTC (rev 17991)
@@ -1,40 +0,0 @@
-package org.drools.solver.examples.itc2007.examination.domain;
-
-import java.io.Serializable;
-import java.util.Set;
-
-/**
- * Calculated during initialization, not used for score calculation, used for move creation.
- * @author Geoffrey De Smet
- */
-public class ExamCoincidence implements Serializable {
-
-    private Set<Exam> coincidenceExamSet;
-    private Exam firstExam;
-
-    public ExamCoincidence(Set<Exam> coincidenceExamSet) {
-        this.coincidenceExamSet = coincidenceExamSet;
-        for (Exam exam : coincidenceExamSet) {
-            if (firstExam == null || firstExam.getId() > exam.getId()) {
-                firstExam = exam;
-            }
-        }
-    }
-
-    public Set<Exam> getCoincidenceExamSet() {
-        return coincidenceExamSet;
-    }
-
-    public void setCoincidenceExamSet(Set<Exam> coincidenceExamSet) {
-        this.coincidenceExamSet = coincidenceExamSet;
-    }
-
-    public Exam getFirstExam() {
-        return firstExam;
-    }
-
-    public void setFirstExam(Exam firstExam) {
-        this.firstExam = firstExam;
-    }
-    
-}
\ No newline at end of file

Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/solver/ExamBefore.java (from rev 17988, labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/ExamBefore.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/solver/ExamBefore.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/solver/ExamBefore.java	2008-01-20 20:46:50 UTC (rev 17991)
@@ -0,0 +1,28 @@
+package org.drools.solver.examples.itc2007.examination.domain.solver;
+
+import java.io.Serializable;
+import java.util.Set;
+
+import org.drools.solver.examples.itc2007.examination.domain.Exam;
+
+/**
+ * Calculated during initialization, not used for score calculation, used for move creation.
+ * @author Geoffrey De Smet
+ */
+public class ExamBefore implements Serializable {
+
+    private Set<Exam> afterExamSet;
+
+    public ExamBefore(Set<Exam> afterExamSet) {
+        this.afterExamSet = afterExamSet;
+    }
+
+    public Set<Exam> getAfterExamSet() {
+        return afterExamSet;
+    }
+
+    public void setAfterExamSet(Set<Exam> afterExamSet) {
+        this.afterExamSet = afterExamSet;
+    }
+
+}
\ No newline at end of file

Copied: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/solver/ExamCoincidence.java (from rev 17987, labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/ExamCoincidence.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/solver/ExamCoincidence.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/solver/ExamCoincidence.java	2008-01-20 20:46:50 UTC (rev 17991)
@@ -0,0 +1,42 @@
+package org.drools.solver.examples.itc2007.examination.domain.solver;
+
+import java.io.Serializable;
+import java.util.Set;
+
+import org.drools.solver.examples.itc2007.examination.domain.Exam;
+
+/**
+ * Calculated during initialization, not used for score calculation, used for move creation.
+ * @author Geoffrey De Smet
+ */
+public class ExamCoincidence implements Serializable {
+
+    private Set<Exam> coincidenceExamSet;
+    private Exam firstExam;
+
+    public ExamCoincidence(Set<Exam> coincidenceExamSet) {
+        this.coincidenceExamSet = coincidenceExamSet;
+        for (Exam exam : coincidenceExamSet) {
+            if (firstExam == null || firstExam.getId() > exam.getId()) {
+                firstExam = exam;
+            }
+        }
+    }
+
+    public Set<Exam> getCoincidenceExamSet() {
+        return coincidenceExamSet;
+    }
+
+    public void setCoincidenceExamSet(Set<Exam> coincidenceExamSet) {
+        this.coincidenceExamSet = coincidenceExamSet;
+    }
+
+    public Exam getFirstExam() {
+        return firstExam;
+    }
+
+    public void setFirstExam(Exam firstExam) {
+        this.firstExam = firstExam;
+    }
+    
+}
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java	2008-01-20 19:30:13 UTC (rev 17990)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java	2008-01-20 20:46:50 UTC (rev 17991)
@@ -15,14 +15,14 @@
 import org.drools.solver.core.solution.initializer.AbstractStartingSolutionInitializer;
 import org.drools.solver.examples.common.domain.PersistableIdComparator;
 import org.drools.solver.examples.itc2007.examination.domain.Exam;
-import org.drools.solver.examples.itc2007.examination.domain.ExamBefore;
-import org.drools.solver.examples.itc2007.examination.domain.ExamCoincidence;
 import org.drools.solver.examples.itc2007.examination.domain.Examination;
 import org.drools.solver.examples.itc2007.examination.domain.Period;
 import org.drools.solver.examples.itc2007.examination.domain.PeriodHardConstraint;
 import org.drools.solver.examples.itc2007.examination.domain.PeriodHardConstraintType;
 import org.drools.solver.examples.itc2007.examination.domain.Room;
 import org.drools.solver.examples.itc2007.examination.domain.Topic;
+import org.drools.solver.examples.itc2007.examination.domain.solver.ExamBefore;
+import org.drools.solver.examples.itc2007.examination.domain.solver.ExamCoincidence;
 
 /**
  * @author Geoffrey De Smet