Changeset 3990 for trunk

Timestamp:

06/30/10 15:28:07 (14 years ago)

Author:

gkronber

Message:

Improved GlobalSymbolicExpressionGrammar regarding memory efficiency and fixed a bug in cloning. #938

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/GlobalSymbolicExpressionGrammar.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/GlobalSymbolicExpressionGrammar.cs

@@ -40 +40 @@
       set { 
         minFunctionDefinitions = value;
-        Initialize();
+        UpdateAdfConstraints();
       }
     }
@@ -49 +49 @@
       set { 
         maxFunctionDefinitions = value;
-        Initialize();
+        UpdateAdfConstraints();
       }
     }
@@ -58 +58 @@
       set { 
         minFunctionArguments = value;
-        Initialize();
       }
     }
@@ -67 +66 @@
       set { 
         maxFunctionArguments = value;
-        Initialize();
       }
     }
+
     [Storable]
-    private ISymbolicExpressionGrammar mainBranchGrammar;
+    private Defun defunSymbol;
 
     public GlobalSymbolicExpressionGrammar() : base() { } // empty constructor for cloning
@@ -79 +78 @@
       maxFunctionArguments = 3;
       maxFunctionDefinitions = 3;
-      this.mainBranchGrammar = mainBranchGrammar;
-      Initialize();
+      Initialize(mainBranchGrammar);
     }
 
-    private void Initialize() {
+    private void Initialize(ISymbolicExpressionGrammar mainBranchGrammar) {
       base.Clear();
 
@@ -90 +88 @@
 
       StartSymbol = new ProgramRootSymbol();
-      var defunSymbol = new Defun();
+      defunSymbol = new Defun();
       AddSymbol(StartSymbol);
       AddSymbol(defunSymbol);
@@ -98 +96 @@
       SetMinSubtreeCount(defunSymbol, 1);
       SetMaxSubtreeCount(defunSymbol, 1);
+
+      // ADF branches maxFunctionDefinitions 
+      for (int argumentIndex = 1; argumentIndex < maxFunctionDefinitions + 1; argumentIndex++) {
+        SetAllowedChild(StartSymbol, defunSymbol, argumentIndex);
+      }
 
       if (mainBranchGrammar != null) {
@@ -109 +112 @@
         // the start symbol of the mainBranchGrammar is allowed as the result producing branch
         SetAllowedChild(StartSymbol, mainBranchGrammar.StartSymbol, 0);
-
-        // ADF branches maxFunctionDefinitions 
-        for (int argumentIndex = 1; argumentIndex < maxFunctionDefinitions + 1; argumentIndex++) {
-          SetAllowedChild(StartSymbol, defunSymbol, argumentIndex);
-        }
 
         // copy syntax constraints from mainBranchGrammar
@@ -133 +131 @@
       }
     }
+    private void UpdateAdfConstraints() {
+      SetMinSubtreeCount(StartSymbol, minFunctionDefinitions + 1);
+      SetMaxSubtreeCount(StartSymbol, maxFunctionDefinitions + 1);
+      
+      // ADF branches maxFunctionDefinitions 
+      for (int argumentIndex = 1; argumentIndex < maxFunctionDefinitions + 1; argumentIndex++) {
+        SetAllowedChild(StartSymbol, defunSymbol, argumentIndex);
+      }
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       GlobalSymbolicExpressionGrammar clone = (GlobalSymbolicExpressionGrammar)base.Clone(cloner);
+      clone.defunSymbol = defunSymbol;
       clone.maxFunctionArguments = maxFunctionArguments;
       clone.maxFunctionDefinitions = maxFunctionDefinitions;
       clone.minFunctionArguments = minFunctionArguments;
       clone.minFunctionDefinitions = minFunctionDefinitions;
-      clone.mainBranchGrammar = (ISymbolicExpressionGrammar)cloner.Clone(mainBranchGrammar);
       return clone;
     }