Skip to content

Commit

Permalink
Added datasets to benchmark config
Browse files Browse the repository at this point in the history
  • Loading branch information
oskopek committed Aug 27, 2015
1 parent 8d3a295 commit 456796c
Show file tree
Hide file tree
Showing 3 changed files with 202 additions and 23 deletions.
Expand Up @@ -7,12 +7,15 @@
<inheritedSolverBenchmark>
<problemBenchmarks>
<xStreamAnnotatedClass>sk.gymy.seminar.domain.Groups</xStreamAnnotatedClass>
<inputSolutionFile>data/seminar/unsolved/simple5.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3Ch2St20Tea6Sem15-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3Ch2St200Tea60Sem150-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3Ch2St2000Tea600Sem1500-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3Ch5St2000Tea60Sem125-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G5Ch2St2000Tea60Sem125-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/gymy2014-2.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/gymy2014-4.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3St20Tea6Sem18-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3St200Tea60Sem180-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3St2000Tea600Sem1800-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/simple5.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/unsolvable5.xml</inputSolutionFile>
<writeOutputSolutionEnabled>true</writeOutputSolutionEnabled>
<problemStatisticType>BEST_SCORE</problemStatisticType>
</problemBenchmarks>
Expand All @@ -27,7 +30,7 @@
<termination>
<terminationCompositionStyle>OR</terminationCompositionStyle>
<bestScoreLimit>0hard/0soft</bestScoreLimit>
<secondsSpentLimit>60</secondsSpentLimit>
<minutesSpentLimit>5</minutesSpentLimit>
</termination>
</solver>
</inheritedSolverBenchmark>
Expand Down Expand Up @@ -64,22 +67,22 @@
</constructionHeuristic>
</solver>
</solverBenchmark>
<solverBenchmark>
<name>Entity tabu</name>
<solver>
<constructionHeuristic>
<constructionHeuristicType>FIRST_FIT_DECREASING</constructionHeuristicType>
</constructionHeuristic>
<localSearch>
<changeMoveSelector>
<selectionOrder>ORIGINAL</selectionOrder>
</changeMoveSelector>
<acceptor>
<entityTabuSize>5</entityTabuSize>
</acceptor>
<forager>
</forager>
</localSearch>
</solver>
</solverBenchmark>
<!--<solverBenchmark>-->
<!--<name>Entity tabu</name>-->
<!--<solver>-->
<!--&lt;!&ndash;<constructionHeuristic>&ndash;&gt;-->
<!--&lt;!&ndash;<constructionHeuristicType>FIRST_FIT_DECREASING</constructionHeuristicType>&ndash;&gt;-->
<!--&lt;!&ndash;</constructionHeuristic>&ndash;&gt;-->
<!--<localSearch>-->
<!--<changeMoveSelector>-->
<!--<selectionOrder>ORIGINAL</selectionOrder>-->
<!--</changeMoveSelector>-->
<!--<acceptor>-->
<!--<entityTabuSize>5</entityTabuSize>-->
<!--</acceptor>-->
<!--<forager>-->
<!--</forager>-->
<!--</localSearch>-->
<!--</solver>-->
<!--</solverBenchmark>-->
</plannerBenchmark>
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<plannerBenchmark>
<benchmarkDirectory>local/data/seminar</benchmarkDirectory>
<parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
<warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>

<inheritedSolverBenchmark>
<problemBenchmarks>
<xStreamAnnotatedClass>sk.gymy.seminar.domain.Groups</xStreamAnnotatedClass>
<inputSolutionFile>data/seminar/unsolved/G3Ch2St20Tea6Sem15-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3Ch2St200Tea60Sem150-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3Ch2St2000Tea600Sem1500-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3Ch5St2000Tea60Sem125-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G5Ch2St2000Tea60Sem125-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/gymy2014-2.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/gymy2014-4.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/simple5.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/unsolvable5.xml</inputSolutionFile>
<writeOutputSolutionEnabled>true</writeOutputSolutionEnabled>
<problemStatisticType>BEST_SCORE</problemStatisticType>
</problemBenchmarks>
<solver>
<solutionClass>sk.gymy.seminar.domain.Groups</solutionClass>
<entityClass>sk.gymy.seminar.domain.Seminar</entityClass>
<scoreDirectorFactory>
<scoreDefinitionType>HARD_SOFT</scoreDefinitionType>
<scoreDrl>sk/gymy/seminar/solver/seminarScoreRules.drl</scoreDrl>
<initializingScoreTrend>ONLY_DOWN</initializingScoreTrend>
</scoreDirectorFactory>
<termination>
<terminationCompositionStyle>OR</terminationCompositionStyle>
<bestScoreLimit>0hard/0soft</bestScoreLimit>
<minutesSpentLimit>5</minutesSpentLimit>
</termination>
</solver>
</inheritedSolverBenchmark>

