Changeset 6284 for branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

05/25/11 10:50:21 (13 years ago)

Author:

mkommend

Message:

#1479: Created branch for grammar editing.

Location:

branches/GP.Grammar.Editor

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbol.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionGrammar.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionGrammarBase.cs (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammar.cs (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs (modified) (13 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Symbol.cs (modified) (4 diffs)

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs

@@ -179 +179 @@
           ReplaceWithMinimalTree(random, root, parent, argumentIndex);
         } else {
-          var allowedSymbols = (from s in parent.Grammar.Symbols
+          var allowedSymbols = (from s in parent.Grammar.GetAllowedChildSymbols(parent.Symbol, argumentIndex)
                                 where s.InitialFrequency > 0.0
-                                where parent.Grammar.IsAllowedChildSymbol(parent.Symbol, s, argumentIndex)
-                                where parent.Grammar.GetMinimumExpressionDepth(s) < maxDepth - extensionDepth + 1
-                                where parent.Grammar.GetMaximumExpressionLength(s) > targetLength - totalListMinLength - currentLength
+                                where s.Fixed || parent.Grammar.GetMinimumExpressionDepth(s) < maxDepth - extensionDepth + 1
+                                where s.Fixed || parent.Grammar.GetMaximumExpressionLength(s) > targetLength - totalListMinLength - currentLength
                                 select s)
                                .ToList();

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs

@@ -96 +96 @@
       int maxInsertedBranchDepth = maxTreeDepth - GetBranchLevel(parent0.Root, crossoverPoint0.Parent);
 
-
       List<ISymbolicExpressionTreeNode> allowedBranches = new List<ISymbolicExpressionTreeNode>();
       parent1.Root.ForEachNodePostfix((n) => {
-        if (n.GetLength() <= maxInsertedBranchLength &&
-          n.GetDepth() <= maxInsertedBranchDepth &&
-          IsMatchingPointType(crossoverPoint0, n))
+        if (!n.Symbol.Fixed &&
+            n.GetLength() <= maxInsertedBranchLength &&
+            n.GetDepth() <= maxInsertedBranchDepth &&
+            IsMatchingPointType(crossoverPoint0, n))
           allowedBranches.Add(n);
       });
@@ -158 +158 @@
       List<CutPoint> leafCrossoverPoints = new List<CutPoint>();
       parent0.Root.ForEachNodePostfix((n) => {
-        if (n.Subtrees.Any() && n != parent0.Root) {
+        if (!n.Symbol.Fixed && n.Subtrees.Any() && n != parent0.Root) {
           foreach (var child in n.Subtrees) {
             if (child.GetLength() <= maxBranchLength &&

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj

@@ -167 +167 @@
     <Compile Include="Symbols\Argument.cs" />
     <Compile Include="Symbols\ArgumentTreeNode.cs" />
+    <Compile Include="Symbols\GroupSymbol.cs" />
     <Compile Include="Symbols\StartSymbol.cs" />
     <Compile Include="Symbols\InvokeFunction.cs" />

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbol.cs

@@ -27 +27 @@
     ISymbolicExpressionTreeNode CreateTreeNode();
     double InitialFrequency { get; set; }
+    bool Fixed { get; set; }
 
     event EventHandler Changed;

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionGrammar.cs

@@ -35 +35 @@
     bool ReadOnly { get; set; }
     event EventHandler ReadOnlyChanged;
+
+    void AddSymbol(ISymbol symbol);
+    void RemoveSymbol(ISymbol symbol);
+
+    void AddAllowedChildSymbol(ISymbol parent, ISymbol child);
+    void AddAllowedChildSymbol(ISymbol parent, ISymbol child, int argumentIndex);
+    void RemoveAllowedChildSymbol(ISymbol parent, ISymbol child);
+    void RemoveAllowedChildSymbol(ISymbol parent, ISymbol child, int argumentIndex);
+
+    void SetSubtreeCount(ISymbol symbol, int minimumSubtreeCount, int maximumSubtreeCount);
   }
 }

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionGrammarBase.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Core;
@@ -41 +42 @@
     int GetMaximumExpressionLength(ISymbol start);
     int GetMinimumExpressionDepth(ISymbol start);
+
+    event EventHandler Changed;
   }
 }

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammar.cs

@@ -160 +160 @@
     }
 
-    #region IStatefulItem
+    #region IStatefulItem methods
     void IStatefulItem.InitializeState() { }
     void IStatefulItem.ClearState() {
@@ -166 +166 @@
     }
     #endregion
+
+    #region ISymbolicExpressionGrammar methods
+    void ISymbolicExpressionGrammar.AddSymbol(ISymbol symbol) {
+      if (ReadOnly) throw new InvalidOperationException();
+      base.AddSymbol(symbol);
+    }
+    void ISymbolicExpressionGrammar.RemoveSymbol(ISymbol symbol) {
+      if (ReadOnly) throw new InvalidOperationException();
+      base.RemoveSymbol(symbol);
+    }
+
+    void ISymbolicExpressionGrammar.AddAllowedChildSymbol(ISymbol parent, ISymbol child) {
+      if (ReadOnly) throw new InvalidOperationException();
+      base.AddAllowedChildSymbol(parent, child);
+    }
+    void ISymbolicExpressionGrammar.AddAllowedChildSymbol(ISymbol parent, ISymbol child, int argumentIndex) {
+      if (ReadOnly) throw new InvalidOperationException();
+      base.AddAllowedChildSymbol(parent, child, argumentIndex);
+    }
+    void ISymbolicExpressionGrammar.RemoveAllowedChildSymbol(ISymbol parent, ISymbol child) {
+      if (ReadOnly) throw new InvalidOperationException();
+      base.RemoveAllowedChildSymbol(parent, child);
+    }
+    void ISymbolicExpressionGrammar.RemoveAllowedChildSymbol(ISymbol parent, ISymbol child, int argumentIndex) {
+      if (ReadOnly) throw new InvalidOperationException();
+      base.RemoveAllowedChildSymbol(parent, child, argumentIndex);
+    }
+
+    void ISymbolicExpressionGrammar.SetSubtreeCount(ISymbol symbol, int minimumSubtreeCount, int maximumSubtreeCount) {
+      if (ReadOnly) throw new InvalidOperationException();
+      base.SetSubtreeCount(symbol, minimumSubtreeCount, maximumSubtreeCount);
+    }
+    #endregion
   }
 }

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs

@@ -93 +93 @@
       cachedMinExpressionDepth = new Dictionary<string, int>();
 
-
       symbols = original.symbols.ToDictionary(x => x.Key, y => (ISymbol)cloner.Clone(y.Value));
       symbolSubtreeCount = new Dictionary<string, Tuple<int, int>>(original.symbolSubtreeCount);
@@ -128 +127 @@
       symbolSubtreeCount.Add(symbol.Name, Tuple.Create(0, 0));
       ClearCaches();
+      OnChanged();
     }
 
@@ -133 +133 @@
       symbol.NameChanging += new EventHandler<CancelEventArgs<string>>(Symbol_NameChanging);
       symbol.NameChanged += new EventHandler(Symbol_NameChanged);
+      symbol.Changed += new EventHandler(Symbol_Changed);
     }
     private void DeregisterSymbolEvents(ISymbol symbol) {
       symbol.NameChanging -= new EventHandler<CancelEventArgs<string>>(Symbol_NameChanging);
       symbol.NameChanged -= new EventHandler(Symbol_NameChanged);
+      symbol.Changed -= new EventHandler(Symbol_Changed);
     }
 
@@ -179 +181 @@
 
       ClearCaches();
+      OnChanged();
+    }
+
+    private void Symbol_Changed(object sende, EventArgs e) {
+      ClearCaches();
+      OnChanged();
     }
 
