Changeset 13867 for branches/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction/Interpreter.cs

Timestamp:

05/31/16 17:05:49 (8 years ago)

Author:

gkronber

Message:

#2608 worked on glucose prediction problem

File:

• branches/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction/Interpreter.cs (modified) (4 diffs)

branches/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction/Interpreter.cs

@@ -101 +101 @@
       } else if (node.Symbol is PredictedGlucoseVariableSymbol) {
         var n = (PredictedGlucoseVariableTreeNode)node;
-        return data.predGluc[k + n.RowOffset];
+        return n.Weight * data.predGluc[k + n.RowOffset];
       } else if (node.Symbol is RealGlucoseVariableSymbol) {
         var n = (RealGlucoseVariableTreeNode)node;
-        return data.realGluc[k + n.RowOffset];
+        return n.Weight * data.realGluc[k + n.RowOffset];
       } else if (node.Symbol is CurvedChVariableSymbol) {
         var n = (CurvedChVariableTreeNode)node;
@@ -110 +110 @@
         int prevValDistance;
         GetPrevDataAndDistance(data.realCh, k, out prevVal, out prevValDistance, maxDistance: 48);
-        return prevVal * Beta(prevValDistance / 48.0, n.Symbol.Alpha, n.Symbol.Beta);
+        return n.Weight * prevVal * Beta(prevValDistance / 48.0, n.Alpha, n.Beta);
       } else if (node.Symbol is RealInsulineVariableSymbol) {
         var n = (RealInsulineVariableTreeNode)node;
-        return data.realIns[k + n.RowOffset];
+        return n.Weight * data.realIns[k + n.RowOffset];
       } else if (node.Symbol is CurvedInsVariableSymbol) {
         var n = (CurvedInsVariableTreeNode)node;
@@ -121 +121 @@
 
         GetMaxValueAndDistance(data.realIns, k, out maxVal, out maxValDistance, maxDistance: 48);
-        return (sum - maxVal) * maxVal * Beta(maxValDistance / 48.0, n.Symbol.Alpha, n.Symbol.Beta);
+        return n.Weight * (sum - maxVal) * maxVal * Beta(maxValDistance / 48.0, n.Alpha, n.Beta);
       } else {
         throw new InvalidProgramException("found unknown symbol " + node.Symbol);
@@ -128 +128 @@
 
     private static double Beta(double x, double alpha, double beta) {
-      return alglib.invincompletebeta(alpha, beta, x);
+      return 1.0 / alglib.beta(alpha, beta) * Math.Pow(x, alpha - 1) * Math.Pow(1 - x, beta - 1);
     }