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

Timestamp:

09/28/16 12:53:51 (8 years ago)

Author:

gkronber

Message:

simplification of grammar and problem and bug fixes related to precalculated smoothed features

File:

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

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

@@ -31 +31 @@
       var predictions = new double[targetGluc.Length];
       var rowsEnumerator = rows.GetEnumerator();
+      rowsEnumerator.MoveNext();
       for (int k = 0; k < predictions.Length; k++, rowsEnumerator.MoveNext()) {
         if (double.IsNaN(targetGluc[k])) {
@@ -36 +37 @@
         } else {
           var rawPred = InterpretRec(model, data, rowsEnumerator.Current);
-          predictions[k] = rawPred; 
+          predictions[k] = rawPred;
         }
       }
@@ -61 +62 @@
       // d Q1 / dt = ins(t) - alpha * Q1(t)
       // d Q2 / dt = alpha * (Q1(t) - Q2(t))
-      // S = Q1(t) + Q2(t)
+      // d Q3 / dt = alpha * Q2(t) - beta * Q3(t)
       var alpha = node.Alpha;
+      var beta = node.Beta;
 
       var ins = dataset.GetReadOnlyDoubleValues("Insuline");
       var time = dataset.GetReadOnlyDoubleValues("HourMin").ToArray();
 
-      // TODO reset for new time intervals
-
-      double q1, q2, q1_prev, q2_prev;
+      double q1, q2, q3, q1_prev, q2_prev, q3_prev;
       // starting values: zeros
-      q1 = q2 = q1_prev = q2_prev = 0;
+      q1 = q2 = q3 = q1_prev = q2_prev = q3_prev = 0;
       double[] s = new double[dataset.Rows];
 
       for (int t = 1; t < dataset.Rows; t++) {
         if (IsStartOfNewPeriod(time, t)) {
-          q1 = q2 = q1_prev = q2_prev = 0;
+          q1 = q2 = q3 = q1_prev = q2_prev = q3_prev = 0;
         }
         q1 = q1_prev + ins[t] - alpha * q1_prev;
         q2 = q2_prev + alpha * (q1_prev - q2_prev);
-        s[t] = q1 + q2;
+        q3 = q3_prev + alpha * q2_prev - beta * q3_prev;
+        s[t] = q3;
         q1_prev = q1;
         q2_prev = q2;
+        q3_prev = q3;
 
       }
@@ -97 +99 @@
       // d Q1 / dt = ins(t) - alpha * Q1(t)
       // d Q2 / dt = alpha * (Q1(t) - Q2(t))
-      // S = Q1(t) + Q2(t)
+      // d Q3 / dt = alpha * Q2(t) - beta * Q3(t)
       var alpha = node.Alpha;
-
-      var ch = dataset.GetReadOnlyDoubleValues("CH");
+      var beta = node.Beta;
+
+      var ins = dataset.GetReadOnlyDoubleValues("CH");
       var time = dataset.GetReadOnlyDoubleValues("HourMin").ToArray();
 
-      // TODO reset for new time intervals
-
-      double q1, q2, q1_prev, q2_prev;
+      double q1, q2, q3, q1_prev, q2_prev, q3_prev;
       // starting values: zeros
-      q1 = q2 = q1_prev = q2_prev = 0;
+      q1 = q2 = q3 = q1_prev = q2_prev = q3_prev = 0;
       double[] s = new double[dataset.Rows];
 
       for (int t = 1; t < dataset.Rows; t++) {
         if (IsStartOfNewPeriod(time, t)) {
-          q1 = q2 = q1_prev = q2_prev = 0;
-        }
-        q1 = q1_prev + ch[t] - alpha * q1_prev;
+          q1 = q2 = q3 = q1_prev = q2_prev = q3_prev = 0;
+        }
+        q1 = q1_prev + ins[t] - alpha * q1_prev;
         q2 = q2_prev + alpha * (q1_prev - q2_prev);
-        s[t] = q1 + q2;
+        q3 = q3_prev + alpha * q2_prev - beta * q3_prev;
+        s[t] = q3;
         q1_prev = q1;
         q2_prev = q2;
+        q3_prev = q3;
 
       }
@@ -206 +209 @@
     }
 
-    private static double Beta(double x, double alpha, double beta) {
-      return 1.0 / alglib.beta(alpha, beta) * Math.Pow(x, alpha - 1) * Math.Pow(1 - x, beta - 1);
-    }
   }
 }