[jboss-svn-commits] JBL Code SVN: r33474 - in labs/jbossrules/trunk/drools-planner: drools-planner-examples/src/main/assembly and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jun 13 11:53:04 EDT 2010
Author: ge0ffrey
Date: 2010-06-13 11:53:03 -0400 (Sun, 13 Jun 2010)
New Revision: 33474
Added:
labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/
labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/docs/
labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/nurseRosteringCompetitionAssembly.xml
labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/scripts/
labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/scripts/nurseRosteringSprint.sh
Removed:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/assembly/nurseRosteringCompetition/
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/assembly/nurseRosteringCompetitionAssembly.xml
labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/nurseRosteringSprint.sh
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/pom.xml
Log:
move and fix nurseRosteringCompetitionAssembly
Deleted: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/assembly/nurseRosteringCompetitionAssembly.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/assembly/nurseRosteringCompetitionAssembly.xml 2010-06-13 14:53:30 UTC (rev 33473)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/assembly/nurseRosteringCompetitionAssembly.xml 2010-06-13 15:53:03 UTC (rev 33474)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
- <id>nurseRosteringCompetition</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>src/main/assembly/nurseRosteringCompetition</directory>
- <outputDirectory/>
- </fileSet>
- <fileSet>
- <directory>data/nurserostering/input</directory>
- <outputDirectory>input</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>data/nurserostering/output</directory>
- <outputDirectory>output</outputDirectory>
- </fileSet>
- </fileSets>
-
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.drools.planner:drools-planner-core</include>
- <include>org.drools.planner:drools-planner-examples</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
-</assembly>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml 2010-06-13 14:53:30 UTC (rev 33473)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml 2010-06-13 15:53:03 UTC (rev 33474)
@@ -6,26 +6,26 @@
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint01.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint02.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint03.xml</inheritedUnsolvedSolutionFile>
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint04.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint05.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint06.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint07.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint08.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint09.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint10.xml</inheritedUnsolvedSolutionFile>-->
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint04.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint05.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint06.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint07.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint08.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint09.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint10.xml</inheritedUnsolvedSolutionFile>
<!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_hint01.xml</inheritedUnsolvedSolutionFile>-->
<!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_hint02.xml</inheritedUnsolvedSolutionFile>-->
<!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_hint03.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late01.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late02.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late03.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late04.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late05.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late06.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late07.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late08.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late09.xml</inheritedUnsolvedSolutionFile>-->
- <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late10.xml</inheritedUnsolvedSolutionFile>-->
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late01.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late02.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late03.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late04.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late05.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late06.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late07.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late08.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late09.xml</inheritedUnsolvedSolutionFile>
+ <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late10.xml</inheritedUnsolvedSolutionFile>
<inheritedLocalSearchSolver>
<scoreDrl>/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl</scoreDrl>
@@ -64,30 +64,56 @@
</forager>
</localSearchSolver>
</solverBenchmark>
- <solverBenchmark>
- <name>pillarPart100</name>
- <localSearchSolver>
- <selector>
- <selector>
- <moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.EmployeeChangeMoveFactory</moveFactoryClass>
- <absoluteSelection>100</absoluteSelection>
- </selector>
- <selector>
- <moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.AssignmentSwitchMoveFactory</moveFactoryClass>
- <absoluteSelection>100</absoluteSelection>
- </selector>
- <selector>
- <moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.AssignmentPillarPartSwitchMoveFactory</moveFactoryClass>
- <absoluteSelection>100</absoluteSelection>
- </selector>
- </selector>
- <acceptor>
- <completeSolutionTabuSize>1000</completeSolutionTabuSize>
- <completePropertyTabuSize>10</completePropertyTabuSize>
- </acceptor>
- <forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
- </forager>
- </localSearchSolver>
- </solverBenchmark>
+ <!--<solverBenchmark>-->
+ <!--<name>pillarPart70</name>-->
+ <!--<localSearchSolver>-->
+ <!--<selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.EmployeeChangeMoveFactory</moveFactoryClass>-->
+ <!--<absoluteSelection>70</absoluteSelection>-->
+ <!--</selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.AssignmentSwitchMoveFactory</moveFactoryClass>-->
+ <!--<absoluteSelection>70</absoluteSelection>-->
+ <!--</selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.AssignmentPillarPartSwitchMoveFactory</moveFactoryClass>-->
+ <!--<absoluteSelection>70</absoluteSelection>-->
+ <!--</selector>-->
+ <!--</selector>-->
+ <!--<acceptor>-->
+ <!--<completeSolutionTabuSize>1000</completeSolutionTabuSize>-->
+ <!--<completePropertyTabuSize>10</completePropertyTabuSize>-->
+ <!--</acceptor>-->
+ <!--<forager>-->
+ <!--<foragerType>MAX_SCORE_OF_ALL</foragerType>-->
+ <!--</forager>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
+ <!--<solverBenchmark>-->
+ <!--<name>pillarPart100</name>-->
+ <!--<localSearchSolver>-->
+ <!--<selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.EmployeeChangeMoveFactory</moveFactoryClass>-->
+ <!--<absoluteSelection>100</absoluteSelection>-->
+ <!--</selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.AssignmentSwitchMoveFactory</moveFactoryClass>-->
+ <!--<absoluteSelection>100</absoluteSelection>-->
+ <!--</selector>-->
+ <!--<selector>-->
+ <!--<moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.AssignmentPillarPartSwitchMoveFactory</moveFactoryClass>-->
+ <!--<absoluteSelection>100</absoluteSelection>-->
+ <!--</selector>-->
+ <!--</selector>-->
+ <!--<acceptor>-->
+ <!--<completeSolutionTabuSize>1000</completeSolutionTabuSize>-->
+ <!--<completePropertyTabuSize>10</completePropertyTabuSize>-->
+ <!--</acceptor>-->
+ <!--<forager>-->
+ <!--<foragerType>MAX_SCORE_OF_ALL</foragerType>-->
+ <!--</forager>-->
+ <!--</localSearchSolver>-->
+ <!--</solverBenchmark>-->
</solverBenchmarkSuite>
Modified: labs/jbossrules/trunk/drools-planner/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/pom.xml 2010-06-13 14:53:30 UTC (rev 33473)
+++ labs/jbossrules/trunk/drools-planner/pom.xml 2010-06-13 15:53:03 UTC (rev 33474)
@@ -35,6 +35,18 @@
</plugins>
</pluginManagement>
<plugins>
+ <!-- TODO temporarly added for the nurse rostering competition-->
+ <!-- Run command: mvn clean package assembly:assembly -DskipTests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/nurseRosteringCompetition/nurseRosteringCompetitionAssembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
</plugins>
</build>
Copied: labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition (from rev 33473, labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/assembly/nurseRosteringCompetition)
Copied: labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/nurseRosteringCompetitionAssembly.xml (from rev 33473, labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/assembly/nurseRosteringCompetitionAssembly.xml)
===================================================================
--- labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/nurseRosteringCompetitionAssembly.xml (rev 0)
+++ labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/nurseRosteringCompetitionAssembly.xml 2010-06-13 15:53:03 UTC (rev 33474)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+ <id>nurseRosteringCompetition</id>
+ <formats>
+ <format>dir</format>
+ <format>zip</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/assembly/nurseRosteringCompetition/scripts</directory>
+ <lineEnding>unix</lineEnding>
+ <filtered>true</filtered>
+ <outputDirectory/>
+ <includes>
+ <include>**/*.sh</include>
+ </includes>
+ <fileMode>755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/assembly/nurseRosteringCompetition/docs</directory>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>drools-planner-examples/data/nurserostering/input</directory>
+ <outputDirectory>input</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>drools-planner-examples/data/nurserostering/output</directory>
+ <outputDirectory>output</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.drools.planner:drools-planner-core</include>
+ <include>org.drools.planner:drools-planner-examples</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+</assembly>
Deleted: labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/nurseRosteringSprint.sh
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/assembly/nurseRosteringCompetition/nurseRosteringSprint.sh 2010-06-13 14:53:30 UTC (rev 33473)
+++ labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/nurseRosteringSprint.sh 2010-06-13 15:53:03 UTC (rev 33474)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-mainJar=lib/drools-planner-examples-${project.version}.jar
-mainClass=org.drools.planner.examples.nurserostering.competition.NurseRosteringCompetitionSprintApp
-
-echo "Usage: ./nurseRosteringSprint.sh [timeInSeconds]"
-echo "For example: ./nurseRosteringSprint.sh"
-echo " ./nurseRosteringSprint.sh 9"
-echo "All files under the input directory will be solved and placed under the export directory"
-echo ""
-echo "Some notes:"
-echo "- Working dir should be the directory of this script."
-echo "- Java must be the Sun JDK, at least version 6 update 10 (preferably the last update)"
-echo "- The environment variable JAVA_HOME should be set to the JDK installation directory"
-echo " For example: export JAVA_HOME=/usr/lib/jvm/java-6-sun"
-echo
-echo "Starting competition app..."
-
-# -Xmx128M probably works too, but it might be slower
-$JAVA_HOME/bin/java -Xms256m -Xmx1024m -server -cp ${mainJar} ${mainClass} $*
Added: labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/scripts/nurseRosteringSprint.sh
===================================================================
--- labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/scripts/nurseRosteringSprint.sh (rev 0)
+++ labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/scripts/nurseRosteringSprint.sh 2010-06-13 15:53:03 UTC (rev 33474)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+mainJar=lib/drools-planner-examples-${project.version}.jar
+mainClass=org.drools.planner.examples.nurserostering.competition.NurseRosteringCompetitionSprintApp
+
+echo "Usage: ./nurseRosteringSprint.sh [timeInSeconds]"
+echo "For example: ./nurseRosteringSprint.sh"
+echo " ./nurseRosteringSprint.sh 9"
+echo "All files under the input directory will be solved and placed under the export directory"
+echo ""
+echo "Some notes:"
+echo "- Working dir should be the directory of this script."
+echo "- Java must be the Sun JDK, at least version 6 update 10 (preferably the last update)"
+echo "- The environment variable JAVA_HOME should be set to the JDK installation directory"
+echo " For example: export JAVA_HOME=/usr/lib/jvm/java-6-sun"
+echo
+echo "Starting competition app..."
+
+# -Xmx128M probably works too, but it might be slower
+$JAVA_HOME/bin/java -Xms256m -Xmx1024m -server -cp ${mainJar} ${mainClass} $*
Property changes on: labs/jbossrules/trunk/drools-planner/src/main/assembly/nurseRosteringCompetition/scripts/nurseRosteringSprint.sh
___________________________________________________________________
Name: svn:eol-style
+ LF
More information about the jboss-svn-commits
mailing list