Changeset 10067 for branches/HeuristicLab.Problems.GPDL/HeuristicLab.Grammars/3.3/Symbol.cs

Timestamp:

10/18/13 21:33:56 (11 years ago)

Author:

gkronber

Message:

#2026 worked on brute force solver for GPDL problems.

File:

• branches/HeuristicLab.Problems.GPDL/HeuristicLab.Grammars/3.3/Symbol.cs (modified) (3 diffs)

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Grammars/3.3/Symbol.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+
 namespace HeuristicLab.Grammars {
-  public class Symbol : ISymbol, IEquatable<ISymbol> {
+  public class Symbol : ISymbol {
     public string Name { get; private set; }
-    public IAttribute Attribute { get; private set; }
-    public Symbol(string name, IAttribute attribute = null) {
+    public IEnumerable<IAttribute> Attributes { get; private set; }
+    public Symbol(string name, IEnumerable<IAttribute> attributes = null) {
       this.Name = name;
-      this.Attribute = attribute;
+      if (attributes != null) this.Attributes = attributes;
+      else this.Attributes = Enumerable.Empty<IAttribute>();
     }
 
-    public bool Equals(ISymbol other) {
-      return Name == other.Name;
+    public string GetAttributeString() {
+      if (!Attributes.Any()) return string.Empty;
+      return Attributes.Skip(1).Aggregate(Attributes.First().ToString(), (str, a) => str + ", " + a.ToString());
     }
 
@@ -37 +42 @@
       if (obj == null) return false;
       if (obj == this) return true;
-      var other = obj as ISymbol;
+      var other = obj as Symbol;
       if (other == null) return false;
-      return Equals(other);
+      return this.Name == other.Name; // compare names only
     }
 
@@ -45 +50 @@
       return Name.GetHashCode();
     }
+
+    public override string ToString() {
+      return Name + "<" + GetAttributeString() + ">";
+    }
   }
 }