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

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

Author: ge0ffrey
Date: 2008-03-24 09:40:47 -0400 (Mon, 24 Mar 2008)
New Revision: 19219

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml
Log:
quick & dirty tweaking results of the benchmarker run

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml	2008-03-23 14:28:07 UTC (rev 19218)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml	2008-03-24 13:40:47 UTC (rev 19219)
@@ -5,13 +5,13 @@
     <sortSolverBenchmarks>true</sortSolverBenchmarks>
     <!-- solverBenchmarkResultComparator -->
     
-    <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp01.xml</inheritedUnsolvedSolutionFile>
-    <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp02.xml</inheritedUnsolvedSolutionFile>
-    <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp03.xml</inheritedUnsolvedSolutionFile>
-    <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp04.xml</inheritedUnsolvedSolutionFile>
-    <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp05.xml</inheritedUnsolvedSolutionFile>
-    <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp06.xml</inheritedUnsolvedSolutionFile>
-    <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp07.xml</inheritedUnsolvedSolutionFile>
+    <!--<inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp01.xml</inheritedUnsolvedSolutionFile>-->
+    <!--<inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp02.xml</inheritedUnsolvedSolutionFile>-->
+    <!--<inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp03.xml</inheritedUnsolvedSolutionFile>-->
+    <!--<inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp04.xml</inheritedUnsolvedSolutionFile>-->
+    <!--<inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp05.xml</inheritedUnsolvedSolutionFile>-->
+    <!--<inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp06.xml</inheritedUnsolvedSolutionFile>-->
+    <!--<inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp07.xml</inheritedUnsolvedSolutionFile>-->
     <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp08.xml</inheritedUnsolvedSolutionFile>
     <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp09.xml</inheritedUnsolvedSolutionFile>
     <inheritedUnsolvedSolutionFile>data/itc2007/curriculumcourse/unsolved/comp10.xml</inheritedUnsolvedSolutionFile>
@@ -29,15 +29,14 @@
                 ge0ffrey's main pc: 429
                 ge0ffrey's old pc: 1152
             -->
-            <maximumSecondsSpend>30</maximumSecondsSpend>
+            <maximumSecondsSpend>429</maximumSecondsSpend>
         </finish>
     </inheritedLocalSearchSolver>
 
     <solverBenchmark>
         <localSearchSolver>
             <scoreCalculator>
-                <scoreCalculatorType>HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
-                <!--<scoreCalculatorType>DYNAMIC_HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>-->
+                <scoreCalculatorType>DYNAMIC_HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
             </scoreCalculator>
             <selector>
                 <selector>
@@ -57,9 +56,8 @@
                 </selector>
             </selector>
             <accepter>
+                <completePropertyTabuSize>10</completePropertyTabuSize>
                 <completeSolutionTabuSize>1500</completeSolutionTabuSize>
-                <!--<completeSolutionTabuSize>500</completeSolutionTabuSize>-->
-                <!--<completePropertyTabuSize>10</completePropertyTabuSize>-->
             </accepter>
             <forager>
                 <foragerType>MAX_SCORE_OF_ALL</foragerType>

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml	2008-03-23 14:28:07 UTC (rev 19218)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml	2008-03-24 13:40:47 UTC (rev 19219)
@@ -2,7 +2,7 @@
 <localSearchSolver>
     <scoreDrl>/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseScoreRules.drl</scoreDrl>
     <scoreCalculator>
-        <scoreCalculatorType>HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
+        <scoreCalculatorType>DYNAMIC_HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
     </scoreCalculator>
     <startingSolutionInitializerClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.solution.initializer.CurriculumCourseStartingSolutionInitializer</startingSolutionInitializerClass>
     <finish>
@@ -11,7 +11,7 @@
             ge0ffrey's main pc: 429
             ge0ffrey's old pc: 1152
         -->
-        <maximumSecondsSpend>1</maximumSecondsSpend>
+        <maximumSecondsSpend>429</maximumSecondsSpend>
         <!--<feasableScore>-999999.0</feasableScore>-->
         <!--<maximumStepCount>100</maximumStepCount>-->
     </finish>
@@ -33,6 +33,7 @@
         </selector>
     </selector>
     <accepter>
+        <completePropertyTabuSize>10</completePropertyTabuSize>
         <completeSolutionTabuSize>1500</completeSolutionTabuSize>
     </accepter>
     <forager>