<solverBenchmark>
<name>FIRST_FIT</name>
<solver>
<constructionHeuristic>
<constructionHeuristicType>FIRST_FIT</constructionHeuristicType>
</constructionHeuristic>
</solver>
</solverBenchmark>
<solverBenchmark>
<name>FIRST_FIT_DECREASING</name>
<solver>
<constructionHeuristic>
<constructionHeuristicType>FIRST_FIT_DECREASING</constructionHeuristicType>
</constructionHeuristic>
</solver>
</solverBenchmark>
<solverBenchmark>
<name>BEST_FIT</name>
<solver>
<constructionHeuristic>
<constructionHeuristicType>WEAKEST_FIT</constructionHeuristicType>
</constructionHeuristic>
</solver>
</solverBenchmark>
<solverBenchmark>
<name>BEST_FIT_DECREASING</name>
<solver>
<constructionHeuristic>
<constructionHeuristicType>WEAKEST_FIT_DECREASING</constructionHeuristicType>
</constructionHeuristic>
</solver>
</solverBenchmark>
<!--<solverBenchmark>-->
<!--<name>Entity tabu</name>-->
<!--<solver>-->
<!--&lt;!&ndash;<constructionHeuristic>&ndash;&gt;-->
<!--&lt;!&ndash;<constructionHeuristicType>FIRST_FIT_DECREASING</constructionHeuristicType>&ndash;&gt;-->
<!--&lt;!&ndash;</constructionHeuristic>&ndash;&gt;-->
<!--<localSearch>-->
<!--<changeMoveSelector>-->
<!--<selectionOrder>ORIGINAL</selectionOrder>-->
<!--</changeMoveSelector>-->
<!--<acceptor>-->
<!--<entityTabuSize>5</entityTabuSize>-->
<!--</acceptor>-->
<!--<forager>-->
<!--</forager>-->
<!--</localSearch>-->
<!--</solver>-->
<!--</solverBenchmark>-->
</plannerBenchmark>
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<plannerBenchmark>
<benchmarkDirectory>local/data/seminar</benchmarkDirectory>
<parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
<warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>

<inheritedSolverBenchmark>
<problemBenchmarks>
<xStreamAnnotatedClass>sk.gymy.seminar.domain.Groups</xStreamAnnotatedClass>
<inputSolutionFile>data/seminar/unsolved/G3Ch2St20Tea6Sem15-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3Ch2St200Tea60Sem150-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3Ch2St2000Tea600Sem1500-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G3Ch5St2000Tea60Sem125-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/G5Ch2St2000Tea60Sem125-seminar.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/gymy2014-2.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/gymy2014-4.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/simple5.xml</inputSolutionFile>
<inputSolutionFile>data/seminar/unsolved/unsolvable5.xml</inputSolutionFile>
<writeOutputSolutionEnabled>true</writeOutputSolutionEnabled>
<problemStatisticType>BEST_SCORE</problemStatisticType>
</problemBenchmarks>
<solver>
<solutionClass>sk.gymy.seminar.domain.Groups</solutionClass>
<entityClass>sk.gymy.seminar.domain.Seminar</entityClass>
<scoreDirectorFactory>
<scoreDefinitionType>HARD_SOFT</scoreDefinitionType>
<scoreDrl>sk/gymy/seminar/solver/seminarScoreRules.drl</scoreDrl>
<initializingScoreTrend>ONLY_DOWN</initializingScoreTrend>
</scoreDirectorFactory>
<termination>
<terminationCompositionStyle>OR</terminationCompositionStyle>
<bestScoreLimit>0hard/0soft</bestScoreLimit>
<minutesSpentLimit>5</minutesSpentLimit>
</termination>
</solver>
</inheritedSolverBenchmark>

<solverBenchmark>
<name>FIRST_FIT</name>
<solver>
<constructionHeuristic>
<constructionHeuristicType>FIRST_FIT</constructionHeuristicType>
</constructionHeuristic>
</solver>
</solverBenchmark>
<solverBenchmark>
<name>FIRST_FIT_DECREASING</name>
<solver>
<constructionHeuristic>
<constructionHeuristicType>FIRST_FIT_DECREASING</constructionHeuristicType>
</constructionHeuristic>
</solver>
</solverBenchmark>
<solverBenchmark>
<name>BEST_FIT</name>
<solver>
<constructionHeuristic>
<constructionHeuristicType>WEAKEST_FIT</constructionHeuristicType>
</constructionHeuristic>
</solver>
</solverBenchmark>
<solverBenchmark>
<name>BEST_FIT_DECREASING</name>
<solver>
<constructionHeuristic>
<constructionHeuristicType>WEAKEST_FIT_DECREASING</constructionHeuristicType>
</constructionHeuristic>
</solver>
</solverBenchmark>
<!--<solverBenchmark>-->
<!--<name>Entity tabu</name>-->
<!--<solver>-->
<!--&lt;!&ndash;<constructionHeuristic>&ndash;&gt;-->
<!--&lt;!&ndash;<constructionHeuristicType>FIRST_FIT_DECREASING</constructionHeuristicType>&ndash;&gt;-->
<!--&lt;!&ndash;</constructionHeuristic>&ndash;&gt;-->
<!--<localSearch>-->
<!--<changeMoveSelector>-->
<!--<selectionOrder>ORIGINAL</selectionOrder>-->
<!--</changeMoveSelector>-->
<!--<acceptor>-->
<!--<entityTabuSize>5</entityTabuSize>-->
<!--</acceptor>-->
<!--<forager>-->
<!--</forager>-->
<!--</localSearch>-->
<!--</solver>-->
<!--</solverBenchmark>-->
</plannerBenchmark>

0 comments on commit 456796c

Please sign in to comment.