Changeset 2674 for trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/Symbols

Timestamp:

01/22/10 16:06:48 (15 years ago)

Author:

gkronber

Message:

Added weights for open parameters. #833 (Genetic Programming based search for equations (modeling with multiple target variables))

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/Symbols/OpenParameterFunctionTree.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/Symbols/OpenParameterFunctionTree.cs

@@ -30 +30 @@
     public string VariableName { get; set; }
     public int SampleOffset { get; set; }
+    public double Weight { get; set; }
 
     public OpenParameterFunctionTree(OpenParameter openParameter)
       : base(openParameter) {
+      this.Weight = 1.0;
     }
 
@@ -39 +41 @@
       VariableName = original.VariableName;
       SampleOffset = original.SampleOffset;
+      Weight = original.Weight;
     }
 
@@ -51 +54 @@
       scope.AddSubScope(myVariableScope);
       myVariableScope.AddVariable(CreateSampleOffsetVariable());
+      myVariableScope.AddVariable(CreateWeightVariable());
       return new AtomicOperation(Function.Manipulator, myVariableScope);
     }
@@ -58 +62 @@
       scope.AddSubScope(myVariableScope);
       myVariableScope.AddVariable(CreateSampleOffsetVariable());
+      myVariableScope.AddVariable(CreateWeightVariable());
       return new AtomicOperation(Function.Initializer, myVariableScope);
     }
@@ -72 +77 @@
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<System.Guid, IStorable> persistedObjects) {
       XmlNode node = document.CreateElement(name);
+      XmlAttribute weightAttr = document.CreateAttribute("Weight");
+      weightAttr.Value = XmlConvert.ToString(Weight);
       XmlAttribute variableAttr = document.CreateAttribute("Variable");
       variableAttr.Value = VariableName;
       XmlAttribute sampleOffsetAttr = document.CreateAttribute("SampleOffset");
       sampleOffsetAttr.Value = XmlConvert.ToString(SampleOffset);
+      node.Attributes.Append(weightAttr);
       node.Attributes.Append(sampleOffsetAttr);
       node.Attributes.Append(variableAttr);
@@ -83 +91 @@
     public override void Populate(XmlNode node, IDictionary<System.Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
+      Weight = XmlConvert.ToDouble(node.Attributes["Weight"].Value);
       SampleOffset = XmlConvert.ToInt32(node.Attributes["SampleOffset"].Value);
       VariableName = node.Attributes["Variable"].Value;
@@ -103 +112 @@
       return variable;
     }
+
+    private IVariable CreateWeightVariable() {
+      DoubleData data = new DoubleData(Weight);
+      data.Changed += (sender, args) => Weight = data.Data;
+      var variable = new HeuristicLab.Core.Variable(Variable.WEIGHT, data);
+      variable.ValueChanged += (sender, args) => Weight = ((DoubleData)variable.Value).Data;
+      return variable;
+    }
   }
 }