Changeset 8439

Timestamp:

08/08/12 17:52:27 (12 years ago)

Author:

gkronber

Message:

#1902 implemented unit tests for mean and covariance functions. implemented sum and product mean function. fixed incorrect gradient calculation in covprod

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceProd.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanProd.cs (added)
• HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanSum.cs (added)
• HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4 (added)
• HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/GaussianProcessFunctionsTest.cs (added)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceProd.cs

@@ -87 +87 @@
 
     public double[] GetGradient(int i, int j) {
-      return factors.Select(t => t.GetGradient(i, j)).SelectMany(seq => seq).ToArray();
+      return Enumerable.Range(0, GetNumberOfParameters(numberOfVariables)).Select(k => GetGradient(i, j, k)).ToArray();
+    }
+    public double GetGradient(int i, int j, int k) {
+      // map from parameter index to factor
+      var vi = factors.Select((f, idx) => Enumerable.Repeat(idx, f.GetNumberOfParameters(numberOfVariables))).SelectMany(x => x).ToArray();
+      double res = 1.0;
+      int jj = Enumerable.Range(0, k).Count(e => vi[e] == vi[k]);
+      for (int ii = 0; ii < factors.Count; ii++) {
+        var f = factors[ii];
+        if (ii == vi[k]) {
+          res *= f.GetGradient(i, j)[jj];
+        } else {
+          res *= f.GetCovariance(i, j);
+        }
+      }
+      return res;
     }
   }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -120 +120 @@
     </Compile>
     <Compile Include="FixedDataAnalysisAlgorithm.cs" />
+    <Compile Include="GaussianProcess\MeanProd.cs" />
+    <Compile Include="GaussianProcess\MeanSum.cs" />
     <Compile Include="GaussianProcess\CovarianceProd.cs" />
     <Compile Include="GaussianProcess\CovarianceSum.cs" />

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -290 +290 @@
     <Compile Include="HeuristicLab-3.3\ThreadSafeLogTest.cs" />
     <Compile Include="HeuristicLab-3.3\ToStringTest.cs" />
+    <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\GaussianProcessFunctionsTest.cs" />
     <Compile Include="HeuristicLab.Analysis-3.3\MultidimensionalScalingTest.cs" />
     <Compile Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3\Auxiliary.cs" />