Changeset 61 for trunk

Timestamp:

03/13/08 23:20:02 (17 years ago)

Author:

swagner

Message:

Worked on ticket #48

• merged changes from branch Modularization (r55:59) back into trunk again

Location:

trunk/sources

Files:

• HeuristicLab.Core/AliasEventArgs.cs (copied) (copied from branches/Modularization/HeuristicLab.Core/AliasEventArgs.cs)
• HeuristicLab.Core/HeuristicLab.Core.csproj (modified) (1 diff)
• HeuristicLab.Core/Interfaces/IScope.cs (modified) (3 diffs)
• HeuristicLab.Core/OperatorBase.cs (modified) (2 diffs)
• HeuristicLab.Core/Scope.cs (modified) (9 diffs)
• HeuristicLab.Operators/CombinedOperator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/HeuristicLab.Core.csproj

@@ -91 +91 @@
       <DependentUpon>ChooseTypeDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="AliasEventArgs.cs" />
     <Compile Include="OperatorBaseDescriptionView.cs">
       <SubType>UserControl</SubType>

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

@@ -30 +30 @@
 
     ICollection<IVariable> Variables { get; }
+    ICollection<string> Aliases { get; }
     IList<IScope> SubScopes { get; }
 
@@ -42 +43 @@
     IItem GetVariableValue(string name, bool recursiveLookup, bool throwOnError);
 
+    string TranslateName(string name);
+    void AddAlias(string alias, string name);
+    void RemoveAlias(string alias);
+
     void AddSubScope(IScope scope);
     void RemoveSubScope(IScope scope);
@@ -52 +57 @@
     event EventHandler<VariableEventArgs> VariableAdded;
     event EventHandler<VariableEventArgs> VariableRemoved;
+    event EventHandler<AliasEventArgs> AliasAdded;
+    event EventHandler<AliasEventArgs> AliasRemoved;
     event EventHandler<ScopeIndexEventArgs> SubScopeAdded;
     event EventHandler<ScopeIndexEventArgs> SubScopeRemoved;

trunk/sources/HeuristicLab.Core/OperatorBase.cs

@@ -360 +360 @@
         }
       } else {
-        return scope.GetVariableValue(info.ActualName, recursiveLookup, throwOnError);
+        return scope.GetVariableValue(formalName, recursiveLookup, throwOnError);
       }
     }
@@ -367 +367 @@
     public virtual IOperation Execute(IScope scope) {
       myCanceled = false;
+
+      foreach (IVariableInfo variableInfo in VariableInfos)
+        scope.AddAlias(variableInfo.FormalName, variableInfo.ActualName);
+
       IOperation next = Apply(scope);
       OnExecuted();

trunk/sources/HeuristicLab.Core/Scope.cs

@@ -38 +38 @@
       get { return myVariables.Values; }
     }
+    private IDictionary<string, string> myAliases;
+    public ICollection<string> Aliases {
+      get { return myAliases.Values; }
+    }
     private List<IScope> mySubScopes;
     public IList<IScope> SubScopes {
@@ -46 +50 @@
       myName = "Anonymous";
       myVariables = new Dictionary<string, IVariable>();
+      myAliases = new Dictionary<string, string>();
       mySubScopes = new List<IScope>();
     }
