[jboss-svn-commits] JBL Code SVN: r30765 - in labs/jbossrules/trunk/drools-planner: drools-planner-examples/src/main/java/org/drools/planner/examples/common/business and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 18 09:29:21 EST 2009
Author: ge0ffrey
Date: 2009-12-18 09:29:21 -0500 (Fri, 18 Dec 2009)
New Revision: 30765
Removed:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/app/ExaminationShellApp.java
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/Solution.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/business/SolutionBusiness.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractInputConvertor.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractOutputConvertor.java
Log:
remove itc2007 assembly package + typo's + drools solver to planner rename
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/Solution.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/Solution.java 2009-12-18 14:19:59 UTC (rev 30764)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/Solution.java 2009-12-18 14:29:21 UTC (rev 30765)
@@ -11,7 +11,7 @@
* A Solution does not even have to be initialized with a possible solution.
* <p/>
* A Solution is mutable.
- * Drools-solver will continiously modify the same solution for scalibility reasons
+ * Drools Planner will continuously modify the same solution for scalability reasons
* and clone it to recall the best solution.
* @author Geoffrey De Smet
*/
@@ -19,7 +19,7 @@
/**
* Returns the Score of this Solution.
- * @return null if the Solution is unitialized
+ * @return null if the Solution is uninitialized
* or the last calculated Score is dirty the new Score has not yet been recalculated
*/
Score getScore();
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/business/SolutionBusiness.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/business/SolutionBusiness.java 2009-12-18 14:19:59 UTC (rev 30764)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/business/SolutionBusiness.java 2009-12-18 14:29:21 UTC (rev 30765)
@@ -51,12 +51,12 @@
unsolvedDataDir = new File(dataDir, "unsolved");
if (!unsolvedDataDir.exists()) {
throw new IllegalStateException("The directory unsolvedDataDir (" + unsolvedDataDir.getAbsolutePath()
- + ") does not exist. The working directory should be set to drools-solver-examples.");
+ + ") does not exist. The working directory should be set to drools-planner-examples.");
}
solvedDataDir = new File(dataDir, "solved");
if (!solvedDataDir.exists()) {
throw new IllegalStateException("The directory solvedDataDir (" + solvedDataDir.getAbsolutePath()
- + ") does not exist. The working directory should be set to drools-solver-examples.");
+ + ") does not exist. The working directory should be set to drools-planner-examples.");
}
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractInputConvertor.java 2009-12-18 14:19:59 UTC (rev 30764)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractInputConvertor.java 2009-12-18 14:29:21 UTC (rev 30765)
@@ -44,7 +44,7 @@
File[] inputFiles = inputDir.listFiles();
if (inputFiles == null) {
throw new IllegalArgumentException(
- "Your working dir should be drools-solver-examples and contain: " + inputDir);
+ "Your working dir should be drools-planner-examples and contain: " + inputDir);
}
Arrays.sort(inputFiles);
for (File inputFile : inputFiles) {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractOutputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractOutputConvertor.java 2009-12-18 14:19:59 UTC (rev 30764)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/persistence/AbstractOutputConvertor.java 2009-12-18 14:29:21 UTC (rev 30765)
@@ -45,7 +45,7 @@
Arrays.sort(inputFiles);
if (inputFiles == null) {
throw new IllegalArgumentException(
- "Your working dir should be drools-solver-examples and contain: " + inputDir);
+ "Your working dir should be drools-planner-examples and contain: " + inputDir);
}
for (File inputFile : inputFiles) {
String inputFileName = inputFile.getName();
Deleted: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/app/ExaminationShellApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/app/ExaminationShellApp.java 2009-12-18 14:19:59 UTC (rev 30764)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/itc2007/examination/app/ExaminationShellApp.java 2009-12-18 14:29:21 UTC (rev 30765)
@@ -1,110 +0,0 @@
-package org.drools.planner.examples.itc2007.examination.app;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.drools.planner.config.XmlSolverConfigurer;
-import org.drools.planner.core.Solver;
-import org.drools.planner.examples.common.app.LoggingMain;
-import org.drools.planner.examples.itc2007.examination.domain.Examination;
-import org.drools.planner.examples.itc2007.examination.persistence.ExaminationInputConvertor;
-import org.drools.planner.examples.itc2007.examination.persistence.ExaminationOutputConvertor;
-
-/**
- * @author Geoffrey De Smet
- */
-public class ExaminationShellApp extends LoggingMain {
-
- public static final String SOLVER_CONFIG
- = "/org/drools/planner/examples/itc2007/examination/solver/examinationSolverConfig.xml";
-
- public static void main(String[] args) {
- if (args.length != 1) {
- System.out.println("Use exactly 1 program argument (maximumSecondsSpend). Exiting...");
- System.exit(1);
- }
- long maximumSecondsSpend;
- try {
- maximumSecondsSpend = Long.parseLong(args[0]);
- } catch (NumberFormatException e) {
- System.out.println("The program argument maximumSecondsSpend (" + args[0] + ") is not a number."
- + " Exiting...");
- System.exit(1);
- maximumSecondsSpend = 0L; // unreachable statement
- }
- new ExaminationShellApp(maximumSecondsSpend).processs();
- }
-
- private ExaminationInputConvertor examinationInputConvertor = new ExaminationInputConvertor();
- private ExaminationOutputConvertor examinationOutputConvertor = new ExaminationOutputConvertor();
-
- private Solver solver;
- private File inputDir;
- private File outputDir;
-
- private ExaminationShellApp(long maximumSecondsSpend) {
- configureSolver(maximumSecondsSpend);
- configureDataDir();
- }
-
- private void configureSolver(long maximumSecondsSpend) {
- XmlSolverConfigurer configurer = new XmlSolverConfigurer();
- configurer.configure(SOLVER_CONFIG);
- configurer.getConfig().getTerminationConfig().setMaximumSecondsSpend(maximumSecondsSpend);
- solver = configurer.buildSolver();
- }
-
- private void configureDataDir() {
- File dataDir = new File("data/itc2007/examination/");
- inputDir = new File(dataDir, "input");
- if (!inputDir.exists()) {
- throw new IllegalStateException("The directory inputDir (" + inputDir.getAbsolutePath()
- + ") does not exist. The working directory should be set to the script directory"
- + " or to drools-solver-examples.");
- }
- outputDir = new File(dataDir, "output");
- if (!outputDir.exists()) {
- throw new IllegalStateException("The directory outputDir (" + outputDir.getAbsolutePath()
- + ") does not exist. The working directory should be set to the script directory"
- + " or to drools-solver-examples.");
- }
- }
-
- private void processs() {
- List<File> inputFileList = getInputFileList();
- for (File inputFile : inputFileList) {
- Examination examination = (Examination) examinationInputConvertor.readSolution(inputFile);
- solver.setStartingSolution(examination);
- solver.solve();
- examination = (Examination) solver.getBestSolution();
- File outputFile = getOutputFile(inputFile);
- examinationOutputConvertor.writeSolution(examination, outputFile);
- }
- }
-
- public List<File> getInputFileList() {
- List<File> inputFileList = Arrays.asList(inputDir.listFiles(new ExamInputFileFilter()));
- Collections.sort(inputFileList);
- return inputFileList;
- }
-
- private File getOutputFile(File inputFile) {
- String outputFileName = inputFile.getName().replaceAll("\\.exam$", ".sln");
- return new File(outputDir, outputFileName);
- }
-
- public class ExamInputFileFilter implements FileFilter {
-
- public boolean accept(File file) {
- if (file.isDirectory() || file.isHidden()) {
- return false;
- }
- return file.getName().endsWith(".exam");
- }
-
- }
-
-}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list