@@ -200 +208 @@
       DeregisterSymbolEvents(symbol);
       ClearCaches();
+      OnChanged();
     }
 
@@ -217 +226 @@
       childSymbols.Add(child.Name);
       ClearCaches();
+      OnChanged();
     }
 
@@ -231 +241 @@
       childSymbols.Add(child.Name);
       ClearCaches();
+      OnChanged();
     }
 
@@ -236 +247 @@
       List<string> childSymbols;
       if (allowedChildSymbols.TryGetValue(child.Name, out childSymbols)) {
-        if (allowedChildSymbols[parent.Name].Remove(child.Name))
+        if (allowedChildSymbols[parent.Name].Remove(child.Name)) {
           ClearCaches();
+          OnChanged();
+        }
       }
     }
@@ -245 +258 @@
       List<string> childSymbols;
       if (allowedChildSymbolsPerIndex.TryGetValue(key, out childSymbols)) {
-        if (allowedChildSymbolsPerIndex[key].Remove(child.Name))
+        if (allowedChildSymbolsPerIndex[key].Remove(child.Name)) {
           ClearCaches();
+          OnChanged();
+        }
       }
     }
@@ -258 +273 @@
       symbolSubtreeCount[symbol.Name] = Tuple.Create(minimumSubtreeCount, maximumSubtreeCount);
       ClearCaches();
+      OnChanged();
     }
     #endregion
@@ -304 +320 @@
         result = result.Union(temp);
 
-      return result.Select(x => GetSymbol(x));
+      return result.Select(x => GetSymbol(x)).Where(s => !s.InitialFrequency.IsAlmost(0.0));
     }
 
@@ -313 +329 @@
       return symbolSubtreeCount[symbol.Name].Item2;
     }
-
 
     private void ClearCaches() {
@@ -369 +384 @@
       return temp;
     }
+
+    public event EventHandler Changed;
+    protected virtual void OnChanged() {
+      var handler = Changed;
+      if (handler != null) Changed(this, EventArgs.Empty);
+    }
     #endregion
   }

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Symbol.cs

@@ -42 +42 @@
       }
     }
+
+    [Storable(DefaultValue = false)]
+    private bool @fixed;
+    public bool Fixed {
+      get { return @fixed; }
+      set {
+        if (value != @fixed) {
+          @fixed = value;
+          OnChanged(EventArgs.Empty);
+        }
+      }
+    }
+
     public override bool CanChangeName {
       get { return !(this is IReadOnlySymbol); }
@@ -55 +68 @@
       : base(original, cloner) {
       initialFrequency = original.initialFrequency;
+      @fixed = original.@fixed;
     }
 
@@ -60 +74 @@
       : base(name, description) {
       initialFrequency = 1.0;
+      @fixed = false;
     }
 
@@ -68 +83 @@
     #region events
     public event EventHandler Changed;
-    protected void OnChanged(EventArgs e) {
+    protected virtual void OnChanged(EventArgs e) {
       EventHandler handlers = Changed;
       if (handlers != null)