Changeset 2202 for branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/BakedFunctionTree.cs

Timestamp:

07/28/09 19:24:23 (15 years ago)

Author:

gkronber

Message:

Created a branch for #713

Location:

branches/GP-Refactoring-713

Files:

• . (copied) (copied from trunk)
• sources/HeuristicLab.GP/3.3/BakedFunctionTree.cs (modified) (10 diffs)

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/BakedFunctionTree.cs

@@ -34 +34 @@
     public byte arity = 0;
     public IFunction functionType;
-    public List<object> localData = new List<object>();
+    public List<IVariable> localData = new List<IVariable>();
 
     public LightWeightFunction Clone() {
@@ -40 +40 @@
       clone.arity = arity;
       clone.functionType = functionType;
-      clone.localData.AddRange(localData);
+      clone.localData = localData.Select(v=>(IVariable)v.Clone()).ToList();
       return clone;
     }
@@ -57 +57 @@
     private List<IFunctionTree> subTrees;
     private bool variablesExpanded = false;
-    private List<IVariable> variables;
+    private List<IVariable> variables = new List<IVariable>();
+
+    public IOperator Initializer {
+      get { return Function.Initializer; }
+    }
+
+    public IOperator Manipulator {
+      get { return Function.Manipulator; }
+    }
 
     public BakedFunctionTree() {
@@ -63 +71 @@
     }
 
