[jboss-svn-commits] JBL Code SVN: r26713 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament: solver/smart and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun May 24 15:03:30 EDT 2009
Author: ge0ffrey
Date: 2009-05-24 15:03:29 -0400 (Sun, 24 May 2009)
New Revision: 26713
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml
Log:
better ttp config
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml 2009-05-24 15:41:19 UTC (rev 26712)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml 2009-05-24 19:03:29 UTC (rev 26713)
@@ -11,11 +11,16 @@
<scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
</scoreDefinition>
<finish>
- <maximumHouresSpend>2</maximumHouresSpend>
+ <!--<maximumHouresSpend>2</maximumHouresSpend>-->
+ <maximumMinutesSpend>10</maximumMinutesSpend>
</finish>
<selector>
<moveFactoryClass>org.drools.solver.examples.travelingtournament.solver.smart.move.factory.SmartTravelingTournamentMoveFactory</moveFactoryClass>
</selector>
+ <accepter>
+ <completeSolutionTabuSize>1500</completeSolutionTabuSize>
+ <completeMoveTabuSize>7</completeMoveTabuSize>
+ </accepter>
<forager>
<foragerType>MAX_SCORE_OF_ALL</foragerType>
</forager>
@@ -23,155 +28,175 @@
<solverBenchmark>
<localSearchSolver>
- <!-- Warmup JIT -->
- <finish>
- <maximumMinutesSpend>2</maximumMinutesSpend>
- </finish>
- <accepter>
- <completeSolutionTabuSize>10</completeSolutionTabuSize>
- <completeMoveTabuSize>10</completeMoveTabuSize>
- <completePropertyTabuSize>10</completePropertyTabuSize>
- </accepter>
+ <deciderScoreComparatorFactory>
+ <deciderScoreComparatorFactoryType>NATURAL</deciderScoreComparatorFactoryType>
+ </deciderScoreComparatorFactory>
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
<localSearchSolver>
- <accepter>
- <completeSolutionTabuSize>1500</completeSolutionTabuSize>
- </accepter>
+ <deciderScoreComparatorFactory>
+ <deciderScoreComparatorFactoryType>SHIFTING_HARD_PENALTY</deciderScoreComparatorFactoryType>
+ <hardScoreActivationThreshold>0</hardScoreActivationThreshold>
+ <successiveNoHardChangeMinimum>2</successiveNoHardChangeMinimum>
+ <successiveNoHardChangeMaximum>20</successiveNoHardChangeMaximum>
+ <successiveNoHardChangeRepetitionMultiplicand>20.0</successiveNoHardChangeRepetitionMultiplicand>
+ <hardWeightSurvivalRatio>0.5</hardWeightSurvivalRatio>
+ <startingHardWeight>1000</startingHardWeight>
+ </deciderScoreComparatorFactory>
</localSearchSolver>
</solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeMoveTabuSize>20</completeMoveTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeMoveTabuSize>30</completeMoveTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeMoveTabuSize>40</completeMoveTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeUndoMoveTabuSize>30</completeUndoMoveTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completePropertyTabuSize>20</completePropertyTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completePropertyTabuSize>30</completePropertyTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completePropertyTabuSize>40</completePropertyTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!-- Warmup JIT -->
+ <!--<finish>-->
+ <!--<maximumMinutesSpend>2</maximumMinutesSpend>-->
+ <!--</finish>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>10</completeSolutionTabuSize>-->
+ <!--<completeMoveTabuSize>10</completeMoveTabuSize>-->
+ <!--<completePropertyTabuSize>10</completePropertyTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeMoveTabuSize>20</completeMoveTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeMoveTabuSize>30</completeMoveTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeMoveTabuSize>40</completeMoveTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeUndoMoveTabuSize>30</completeUndoMoveTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completePropertyTabuSize>20</completePropertyTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completePropertyTabuSize>30</completePropertyTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completePropertyTabuSize>40</completePropertyTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeSolutionTabuSize>1500</completeSolutionTabuSize>
- <completeMoveTabuSize>5</completeMoveTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeSolutionTabuSize>1500</completeSolutionTabuSize>
- <completeMoveTabuSize>30</completeMoveTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeSolutionTabuSize>1500</completeSolutionTabuSize>
- <completeUndoMoveTabuSize>5</completeUndoMoveTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeSolutionTabuSize>1500</completeSolutionTabuSize>
- <completeUndoMoveTabuSize>30</completeUndoMoveTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeSolutionTabuSize>1500</completeSolutionTabuSize>
- <completePropertyTabuSize>5</completePropertyTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeSolutionTabuSize>1500</completeSolutionTabuSize>
- <completePropertyTabuSize>30</completePropertyTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
+ <!--<completeMoveTabuSize>5</completeMoveTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
+ <!--<completeMoveTabuSize>30</completeMoveTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
+ <!--<completeUndoMoveTabuSize>5</completeUndoMoveTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
+ <!--<completeUndoMoveTabuSize>30</completeUndoMoveTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
+ <!--<completePropertyTabuSize>5</completePropertyTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
+ <!--<completePropertyTabuSize>30</completePropertyTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeMoveTabuSize>30</completeMoveTabuSize>
- <completePropertyTabuSize>30</completePropertyTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeUndoMoveTabuSize>30</completeUndoMoveTabuSize>
- <completePropertyTabuSize>30</completePropertyTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeSolutionTabuSize>1500</completeSolutionTabuSize>
- <completeUndoMoveTabuSize>5</completeUndoMoveTabuSize>
- <completePropertyTabuSize>5</completePropertyTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
- <solverBenchmark>
- <localSearchSolver>
- <accepter>
- <completeSolutionTabuSize>1500</completeSolutionTabuSize>
- <completeUndoMoveTabuSize>30</completeUndoMoveTabuSize>
- <completePropertyTabuSize>30</completePropertyTabuSize>
- </accepter>
- </localSearchSolver>
- </solverBenchmark>
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeMoveTabuSize>30</completeMoveTabuSize>-->
+ <!--<completePropertyTabuSize>30</completePropertyTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeUndoMoveTabuSize>30</completeUndoMoveTabuSize>-->
+ <!--<completePropertyTabuSize>30</completePropertyTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
+ <!--<completeUndoMoveTabuSize>5</completeUndoMoveTabuSize>-->
+ <!--<completePropertyTabuSize>5</completePropertyTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<localSearchSolver>-->
+ <!--<accepter>-->
+ <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
+ <!--<completeUndoMoveTabuSize>30</completeUndoMoveTabuSize>-->
+ <!--<completePropertyTabuSize>30</completePropertyTabuSize>-->
+ <!--</accepter>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
</solverBenchmarkSuite>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml 2009-05-24 15:41:19 UTC (rev 26712)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml 2009-05-24 19:03:29 UTC (rev 26713)
@@ -5,16 +5,23 @@
<scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
</scoreDefinition>
<finish>
- <!--<finishCompositionStyle>AND</finishCompositionStyle>-->
- <!--<feasableScore>0hard/-467267soft</feasableScore>-->
- <maximumUnimprovedStepCount>100</maximumUnimprovedStepCount>
+ <feasableScore>0hard/0soft</feasableScore>
</finish>
+ <deciderScoreComparatorFactory>
+ <deciderScoreComparatorFactoryType>SHIFTING_HARD_PENALTY</deciderScoreComparatorFactoryType>
+ <hardScoreActivationThreshold>0</hardScoreActivationThreshold>
+ <successiveNoHardChangeMinimum>2</successiveNoHardChangeMinimum>
+ <successiveNoHardChangeMaximum>20</successiveNoHardChangeMaximum>
+ <successiveNoHardChangeRepetitionMultiplicand>20.0</successiveNoHardChangeRepetitionMultiplicand>
+ <hardWeightSurvivalRatio>0.5</hardWeightSurvivalRatio>
+ <startingHardWeight>1000</startingHardWeight>
+ </deciderScoreComparatorFactory>
<selector>
<moveFactoryClass>org.drools.solver.examples.travelingtournament.solver.smart.move.factory.SmartTravelingTournamentMoveFactory</moveFactoryClass>
</selector>
<accepter>
<completeSolutionTabuSize>1500</completeSolutionTabuSize>
- <!--<completeMoveTabuSize>7</completeMoveTabuSize>-->
+ <completeMoveTabuSize>7</completeMoveTabuSize>
</accepter>
<forager>
<foragerType>MAX_SCORE_OF_ALL</foragerType>
More information about the jboss-svn-commits
mailing list