Changeset 14310 for branches/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction/Grammar.cs

Timestamp:

09/27/16 16:30:54 (8 years ago)

Author:

gkronber

Message:

changed interpreter and grammar to smooth ch and ins uptake using a compartement model

File:

• branches/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction/Grammar.cs (modified) (6 diffs)

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

@@ -24 +24 @@
       var exprCh = new SimpleSymbol("ExprCh", string.Empty, 1, 1);
 
-      var predGlucData = new PredictedGlucoseVariableSymbol();
+      // var predGlucData = new PredictedGlucoseVariableSymbol();
       var realGlucData = new RealGlucoseVariableSymbol();
 
@@ -60 +60 @@
       var logIns = new SimpleSymbol("LogIns", "Log", 1, 1);
       var curvedIns = new CurvedInsVariableSymbol("CurvedIns", "");
-      var realInsVar = new RealInsulineVariableSymbol();
+      // var realInsVar = new RealInsulineVariableSymbol();
 
       var constSy = new Constant();
@@ -69 +69 @@
       AddSymbol(exprIns);
       AddSymbol(exprCh);
-      AddSymbol(predGlucData);
+      // AddSymbol(predGlucData);
       AddSymbol(realGlucData);
       AddSymbol(plusGluc);
@@ -100 +100 @@
       AddSymbol(cosIns);
       AddSymbol(logIns);
-      AddSymbol(realInsVar);
+      // AddSymbol(realInsVar);
       AddSymbol(constSy);
 
@@ -115 +115 @@
                     |realData(k-<idx2hOrMore>)
       */
-      var opGlucSet = new Symbol[] { plusGluc, minusGluc, prodGluc, divGluc, expGluc, sinGluc, cosGluc, logGluc, predGlucData, realGlucData, constSy };
+      var opGlucSet = new Symbol[] { plusGluc, minusGluc, prodGluc, divGluc, expGluc, sinGluc, cosGluc, logGluc, /*predGlucData, */ realGlucData, constSy };
       foreach (var opGluc in opGlucSet) {
         AddAllowedChildSymbol(exprGluc, opGluc);
@@ -192 +192 @@
 
       */
-      var opInsSet = new Symbol[] { plusIns, minusIns, prodIns, divIns, expIns, sinIns, cosIns, logIns, realInsVar, curvedIns, constSy };
+      var opInsSet = new Symbol[] { plusIns, minusIns, prodIns, divIns, expIns, sinIns, cosIns, logIns, /* realInsVar, */ curvedIns, constSy };
       foreach (var opIns in opInsSet) {
         AddAllowedChildSymbol(exprIns, opIns);