Changeset 13870

Timestamp:

06/01/16 17:59:36 (9 years ago)

Author:

gkronber

Message:

#2608: simplified grammar by removing unnecessary symbols: exprch, exprins, exprgluc and added constants

Location:

branches/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction

Files:

• Grammar.cs (modified) (7 diffs)
• HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction-3.3.csproj (modified) (1 diff)
• Interpreter.cs (modified) (3 diffs)

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

@@ -3 +3 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.DataAnalysis.Symbolic;
 
 namespace HeuristicLab.Problems.GeneticProgramming.GlucosePrediction {
@@ -60 +61 @@
       var curvedIns = new CurvedInsVariableSymbol("CurvedIns", "");
       var realInsVar = new RealInsulineVariableSymbol();
+
+      var constSy = new Constant();
       // var cteCh = new CteSymbol();
 
@@ -98 +101 @@
       AddSymbol(logIns);
       AddSymbol(realInsVar);
+      AddSymbol(constSy);
 
       // <func> ::= <exprgluc> + <exprch> - <exprins>
@@ -111 +115 @@
                     |realData(k-<idx2hOrMore>)
       */
-      var opGlucSet = new Symbol[] { plusGluc, minusGluc, prodGluc, divGluc, expGluc, sinGluc, cosGluc, logGluc };
+      var opGlucSet = new Symbol[] { plusGluc, minusGluc, prodGluc, divGluc, expGluc, sinGluc, cosGluc, logGluc, predGlucData, realGlucData, constSy };
       foreach (var opGluc in opGlucSet) {
         AddAllowedChildSymbol(exprGluc, opGluc);
       }
 
-      // <exprgluc> ::= (<exprgluc> <op> <exprgluc>)
-      // <exprgluc> ::= (<cte> <op> <exprgluc>)
-      foreach (var op in new Symbol[] { plusGluc, minusGluc, prodGluc, divGluc }) {
-        AddAllowedChildSymbol(op, exprGluc, 0);
-        // AddAllowedChildSymbol(op, cteGluc, 0); // cte is only allowed as first child
-        AddAllowedChildSymbol(op, exprGluc, 1);
+
+      foreach (var parentOp in new Symbol[] { plusGluc, minusGluc, prodGluc, divGluc }) {
+        foreach (var childOp in opGlucSet) {
+          AddAllowedChildSymbol(parentOp, childOp, 0);
+          AddAllowedChildSymbol(parentOp, childOp, 1);
+        }
       }
       // <exprgluc> ::= <preop> (<exprgluc>)
-      foreach (var op in new Symbol[] { expGluc, sinGluc, cosGluc, logGluc }) {
-        AddAllowedChildSymbol(op, exprGluc, 0);
-      }
-
-      AddAllowedChildSymbol(exprGluc, predGlucData); // <exprgluc> ::= predictedData(k-<idxCurr2h>)
-      AddAllowedChildSymbol(exprGluc, realGlucData); // <exprgluc> ::= realData(k-<idx2hOrMore>)
-
+      foreach (var parentOp in new Symbol[] { expGluc, sinGluc, cosGluc, logGluc }) {
+        foreach (var childOp in opGlucSet) {
+          AddAllowedChildSymbol(parentOp, childOp, 0);
+        }
+      }
 
       /*
@@ -150 +152 @@
               |beta(0.02*Math.min(48,getPrevDataDistance(1,k,1)),5,2) 
       */
-      var opChSet = new Symbol[] { plusCh, minusCh, prodCh, divCh, expCh, sinCh, cosCh, logCh };
+      var opChSet = new Symbol[] { plusCh, minusCh, prodCh, divCh, expCh, sinCh, cosCh, logCh, curvedCh, constSy };
       foreach (var opCh in opChSet) {
         AddAllowedChildSymbol(exprCh, opCh);
       }
 
-      // <exprch> ::= (<exprch> <op> <exprch>)
-      // <exprch> ::= (<cte> <op> <exprch>)
-      foreach (var op in new Symbol[] { plusCh, minusCh, prodCh, divCh }) {
-        AddAllowedChildSymbol(op, exprCh, 0);
-        // AddAllowedChildSymbol(op, cteCh, 0); // cte is only allowed as first child
-        AddAllowedChildSymbol(op, exprCh, 1);
+      foreach (var parentOp in new Symbol[] { plusCh, minusCh, prodCh, divCh }) {
+        foreach (var childOp in opChSet) {
+          AddAllowedChildSymbol(parentOp, childOp, 0);
+          AddAllowedChildSymbol(parentOp, childOp, 1);
+        }
       }
       // <exprch> ::= <preop> (<exprch>)
-      foreach (var op in new Symbol[] { expCh, sinCh, cosCh, logCh }) {
-        AddAllowedChildSymbol(op, exprCh, 0);
-      }
-      // <exprch> ::= (getPrevData(1,k,1) * <cte> * <curvedCH>)
-      AddAllowedChildSymbol(exprCh, curvedCh);
-
+      foreach (var parentOp in new Symbol[] { expCh, sinCh, cosCh, logCh }) {
+        foreach (var childOp in opChSet) {
+          AddAllowedChildSymbol(parentOp, childOp, 0);
+        }
+      }
 
       /*
@@ -192 +192 @@
 
       */
-      var opInsSet = new Symbol[] { plusIns, minusIns, prodIns, divIns, expIns, sinIns, cosIns, logIns };
+      var opInsSet = new Symbol[] { plusIns, minusIns, prodIns, divIns, expIns, sinIns, cosIns, logIns, realInsVar, curvedIns, constSy };
       foreach (var opIns in opInsSet) {
         AddAllowedChildSymbol(exprIns, opIns);
@@ -199 +199 @@
       // <exprins> ::= (<exprins> <op> <exprins>)
       // <exprins> ::= (<cte> <op> <exprins>)   
-      foreach (var op in new Symbol[] { plusIns, minusIns, prodIns, divIns }) {
-        AddAllowedChildSymbol(op, exprIns, 0);
-        // AddAllowedChildSymbol(op, cteIns, 0); // cte is only allowed as first child
-        AddAllowedChildSymbol(op, exprIns, 1);
+      foreach (var parentOp in new Symbol[] { plusIns, minusIns, prodIns, divIns }) {
+        foreach (var childOp in opInsSet) {
+          AddAllowedChildSymbol(parentOp, childOp, 0);
+          AddAllowedChildSymbol(parentOp, childOp, 1);
+        }
       }
       // <exprins> ::= <preop> (<exprins>)
       foreach (var op in new Symbol[] { expIns, sinIns, cosIns, logIns }) {
-        AddAllowedChildSymbol(op, exprIns, 0);
-      }
-
-      // <exprIns> ::= getVariable(2,k-<idx>)
-      AddAllowedChildSymbol(exprIns, realInsVar);
-
-      AddAllowedChildSymbol(exprIns, curvedIns);
+        foreach (var childOp in opInsSet) {
+          AddAllowedChildSymbol(op, childOp, 0);
+        }
+      }
 
       // root is func

branches/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction-3.3.csproj

@@ -135 +135 @@
       <HintPath>..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Problems.Instances-3.3">
       <HintPath>..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>

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

@@ -7 +7 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Problems.DataAnalysis;
+using HeuristicLab.Problems.DataAnalysis.Symbolic;
 
 namespace HeuristicLab.Problems.GeneticProgramming.GlucosePrediction {
@@ -26 +27 @@
       };
       data.predGluc = new double[data.realGluc.Length];
+      Array.Copy(data.realGluc, data.predGluc, data.predGluc.Length);
       for (int k = 0; k < data.predGluc.Length; k++) {
         if (double.IsNaN(targetGluc[k])) {
@@ -122 +124 @@
         GetMaxValueAndDistance(data.realIns, k, out maxVal, out maxValDistance, maxDistance: 48);
         return n.Weight * (sum - maxVal) * maxVal * Beta(maxValDistance / 48.0, n.Alpha, n.Beta);
+      } else if (node.Symbol is Constant) {
+        var n = (ConstantTreeNode)node;
+        return n.Value;
       } else {
         throw new InvalidProgramException("found unknown symbol " + node.Symbol);