-    internal BakedFunctionTree(IFunction function)
+    public BakedFunctionTree(IFunction function)
       : this() {
       LightWeightFunction fun = new LightWeightFunction();
@@ -72 +80 @@
       variables = new List<IVariable>();
       variablesExpanded = true;
-      foreach (IVariableInfo variableInfo in function.VariableInfos) {
-        if (variableInfo.Local) {
-          variables.Add((IVariable)function.GetVariable(variableInfo.FormalName).Clone());
-        }
-      }
-    }
-
-    internal BakedFunctionTree(IFunctionTree tree)
-      : this() {
-      LightWeightFunction fun = new LightWeightFunction();
-      fun.functionType = tree.Function;
-      linearRepresentation.Add(fun);
-      foreach (IVariable variable in tree.LocalVariables) {
-        IObjectData value = (IObjectData)variable.Value;
-        fun.localData.Add(value.Data);
-      }
-      foreach (IFunctionTree subTree in tree.SubTrees) {
-        AddSubTree(new BakedFunctionTree(subTree));
-      }
-    }
+    }
+
+    //internal BakedFunctionTree(IFunctionTree tree)
+    //  : this() {
+    //  LightWeightFunction fun = new LightWeightFunction();
+    //  fun.functionType = tree.Function;
+    //  linearRepresentation.Add(fun);
+    //  foreach (IVariable variable in tree.LocalVariables) {
+    //    IObjectData value = (IObjectData)variable.Value;
+    //    fun.localData.Add(value.Data);
+    //  }
+    //  foreach (IFunctionTree subTree in tree.SubTrees) {
+    //    AddSubTree(new BakedFunctionTree(subTree));
+    //  }
+    //}
 
     private int BranchLength(int branchRoot) {
@@ -119 +122 @@
         linearRepresentation[0].localData.Clear();
         foreach (IVariable variable in variables) {
-          object objData = variable.Value;
-          while (objData is IObjectData) objData = ((IObjectData)objData).Data;
-          linearRepresentation[0].localData.Add(objData);
+          //object objData = variable.Value;
+          //while (objData is IObjectData) objData = ((IObjectData)objData).Data;
+          //linearRepresentation[0].localData[variable.Name] = objData;
+          linearRepresentation[0].localData.Add(variable);
         }
         variablesExpanded = false;
@@ -197 +201 @@
         if (!variablesExpanded) {
           variables = new List<IVariable>();
-          IFunction function = Function;
-          int localVariableIndex = 0;
-          foreach (IVariableInfo variableInfo in function.VariableInfos) {
-            if (variableInfo.Local) {
-              IVariable clone = (IVariable)function.GetVariable(variableInfo.FormalName).Clone();
-              IObjectData objData = (IObjectData)clone.Value;
-              if (objData is ConstrainedDoubleData) {
-                ((ConstrainedDoubleData)objData).Data = (double)linearRepresentation[0].localData[localVariableIndex];
-              } else if (objData is ConstrainedIntData) {
-                ((ConstrainedIntData)objData).Data = (int)linearRepresentation[0].localData[localVariableIndex];
-              } else {
-                objData.Data = linearRepresentation[0].localData[localVariableIndex];
-              }
-              variables.Add(clone);
-              localVariableIndex++;
-            }
+          IFunction function = Function;          
+          //int localVariableIndex = 0;
+          foreach (IVariable v in linearRepresentation[0].localData) {
+            //IObjectData objData = (IObjectData)clone.Value;
+            //if (objData is ConstrainedDoubleData) {
+            //  ((ConstrainedDoubleData)objData).Data = (double)linearRepresentation[0].localData[localVariableIndex];
+            //} else if (objData is ConstrainedIntData) {
+            //  ((ConstrainedIntData)objData).Data = (int)linearRepresentation[0].localData[localVariableIndex];
+            //} else {
+            //  objData.Data = linearRepresentation[0].localData[localVariableIndex];
+            //}
+            variables.Add(v);
+            //localVariableIndex++;
           }
           variablesExpanded = true;
@@ -233 +234 @@
 
     public void AddVariable(IVariable variable) {
-      throw new NotSupportedException();
+      if (!variablesExpanded) throw new InvalidOperationException();
+      if (!variables.Exists(v => v.Name == variable.Name))
+        variables.Add(variable);
     }
 
     public void RemoveVariable(string name) {
-      throw new NotSupportedException();
+      if (!variablesExpanded) throw new InvalidOperationException();
+      variables.RemoveAll(v => v.Name == name);
     }
 
@@ -256 +260 @@
     }
 
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
-      FlattenVariables();
-      FlattenTrees();
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      XmlNode linearRepresentationNode = document.CreateElement("LinearRepresentation");
-      foreach (LightWeightFunction f in linearRepresentation) {
-        XmlNode entryNode = PersistenceManager.Persist("Function", f.functionType, document, persistedObjects);
-        XmlAttribute arityAttribute = document.CreateAttribute("Arity");
-        arityAttribute.Value = XmlConvert.ToString(f.arity);
-        entryNode.Attributes.Append(arityAttribute);
-        foreach (object o in f.localData) {
-          if (f.localData.Count > 0) {
-            entryNode.AppendChild(CreateDataNode(document, o));
-          }
-        }
-        linearRepresentationNode.AppendChild(entryNode);
-      }
-
-      node.AppendChild(linearRepresentationNode);
-      return node;
-    }
+    //public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
+    //  FlattenVariables();
+    //  FlattenTrees();
+    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+    //  XmlNode linearRepresentationNode = document.CreateElement("LinearRepresentation");
+    //  foreach (LightWeightFunction f in linearRepresentation) {
+    //    XmlNode entryNode = PersistenceManager.Persist("Function", f.functionType, document, persistedObjects);
+    //    XmlAttribute arityAttribute = document.CreateAttribute("Arity");
+    //    arityAttribute.Value = XmlConvert.ToString(f.arity);
+    //    entryNode.Attributes.Append(arityAttribute);
+    //    foreach (object o in f.localData) {
+    //      if (f.localData.Count > 0) {
+    //        entryNode.AppendChild(CreateDataNode(document, o));
+    //      }
+    //    }
+    //    linearRepresentationNode.AppendChild(entryNode);
+    //  }
+
+    //  node.AppendChild(linearRepresentationNode);
+    //  return node;
+    //}
 
     private XmlNode CreateDataNode(XmlDocument doc, object o) {
@@ -295 +299 @@
     }
 
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      XmlNode linearRepresentationNode = node.SelectSingleNode("LinearRepresentation");
-      foreach (XmlNode entryNode in linearRepresentationNode.ChildNodes) {
-        LightWeightFunction f = new LightWeightFunction();
-        f.arity = XmlConvert.ToByte(entryNode.Attributes["Arity"].Value);
-        foreach (XmlNode dataNode in entryNode.ChildNodes) {
-          f.localData.Add(ParseDataNode(dataNode));
-        }
-        f.functionType = (IFunction)PersistenceManager.Restore(entryNode, restoredObjects);
-        linearRepresentation.Add(f);
-      }
-      treesExpanded = false;
-      variablesExpanded = false;
-    }
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  XmlNode linearRepresentationNode = node.SelectSingleNode("LinearRepresentation");
+    //  foreach (XmlNode entryNode in linearRepresentationNode.ChildNodes) {
+    //    LightWeightFunction f = new LightWeightFunction();
+    //    f.arity = XmlConvert.ToByte(entryNode.Attributes["Arity"].Value);
+    //    foreach (XmlNode dataNode in entryNode.ChildNodes) {
+    //      f.localData.Add(ParseDataNode(dataNode));
+    //    }
+    //    f.functionType = (IFunction)PersistenceManager.Restore(entryNode, restoredObjects);
+    //    linearRepresentation.Add(f);
+    //  }
+    //  treesExpanded = false;
+    //  variablesExpanded = false;
+    //}
 
     private object ParseDataNode(XmlNode dataNode) {