[jboss-svn-commits] JBL Code SVN: r18134 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main: resources/org/drools/solver/examples/itc2007/examination/benchmark and 1 other directory.

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

Author: ge0ffrey
Date: 2008-01-25 18:35:53 -0500 (Fri, 25 Jan 2008)
New Revision: 18134

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/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml
Log:
bug in intializer

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-25 21:30:56 UTC (rev 18133)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java	2008-01-25 23:35:53 UTC (rev 18134)
@@ -256,8 +256,9 @@
                     newCoincidenceExamSet.add(rightExam);
                 }
                 ExamCoincidence newExamCoincidence = new ExamCoincidence(newCoincidenceExamSet);
-                leftExam.setExamCoincidence(newExamCoincidence);
-                rightExam.setExamCoincidence(newExamCoincidence);
+                for (Exam exam : newCoincidenceExamSet) {
+                    exam.setExamCoincidence(newExamCoincidence);
+                }
             } else if (periodHardConstraint.getPeriodHardConstraintType() == PeriodHardConstraintType.AFTER) {
                 Exam afterExam = topicToExamMap.get(periodHardConstraint.getLeftSideTopic());
                 Exam beforeExam = topicToExamMap.get(periodHardConstraint.getRightSideTopic());

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml	2008-01-25 21:30:56 UTC (rev 18133)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml	2008-01-25 23:35:53 UTC (rev 18134)
@@ -26,7 +26,7 @@
                 ge0ffrey's main pc: 429
                 ge0ffrey's old pc: 1152
             -->
-            <maximumSecondsSpend>1152</maximumSecondsSpend>
+            <maximumSecondsSpend>429</maximumSecondsSpend>
         </finish>
     </inheritedLocalSearchSolver>
 
@@ -46,6 +46,9 @@
     <!--</solverBenchmark>-->
     <solverBenchmark>
         <localSearchSolver>
+            <scoreCalculator>
+                <scoreCalculatorType>DYNAMIC_HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
+            </scoreCalculator>
             <selector>
                 <selector>
                     <topSize>10</topSize>
@@ -64,35 +67,12 @@
                 </selector>
             </selector>
             <accepter>
-                <completeSolutionTabuSize>1500</completeSolutionTabuSize>
+                <completeSolutionTabuSize>500</completeSolutionTabuSize>
+                <completePropertyTabuSize>10</completePropertyTabuSize>
             </accepter>
             <forager>
                 <foragerType>MAX_SCORE_OF_ALL</foragerType>
             </forager>
         </localSearchSolver>
     </solverBenchmark>
-    <!--<solverBenchmark>-->
-        <!--<localSearchSolver>-->
-            <!--<selector>-->
-                <!--<selector>-->
-                    <!--<moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.PeriodChangeExaminationMoveFactory</moveFactoryClass>-->
-                    <!--<relativeSelection>0.01</relativeSelection>-->
-                <!--</selector>-->
-                <!--<selector>-->
-                    <!--<moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.RoomChangeExaminationMoveFactory</moveFactoryClass>-->
-                    <!--<relativeSelection>0.01</relativeSelection>-->
-                <!--</selector>-->
-                <!--<selector>-->
-                    <!--<moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.move.factory.ExamSwitchExaminationMoveFactory</moveFactoryClass>-->
-                    <!--<relativeSelection>0.01</relativeSelection>-->
-                <!--</selector>-->
-            <!--</selector>-->
-            <!--<accepter>-->
-                <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
-            <!--</accepter>-->
-            <!--<forager>-->
-                <!--<foragerType>MAX_SCORE_OF_ALL</foragerType>-->
-            <!--</forager>-->
-        <!--</localSearchSolver>-->
-    <!--</solverBenchmark>-->
 </solverBenchmarkSuite>