[jboss-svn-commits] JBL Code SVN: r30156 - in labs/jbossrules/trunk/drools-solver: drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/benchmark/smart and 2 other directories.

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

Author: ge0ffrey
Date: 2009-11-15 04:22:39 -0500 (Sun, 15 Nov 2009)
New Revision: 30156

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/termination/TerminationConfig.java
   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/simple/simpleTravelingTournamentSolverConfig.xml
   labs/jbossrules/trunk/drools-solver/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt
Log:
typo : maximumHouresSpend => maximumHoursSpend

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/termination/TerminationConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/termination/TerminationConfig.java	2009-11-15 09:15:02 UTC (rev 30155)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/termination/TerminationConfig.java	2009-11-15 09:22:39 UTC (rev 30156)
@@ -29,7 +29,7 @@
     private Long maximumTimeMillisSpend = null;
     private Long maximumSecondsSpend = null;
     private Long maximumMinutesSpend = null;
-    private Long maximumHouresSpend = null;
+    private Long maximumHoursSpend = null;
     private String scoreAttained = null;
     private Integer maximumUnimprovedStepCount = null;
 
@@ -89,12 +89,12 @@
         this.maximumMinutesSpend = maximumMinutesSpend;
     }
 
-    public Long getMaximumHouresSpend() {
-        return maximumHouresSpend;
+    public Long getMaximumHoursSpend() {
+        return maximumHoursSpend;
     }
 
-    public void setMaximumHouresSpend(Long maximumHouresSpend) {
-        this.maximumHouresSpend = maximumHouresSpend;
+    public void setMaximumHoursSpend(Long maximumHoursSpend) {
+        this.maximumHoursSpend = maximumHoursSpend;
     }
 
     public String getScoreAttained() {
@@ -153,9 +153,9 @@
             termination.setMaximumTimeMillisSpend(maximumMinutesSpend * 60000L);
             terminationList.add(termination);
         }
-        if (maximumHouresSpend != null) {
+        if (maximumHoursSpend != null) {
             TimeMillisSpendTermination termination = new TimeMillisSpendTermination();
-            termination.setMaximumTimeMillisSpend(maximumHouresSpend * 3600000L);
+            termination.setMaximumTimeMillisSpend(maximumHoursSpend * 3600000L);
             terminationList.add(termination);
         }
         if (scoreAttained != null) {
@@ -212,8 +212,8 @@
         if (maximumMinutesSpend == null) {
             maximumMinutesSpend = inheritedConfig.getMaximumMinutesSpend();
         }
-        if (maximumHouresSpend == null) {
-            maximumHouresSpend = inheritedConfig.getMaximumHouresSpend();
+        if (maximumHoursSpend == null) {
+            maximumHoursSpend = inheritedConfig.getMaximumHoursSpend();
         }
         if (scoreAttained == null) {
             scoreAttained = inheritedConfig.getScoreAttained();

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-11-15 09:15:02 UTC (rev 30155)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml	2009-11-15 09:22:39 UTC (rev 30156)
@@ -11,7 +11,7 @@
             <scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
         </scoreDefinition>
         <termination>
-            <!--<maximumHouresSpend>2</maximumHouresSpend>-->
+            <!--<maximumHoursSpend>2</maximumHoursSpend>-->
             <maximumMinutesSpend>10</maximumMinutesSpend>
         </termination>
         <selector>

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentSolverConfig.xml	2009-11-15 09:15:02 UTC (rev 30155)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentSolverConfig.xml	2009-11-15 09:22:39 UTC (rev 30156)
@@ -5,7 +5,7 @@
         <scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
     </scoreDefinition>
     <termination>
-        <maximumHouresSpend>2</maximumHouresSpend>
+        <maximumHoursSpend>2</maximumHoursSpend>
     </termination>
     <selector>
         <moveFactoryClass>org.drools.solver.examples.travelingtournament.solver.simple.move.factory.SimpleTravelingTournamentMoveFactory</moveFactoryClass>

Modified: labs/jbossrules/trunk/drools-solver/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt
===================================================================
--- labs/jbossrules/trunk/drools-solver/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt	2009-11-15 09:15:02 UTC (rev 30155)
+++ labs/jbossrules/trunk/drools-solver/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt	2009-11-15 09:22:39 UTC (rev 30156)
@@ -76,8 +76,8 @@
         <scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
     </scoreDefinition>
 
-From 5.0.1 to 5.1.0
--------------------
+From 5.0.1 to 5.1.0.m1
+----------------------
 
 The method Solver.cancel() has been renamed to Solver.terminateEarly()
 because it does not undo the solving but terminates it early and there's a best solution.
@@ -184,4 +184,14 @@
 Before:
      solver.getBestScore()
 After:
-     solver.getBestSolution().getScore()
\ No newline at end of file
+     solver.getBestSolution().getScore()
+
+
+From 5.1.0.m1 to 5.1.0
+----------------------
+
+TerminationConfig's maximumHouresSpend renamed to maximumHoursSpend
+Before:
+     <maximumHouresSpend>2</maximumHouresSpend>
+After:
+     <maximumHoursSpend>2</maximumHoursSpend>
\ No newline at end of file