Changeset 16026 for branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Symbol.cs

Timestamp:

07/27/18 19:28:18 (6 years ago)

Author:

bburlacu

Message:

#2886:

• replace functionally-overlapping classes Production and SymbolString with a single class SymbolList
• refactor methods from Grammar class as methods and properties of SymbolList
• add parameter for the number of constant optimization iterations
• refactor code

File:

• branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Symbol.cs (modified) (2 diffs)

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Symbol.cs

@@ -2 +2 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using HeuristicLab.Common;
@@ -102 +103 @@
   }
 
-  [StorableClass]
-  public class Production : DeepCloneable, IList<Symbol> {
-    [Storable]
-    private List<Symbol> symbols;
-
-    public int Count { get { return symbols.Count; } }
-
-    public bool IsReadOnly {
-      get { return false; }
-    }
-
-    public Symbol this[int index] {
-      get { return symbols[index]; }
-      set { symbols[index] = value; }
-    }
-
-    public Production(params Symbol[] symbols) {
-      this.symbols = symbols.ToList();
-    }
-
-    public Production(IEnumerable<Symbol> symbols) {
-      this.symbols = symbols.ToList();
-    }
-
-    [StorableConstructor]
-    protected Production(bool deserializing) { }
-
-    protected Production(Production original, Cloner cloner) {
-      symbols = original.symbols.Select(cloner.Clone).ToList();
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Production(this, cloner);
-    }
-
-    public override string ToString() {
-      return string.Join(" ", this);
-    }
-
-    #region IList<Symbol> methods
-    public IEnumerator<Symbol> GetEnumerator() {
-      return symbols.GetEnumerator();
-    }
-
-    IEnumerator IEnumerable.GetEnumerator() {
-      return GetEnumerator();
-    }
-
-    public int IndexOf(Symbol item) {
-      return symbols.IndexOf(item);
-    }
-
-    public void Insert(int index, Symbol item) {
-      symbols.Insert(index, item);
-    }
-
-    public void RemoveAt(int index) {
-      symbols.RemoveAt(index);
-    }
-
-    public void Add(Symbol item) {
-      symbols.Add(item);
-    }
-
-    public void Clear() {
-      symbols.Clear();
-    }
-
-    public bool Contains(Symbol item) {
-      return symbols.Contains(item);
-    }
-
-    public void CopyTo(Symbol[] array, int arrayIndex) {
-      symbols.CopyTo(array, arrayIndex);
-    }
-
-    public void CopyTo(int index, Symbol[] array, int arrayIndex, int count) {
-      symbols.CopyTo(index, array, arrayIndex, count);
-    }
-
-    public bool Remove(Symbol item) {
-      return symbols.Remove(item);
-    }
-    #endregion
-  }
+ 
 }