[jboss-svn-commits] JBL Code SVN: r19734 - in labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider: accepter and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sun Apr 27 07:05:32 EDT 2008


Author: ge0ffrey
Date: 2008-04-27 07:05:32 -0400 (Sun, 27 Apr 2008)
New Revision: 19734

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/Accepter.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/Forager.java
Log:
remove aware on accepter and forager

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java	2008-04-26 16:24:32 UTC (rev 19733)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java	2008-04-27 11:05:32 UTC (rev 19734)
@@ -31,8 +31,6 @@
     public void setLocalSearchSolver(LocalSearchSolver localSearchSolver) {
         this.localSearchSolver = localSearchSolver;
         selector.setLocalSearchSolver(localSearchSolver);
-        accepter.setLocalSearchSolver(localSearchSolver);
-        forager.setLocalSearchSolver(localSearchSolver);
     }
 
     public void setSelector(Selector selector) {

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java	2008-04-26 16:24:32 UTC (rev 19733)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java	2008-04-27 11:05:32 UTC (rev 19734)
@@ -1,6 +1,5 @@
 package org.drools.solver.core.localsearch.decider.accepter;
 
-import org.drools.solver.core.localsearch.LocalSearchSolver;
 import org.drools.solver.core.localsearch.LocalSearchSolverScope;
 import org.drools.solver.core.localsearch.StepScope;
 import org.slf4j.Logger;
@@ -13,13 +12,6 @@
 
     protected final transient Logger logger = LoggerFactory.getLogger(getClass());
 
-    protected LocalSearchSolver localSearchSolver;
-
-    @Override
-    public void setLocalSearchSolver(LocalSearchSolver localSearchSolver) {
-        this.localSearchSolver = localSearchSolver;
-    }
-
     // ************************************************************************
     // Worker methods
     // ************************************************************************

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/Accepter.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/Accepter.java	2008-04-26 16:24:32 UTC (rev 19733)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/Accepter.java	2008-04-27 11:05:32 UTC (rev 19734)
@@ -1,6 +1,5 @@
 package org.drools.solver.core.localsearch.decider.accepter;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverAware;
 import org.drools.solver.core.localsearch.LocalSearchSolverLifecycleListener;
 import org.drools.solver.core.localsearch.decider.MoveScope;
 
@@ -10,7 +9,7 @@
  * Always extend {@link AbstractAccepter} to avoid future backwards imcompatiblity issues.
  * @author Geoffrey De Smet
  */
-public interface Accepter extends LocalSearchSolverAware, LocalSearchSolverLifecycleListener {
+public interface Accepter extends LocalSearchSolverLifecycleListener {
 
     /**
      * @param moveScope not null

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java	2008-04-26 16:24:32 UTC (rev 19733)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java	2008-04-27 11:05:32 UTC (rev 19734)
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.drools.solver.core.localsearch.LocalSearchSolver;
 import org.drools.solver.core.localsearch.LocalSearchSolverScope;
 import org.drools.solver.core.localsearch.StepScope;
 import org.drools.solver.core.localsearch.decider.MoveScope;
@@ -21,14 +20,6 @@
         this.accepterList = accepterList;
     }
 
-    @Override
-    public void setLocalSearchSolver(LocalSearchSolver localSearchSolver) {
-        super.setLocalSearchSolver(localSearchSolver);
-        for (Accepter accepter : accepterList) {
-            accepter.setLocalSearchSolver(localSearchSolver);
-        }
-    }
-
     // ************************************************************************
     // Worker methods
     // ************************************************************************

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java	2008-04-26 16:24:32 UTC (rev 19733)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java	2008-04-27 11:05:32 UTC (rev 19734)
@@ -1,6 +1,5 @@
 package org.drools.solver.core.localsearch.decider.forager;
 
-import org.drools.solver.core.localsearch.LocalSearchSolver;
 import org.drools.solver.core.localsearch.LocalSearchSolverScope;
 import org.drools.solver.core.localsearch.StepScope;
 import org.slf4j.Logger;
@@ -13,12 +12,6 @@
 
     protected final transient Logger logger = LoggerFactory.getLogger(getClass());
 
-    protected LocalSearchSolver localSearchSolver;
-
-    public void setLocalSearchSolver(LocalSearchSolver localSearchSolver) {
-        this.localSearchSolver = localSearchSolver;
-    }
-
     // ************************************************************************
     // Worker methods
     // ************************************************************************

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/Forager.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/Forager.java	2008-04-26 16:24:32 UTC (rev 19733)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/Forager.java	2008-04-27 11:05:32 UTC (rev 19734)
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverAware;
 import org.drools.solver.core.localsearch.LocalSearchSolverLifecycleListener;
 import org.drools.solver.core.localsearch.StepScope;
 import org.drools.solver.core.localsearch.decider.MoveScope;
@@ -12,7 +11,7 @@
  * Do not implement directly, but instead extend {@link AbstractForager}.
  * @author Geoffrey De Smet
  */
-public interface Forager extends LocalSearchSolverAware, LocalSearchSolverLifecycleListener {
+public interface Forager extends LocalSearchSolverLifecycleListener {
 
     void addMove(MoveScope moveScope);
 




More information about the jboss-svn-commits mailing list