Changeset 155 for trunk/sources/HeuristicLab.Functions/Constant.cs

Timestamp:

04/22/08 18:05:14 (16 years ago)

Author:

gkronber

Message:

merged FunctionsAndStructIdRefactoring-branch (r142, r143, r144, r145, r146, r147, r148, r149, r152, r153) back into the trunk (ticket #112)

File:

• trunk/sources/HeuristicLab.Functions/Constant.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Functions/Constant.cs

@@ -31 +31 @@
 namespace HeuristicLab.Functions {
   public class Constant : FunctionBase {
-
-    private IVariable value;
+    public static readonly string VALUE = "Value";
 
     public override string Description {
@@ -38 +37 @@
     }
 
-    public ConstrainedDoubleData Value {
-      get {
-        return (ConstrainedDoubleData)value.Value;
-      }
-    }
-
     public Constant()
       : base() {
-      AddVariableInfo(new VariableInfo("Value", "The constant value", typeof(ConstrainedDoubleData), VariableKind.None));
-      GetVariableInfo("Value").Local = true;
+      AddVariableInfo(new VariableInfo(VALUE, "The constant value", typeof(ConstrainedDoubleData), VariableKind.None));
+      GetVariableInfo(VALUE).Local = true;
 
       ConstrainedDoubleData valueData = new ConstrainedDoubleData();
       // initialize a default range for the contant value
       valueData.AddConstraint(new DoubleBoundedConstraint(-20.0, 20.0));
-
-      // create the local variable
-      value = new HeuristicLab.Core.Variable("Value", valueData);
-      AddLocalVariable(value);
+      HeuristicLab.Core.Variable value = new HeuristicLab.Core.Variable(VALUE, valueData);
+      AddVariable(value);
 
       // constant can't have suboperators
@@ -61 +52 @@
     }
 
-    public Constant(Constant source, IDictionary<Guid, object> clonedObjects)
-      : base(source, clonedObjects) {
-      value = GetVariable("Value");
+    // constant is evaluated directly. Evaluation reads the local variable value from the tree and returns
+    public override double Evaluate(Dataset dataset, int sampleIndex, IFunctionTree tree) {
+      return ((ConstrainedDoubleData)tree.GetLocalVariable(VALUE).Value).Data;
     }
 
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      Constant clone = new Constant(this, clonedObjects);
-      clonedObjects.Add(clone.Guid, clone);
-      return clone;
-    }
-
-
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-
-      value = GetVariable("Value");
-    }
-
-    public override double Evaluate(Dataset dataset, int sampleIndex) {
-      return ((ConstrainedDoubleData)value.Value).Data;
+    // can't apply a constant
+    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
+      throw new NotSupportedException();
     }