Changeset 63 for trunk/sources

Timestamp:

03/13/08 23:40:09 (16 years ago)

Author:

swagner

Message:

Worked on ticket #48

• removed experimental version of CombinedOperator
• adapted Aliases in IScope interface

Location:

trunk/sources

Files:

• HeuristicLab.Core/Interfaces/IScope.cs (modified) (1 diff)
• HeuristicLab.Core/Scope.cs (modified) (2 diffs)
• HeuristicLab.Operators/CombinedOperator_experimental.cs (deleted)

trunk/sources/HeuristicLab.Core/Interfaces/IScope.cs

@@ -30 +30 @@
 
     ICollection<IVariable> Variables { get; }
-    ICollection<string> Aliases { get; }
+    IEnumerable<KeyValuePair<string, string>> Aliases { get; }
     IList<IScope> SubScopes { get; }
 

trunk/sources/HeuristicLab.Core/Scope.cs

@@ -39 +39 @@
     }
     private IDictionary<string, string> myAliases;
-    public ICollection<string> Aliases {
-      get { return myAliases.Values; }
+    public IEnumerable<KeyValuePair<string, string>> Aliases {
+      get { return myAliases; }
     }
     private List<IScope> mySubScopes;
@@ -199 +199 @@
         RemoveVariable(variableNames[j]);
 
-      string[] aliases = new string[Aliases.Count];
-      i = 0;
-      foreach (string alias in myAliases.Keys) {
-        aliases[i] = alias;
-        i++;
-      }
+      KeyValuePair<string, string>[] aliases = new KeyValuePair<string,string>[myAliases.Count];
+      myAliases.CopyTo(aliases, 0);
       for (int j = 0; j < aliases.Length; j++)
-        RemoveAlias(aliases[j]);
+        RemoveAlias(aliases[j].Key);
 
       while (SubScopes.Count > 0)