Changeset 63


Ignore:
Timestamp:
03/13/08 23:40:09 (13 years ago)
Author:
swagner
Message:

Worked on ticket #48

  • removed experimental version of CombinedOperator
  • adapted Aliases in IScope interface
Location:
trunk/sources
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Core/Interfaces/IScope.cs

    r61 r63  
    3030
    3131    ICollection<IVariable> Variables { get; }
    32     ICollection<string> Aliases { get; }
     32    IEnumerable<KeyValuePair<string, string>> Aliases { get; }
    3333    IList<IScope> SubScopes { get; }
    3434
  • trunk/sources/HeuristicLab.Core/Scope.cs

    r61 r63  
    3939    }
    4040    private IDictionary<string, string> myAliases;
    41     public ICollection<string> Aliases {
    42       get { return myAliases.Values; }
     41    public IEnumerable<KeyValuePair<string, string>> Aliases {
     42      get { return myAliases; }
    4343    }
    4444    private List<IScope> mySubScopes;
     
    199199        RemoveVariable(variableNames[j]);
    200200
    201       string[] aliases = new string[Aliases.Count];
    202       i = 0;
    203       foreach (string alias in myAliases.Keys) {
    204         aliases[i] = alias;
    205         i++;
    206       }
     201      KeyValuePair<string, string>[] aliases = new KeyValuePair<string,string>[myAliases.Count];
     202      myAliases.CopyTo(aliases, 0);
    207203      for (int j = 0; j < aliases.Length; j++)
    208         RemoveAlias(aliases[j]);
     204        RemoveAlias(aliases[j].Key);
    209205
    210206      while (SubScopes.Count > 0)
Note: See TracChangeset for help on using the changeset viewer.