@@ -108 +113 @@
     public IItem GetVariableValue(string name, bool recursiveLookup, bool throwOnError) {
       IVariable variable;
+      name = TranslateName(name);
       if (myVariables.TryGetValue(name, out variable)) {
         return variable.Value;
@@ -122 +128 @@
     }
 
+    public string TranslateName(string name) {
+      while (myAliases.ContainsKey(name))
+        name = myAliases[name];
+      if (parent != null)
+        name = parent.TranslateName(name);
+      return name;
+    }
+    public void AddAlias(string alias, string name) {
+      RemoveAlias(alias);
+      if (alias != name) {
+        myAliases.Add(alias, name);
+        OnAliasAdded(alias);
+      }
+    }
+    public void RemoveAlias(string alias) {
+      if (myAliases.ContainsKey(alias)) {
+        myAliases.Remove(alias);
+        OnAliasRemoved(alias);
+      }
+    }
+
     public void AddSubScope(IScope scope) {
       scope.SetParent(this);
@@ -172 +199 @@
         RemoveVariable(variableNames[j]);
 
+      string[] aliases = new string[Aliases.Count];
+      i = 0;
+      foreach (string alias in myAliases.Keys) {
+        aliases[i] = alias;
+        i++;
+      }
+      for (int j = 0; j < aliases.Length; j++)
+        RemoveAlias(aliases[j]);
+
       while (SubScopes.Count > 0)
         RemoveSubScope(SubScopes[0]);
@@ -182 +218 @@
       foreach (IVariable variable in myVariables.Values)
         clone.AddVariable((IVariable)Auxiliary.Clone(variable, clonedObjects));
+      foreach (KeyValuePair<string, string> alias in myAliases)
+        clone.AddAlias(alias.Key, alias.Value);
       for (int i = 0; i < SubScopes.Count; i++)
         clone.AddSubScope((IScope)Auxiliary.Clone(SubScopes[i], clonedObjects));
@@ -197 +235 @@
       if (VariableRemoved != null)
         VariableRemoved(this, new VariableEventArgs(variable));
+    }
+    public event EventHandler<AliasEventArgs> AliasAdded;
+    protected virtual void OnAliasAdded(string alias) {
+      if (AliasAdded != null)
+        AliasAdded(this, new AliasEventArgs(alias));
+    }
+    public event EventHandler<AliasEventArgs> AliasRemoved;
+    protected virtual void OnAliasRemoved(string alias) {
+      if (AliasRemoved != null)
+        AliasRemoved(this, new AliasEventArgs(alias));
     }
     public event EventHandler<ScopeIndexEventArgs> SubScopeAdded;
@@ -226 +274 @@
       node.AppendChild(variables);
 
+      XmlNode aliases = document.CreateNode(XmlNodeType.Element, "Aliases", null);
+      foreach (KeyValuePair<string, string> alias in myAliases) {
+        XmlNode aliasNode = document.CreateNode(XmlNodeType.Element, "Alias", null);
+        XmlAttribute keyAttribute = document.CreateAttribute("Alias");
+        keyAttribute.Value = alias.Key;
+        aliasNode.Attributes.Append(keyAttribute);
+        XmlAttribute valueAttribute = document.CreateAttribute("Name");
+        valueAttribute.Value = alias.Value;
+        aliasNode.Attributes.Append(valueAttribute);
+        aliases.AppendChild(aliasNode);
+      }
+      node.AppendChild(aliases);
+
       XmlNode subScopes = document.CreateNode(XmlNodeType.Element, "SubScopes", null);
       for (int i = 0; i < SubScopes.Count; i++)
@@ -243 +304 @@
       }
 
+      XmlNode aliases = node.SelectSingleNode("Aliases");
+      if (aliases != null) {
+        foreach (XmlNode aliasNode in aliases.ChildNodes)
+          AddAlias(aliasNode.Attributes["Alias"].Value, aliasNode.Attributes["Name"].Value);
+      }
+
       XmlNode subScopes = node.SelectSingleNode("SubScopes");
       for (int i = 0; i < subScopes.ChildNodes.Count; i++) {

trunk/sources/HeuristicLab.Operators/CombinedOperator.cs

@@ -71 +71 @@
           scope.AddVariable(new Variable(SubOperators[i].Name, SubOperators[i]));
         }
-
-        foreach (IVariableInfo variableInfo in VariableInfos) {
-          IItem value = GetVariableValue(variableInfo.FormalName, scope, true, true);
-          if (scope.GetVariable(variableInfo.FormalName) != null)
-            scope.RemoveVariable(variableInfo.FormalName);
-          scope.AddVariable(new Variable(variableInfo.FormalName, value));
-        }
-
         return new AtomicOperation(OperatorGraph.InitialOperator, scope);
       } else {