Changeset 9387

Timestamp:

04/22/13 07:10:13 (11 years ago)

Author:

gkronber

Message:

#1967: added CovNN symbol and tree node

Location:

branches/HeuristicLab.Problems.GaussianProcessTuning

Files:

• GaussianProcessDemo/Form1.cs (modified) (2 diffs)
• HeuristicLab.Problems.GaussianProcessTuning/Grammar.cs (modified) (4 diffs)
• HeuristicLab.Problems.GaussianProcessTuning/Interpreter.cs (modified) (1 diff)
• HeuristicLab.Problems.GaussianProcessTuning/Symbols.cs (modified) (1 diff)
• HeuristicLab.Problems.GaussianProcessTuning/TreeNodes.cs (modified) (1 diff)

branches/HeuristicLab.Problems.GaussianProcessTuning/GaussianProcessDemo/Form1.cs

@@ -28 +28 @@
 
       var sum = new CovarianceSum();
-      var t = new CovarianceSquaredExponentialIso();
-      t.InverseLengthParameter.Value = new DoubleValue(1.0 / Math.Exp(-2));
+      var t = new CovarianceNeuralNetwork();
       sum.Terms.Add(t);
       sum.Terms.Add(new CovarianceNoise());
@@ -65 +64 @@
     private void UpdateChart() {
       var hyp = GetSliderValues();
-      var cov = covFunction.GetParameterizedCovarianceFunction(hyp, null);
+      var cov = covFunction.GetParameterizedCovarianceFunction(hyp, Enumerable.Range(0, data.Count));
       var y = Util.SampleGaussianProcess(random, cov, data, alpha);
 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/Grammar.cs

@@ -58 +58 @@
       var covRQard = new CovRQArd(Dimension);
       var covRQiso = new CovRQIso();
+      var covNN = new CovNn();
       var covMatern1 = new CovMatern(1);
       covMatern1.Name = "CovMatern1";
@@ -100 +101 @@
                             covMatern3,
                             covMatern5,
+                            covNN,
                             covPeriodic,
                             covPeriodic1,
@@ -160 +162 @@
                             covMatern3,
                             covMatern5,
+                            covNN,
                             covPeriodic,
                             covPeriodic1,
@@ -168 +171 @@
         }
       }
-
     }
 

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/Interpreter.cs

@@ -109 +109 @@
       } else if (node.Symbol is CovRQArd) {
         return new CovarianceRationalQuadraticArd();
+      } else if (node.Symbol is CovNn) {
+        return new CovarianceNeuralNetwork();
       } else if (node.Symbol is CovPeriodic) {
         return new CovariancePeriodic();

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/Symbols.cs

@@ -502 +502 @@
     }
   }
+  [StorableClass]
+  public sealed class CovNn : Symbol {
+    public override int MinimumArity {
+      get { return 0; }
+    }
+    public override int MaximumArity {
+      get { return 0; }
+    }
+
+    [StorableConstructor]
+    private CovNn(bool deserializing) : base(deserializing) { }
+    private CovNn(CovNn original, Cloner cloner)
+      : base(original, cloner) {
+    }
+
+    public CovNn()
+      : base("CovNn", "neural network covariance function") {
+    }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+    }
+
+    public override ISymbolicExpressionTreeNode CreateTreeNode() {
+      return new CovNnTreeNode(this);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CovNn(this, cloner);
+    }
+  }
 
   [StorableClass]

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/TreeNodes.cs

@@ -228 +228 @@
   }
   [StorableClass]
+  public sealed class CovNnTreeNode : SymbolicExpressionTreeTerminalNode {
+    public new CovNn Symbol { get { return (CovNn)base.Symbol; } }
+
+    [StorableConstructor]
+    private CovNnTreeNode(bool deserializing) : base(deserializing) { }
+    private CovNnTreeNode(CovNnTreeNode original, Cloner cloner)
+      : base(original, cloner) {
+    }
+
+    public CovNnTreeNode(CovNn symbol)
+      : base(symbol) {
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CovNnTreeNode(this, cloner);
+    }
+  }
+  [StorableClass]
   public sealed class CovMaternTreeNode : SymbolicExpressionTreeTerminalNode {
     public new CovMatern Symbol { get { return (CovMatern)base.Symbol; } }