Changeset 9562 for branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning

Timestamp:

05/31/13 17:20:17 (11 years ago)

Author:

gkronber

Message:

#1967 worked on Gaussian process evolution.

Location:

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning

Files:

• Evaluator.cs (modified) (1 diff)
• GaussianProcessTuning.csproj (modified) (1 diff)
• Grammar.cs (modified) (3 diffs)
• Interpreter.cs (modified) (2 diffs)
• Plugin.cs (added)
• Properties/AssemblyInfo.cs (added)
• Symbols.cs (modified) (1 diff)
• TreeNodes.cs (modified) (1 diff)

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/Evaluator.cs

@@ -65 +65 @@
       InterpreterParameter.ActualValue.EvaluateGaussianProcessConfiguration(tree, ProblemDataParameter.ActualValue, out quality, out solution);
 
+      if (double.IsInfinity(quality) || double.IsNaN(quality)) quality = 1E6; // a large value
       QualityParameter.ActualValue = new DoubleValue(quality);
       if (solution != null)

branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/GaussianProcessTuning.csproj

@@ -160 +160 @@
     <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.Algorithms.DataAnalysis.Experimental\HeuristicLab.Algorithms.DataAnalysis.Experimental.csproj">
+      <Project>{6142B24E-9C86-410B-A65A-1DE65C8C2349}</Project>
+      <Name>HeuristicLab.Algorithms.DataAnalysis.Experimental</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -59 +59 @@
       var covRQiso = new CovRQIso();
       var covNN = new CovNn();
+      var covPoly = new CovPoly();
+      var covPPoly = new CovPiecewisePoly();
       var covMatern1 = new CovMatern(1);
       covMatern1.Name = "CovMatern1";
@@ -102 +104 @@
                             covMatern5,
                             covNN,
+                            covPoly,
+                            covPPoly,
                             covPeriodic,
                             covPeriodic1,
@@ -163 +167 @@
                             covMatern5,
                             covNN,
+                            covPoly,
+                            covPPoly,
                             covPeriodic,
                             covPeriodic1,

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

@@ -36 +36 @@
       gprAlg.GaussianProcessModelCreatorParameter.Value =
         gprAlg.GaussianProcessModelCreatorParameter.ValidValues.First(
-          v => v is GaussianProcessRegressionModelCreator);
+          v => v is EigenGaussianProcessRegressionModelCreator);
       gprAlg.MinimizationIterations = 50;
 
@@ -111 +111 @@
       } else if (node.Symbol is CovNn) {
         return new CovarianceNeuralNetwork();
+      } else if (node.Symbol is CovPoly) {
+        return new CovariancePolynomial();
+      } else if (node.Symbol is CovPiecewisePoly) {
+        return new CovariancePiecewisePolynomial();
       } else if (node.Symbol is CovPeriodic) {
         return new CovariancePeriodic();

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

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

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

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