Changeset 2634

Timestamp:

01/18/10 09:31:01 (14 years ago)

Author:

gkronber

Message:

Added target variable property for the scaling tree evaluator. #823

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3

Files:

• ScalingTreeEvaluator.cs (modified) (4 diffs)
• ScalingTreeEvaluatorInjector.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/ScalingTreeEvaluator.cs

@@ -27 +27 @@
 using System.Collections.Generic; // double.IsAlmost extension
 using System.Linq;
+using System.Xml;
 namespace HeuristicLab.GP.StructureIdentification {
   /// <summary>
@@ -37 +38 @@
     public ScalingTreeEvaluator(double minValue, double maxValue) : base(minValue, maxValue) { }
 
+    private string targetVariable;
+    public string TargetVariable {
+      get { return targetVariable; }
+      set { targetVariable = value; }
+    }
+
     public override IEnumerable<double> Evaluate(Dataset dataset, IFunctionTree tree, IEnumerable<int> rows) {
       double[] result = base.Evaluate(dataset, tree, rows).ToArray();
-      double tMean = dataset.GetMean(0);
+      int targetVariableIndex = dataset.GetVariableIndex(targetVariable);
+      double tMean = dataset.GetMean(targetVariableIndex);
       double xMean = Statistics.Mean(result);
       double sumXT = 0;
@@ -45 +53 @@
       for (int i = 0; i < result.Length; i++) {
         double x = result[i];
-        double t = dataset.GetValue(rows.ElementAt(i), 0);
+        double t = dataset.GetValue(rows.ElementAt(i), targetVariableIndex);
         sumXT += (x - xMean) * (t - tMean);
         sumXX += (x - xMean) * (x - xMean);
@@ -59 +67 @@
       return result;
     }
+
+    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+      ScalingTreeEvaluator clone = (ScalingTreeEvaluator)base.Clone(clonedObjects);
+      clone.targetVariable = targetVariable;
+      return clone;
+    }
+
+    public override System.Xml.XmlNode GetXmlNode(string name, System.Xml.XmlDocument document, IDictionary<Guid, HeuristicLab.Core.IStorable> persistedObjects) {
+      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+      XmlAttribute targetVariableAttribute = document.CreateAttribute("TargetVariable");
+      targetVariableAttribute.Value = targetVariable;
+      node.Attributes.Append(targetVariableAttribute);
+      return node;
+    }
+
+    public override void Populate(XmlNode node, IDictionary<Guid, HeuristicLab.Core.IStorable> restoredObjects) {
+      base.Populate(node, restoredObjects);
+      targetVariable = node.Attributes["TargetVariable"].Value;
+    }
   }
 }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/ScalingTreeEvaluatorInjector.cs

@@ -57 +57 @@
       double maxEstimatedValue = mean + punishmentFactor * range;
       ScalingTreeEvaluator evaluator = new ScalingTreeEvaluator(minEstimatedValue, maxEstimatedValue);
+      evaluator.TargetVariable = targetVariable;
       scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("TreeEvaluator"), evaluator));
       return null;