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

Timestamp:

05/30/11 16:59:50 (14 years ago)

Author:

mkommend

Message:

#1479: Added updated version of grammar editor.

Location:

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

Files:

• Creators/ProbabilisticTreeCreator.cs (modified) (1 diff)
• SymbolicExpressionGrammarBase.cs (modified) (1 diff)
• Symbols/GroupSymbol.cs (modified) (1 diff)

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

@@ -182 +182 @@
                                 where s.InitialFrequency > 0.0
                                 where s.Fixed || parent.Grammar.GetMinimumExpressionDepth(s) < maxDepth - extensionDepth + 1
-                                where s.Fixed || parent.Grammar.GetMaximumExpressionLength(s) > targetLength - totalListMinLength - currentLength
+                                //where s.Fixed || parent.Grammar.GetMaximumExpressionLength(s) > targetLength - totalListMinLength - currentLength
                                 select s)
                                .ToList();

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

@@ -154 +154 @@
       }
 
+      foreach (GroupSymbol group in symbols.Values.OfType<GroupSymbol>())
+        group.symbols.Remove(symbol);
+
       ClearCaches();
       OnChanged();

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

@@ -27 +27 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
   public sealed class GroupSymbol : Symbol, IReadOnlySymbol {
-    private List<ISymbol> symbols;
+    internal List<ISymbol> symbols;
 
     [Storable]