[jboss-svn-commits] JBL Code SVN: r26133 - labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/selector.

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

Author: ge0ffrey
Date: 2009-04-18 12:26:45 -0400 (Sat, 18 Apr 2009)
New Revision: 26133

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/selector/SelectorConfig.java
Log:
selectorConfig should be able to inherit properties

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/selector/SelectorConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/selector/SelectorConfig.java	2009-04-18 15:36:03 UTC (rev 26132)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/selector/SelectorConfig.java	2009-04-18 16:26:45 UTC (rev 26133)
@@ -67,6 +67,10 @@
         this.relativeSelection = relativeSelection;
     }
 
+    public Integer getTopSize() {
+        return topSize;
+    }
+
     public void setTopSize(Integer topSize) {
         this.topSize = topSize;
     }
@@ -120,11 +124,29 @@
     }
 
     public void inherit(SelectorConfig inheritedConfig) {
-        // TODO FIXME
         if (moveFactory == null && moveFactoryClass == null) {
             moveFactory = inheritedConfig.getMoveFactory();
             moveFactoryClass = inheritedConfig.getMoveFactoryClass();
         }
+        if (selectorConfigList == null) {
+            selectorConfigList = inheritedConfig.getSelectorConfigList();
+        } else {
+            List<SelectorConfig> inheritedSelectorConfigList = inheritedConfig.getSelectorConfigList();
+            if (inheritedSelectorConfigList != null) {
+                for (SelectorConfig selectorConfig : inheritedSelectorConfigList) {
+                    selectorConfigList.add(selectorConfig);
+                }
+            }
+        }
+        if (shuffle == null) {
+            shuffle = inheritedConfig.getShuffle();
+        }
+        if (relativeSelection == null) {
+            relativeSelection = inheritedConfig.getRelativeSelection();
+        }
+        if (topSize == null) {
+            topSize = inheritedConfig.getTopSize();
+        }
     }
     
 }