[jboss-svn-commits] JBL Code SVN: r17768 - labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark.

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

Author: ge0ffrey
Date: 2008-01-12 16:03:33 -0500 (Sat, 12 Jan 2008)
New Revision: 17768

Added:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml
Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml
Log:
benchmark preperation

Added: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml	                        (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationShortSolverBenchmarkConfig.xml	2008-01-12 21:03:33 UTC (rev 17768)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solverBenchmarkSuite>
+    <solvedSolutionVerbosity>ALL</solvedSolutionVerbosity>
+    <solvedSolutionFilesDirectory>local/data/itc2007/examination/solved</solvedSolutionFilesDirectory>
+    <sortSolverBenchmarks>true</sortSolverBenchmarks>
+    <!-- solverBenchmarkResultComparator -->
+    
+    <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set1.xml</inheritedUnsolvedSolutionFile>
+    <inheritedLocalSearchSolver>
+        <scoreDrl>/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl</scoreDrl>
+        <scoreCalculator>
+            <scoreCalculatorType>HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
+        </scoreCalculator>
+        <finish>
+            <maximumStepCount>500</maximumStepCount>
+        </finish>
+    </inheritedLocalSearchSolver>
+
+    <solverBenchmark>
+        <localSearchSolver>
+            <selector>
+                <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.ExaminationMoveFactory</moveFactoryClass>
+                <shuffleMovesEveryStep>true</shuffleMovesEveryStep>
+            </selector>
+            <accepter>
+                <accepterType>SIMULATED_ANNEALING</accepterType>
+            </accepter>
+            <forager>
+                <foragerType>FIRST_RANDOMLY_ACCEPTED</foragerType>
+            </forager>
+        </localSearchSolver>
+    </solverBenchmark>
+</solverBenchmarkSuite>

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-12 20:54:47 UTC (rev 17767)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/benchmark/examinationSolverBenchmarkConfig.xml	2008-01-12 21:03:33 UTC (rev 17768)
@@ -6,14 +6,21 @@
     <!-- solverBenchmarkResultComparator -->
     
     <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set1.xml</inheritedUnsolvedSolutionFile>
+    <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set2.xml</inheritedUnsolvedSolutionFile>
+    <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set3.xml</inheritedUnsolvedSolutionFile>
+    <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set4.xml</inheritedUnsolvedSolutionFile>
+    <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set5.xml</inheritedUnsolvedSolutionFile>
+    <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set6.xml</inheritedUnsolvedSolutionFile>
+    <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set7.xml</inheritedUnsolvedSolutionFile>
+    <inheritedUnsolvedSolutionFile>data/itc2007/examination/unsolved/exam_comp_set8.xml</inheritedUnsolvedSolutionFile>
+
     <inheritedLocalSearchSolver>
         <scoreDrl>/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl</scoreDrl>
         <scoreCalculator>
             <scoreCalculatorType>HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
         </scoreCalculator>
         <finish>
-            <!--<maximumSecondsSpend>429</maximumSecondsSpend>-->
-            <maximumStepCount>500</maximumStepCount>
+            <maximumSecondsSpend>429</maximumSecondsSpend>
         </finish>
     </inheritedLocalSearchSolver>
 
@@ -31,4 +38,17 @@
             </forager>
         </localSearchSolver>
     </solverBenchmark>
+    <solverBenchmark>
+        <localSearchSolver>
+            <selector>
+                <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.NeighbourExaminationMoveFactory</moveFactoryClass>
+            </selector>
+            <accepter>
+                <completeSolutionTabuSize>1500</completeSolutionTabuSize>
+            </accepter>
+            <forager>
+                <foragerType>MAX_SCORE_OF_ALL</foragerType>
+            </forager>
+        </localSearchSolver>
+    </solverBenchmark>
 </solverBenchmarkSuite>