Changeset 13867 for branches/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction/Grammar.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/Grammar.cs (modified) (6 diffs)

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

@@ -46 +46 @@
       var cosCh = new SimpleSymbol("CosCh", "Cos", 1, 1);
       var logCh = new SimpleSymbol("LogCh", "Log", 1, 1);
-      var curvedChShape1 = new CurvedChVariableSymbol("CurvedCh1", "", 2, 5);
-      var curvedChShape2 = new CurvedChVariableSymbol("CurvedCh2", "", 3, 3);
-      var curvedChShape3 = new CurvedChVariableSymbol("CurvedCh3", "", 5, 2);
+      var curvedCh = new CurvedChVariableSymbol("CurvedCh", "");
       // var cteCh = new CteSymbol();
 
@@ -60 +58 @@
       var cosIns = new SimpleSymbol("CosIns", "Cos", 1, 1);
       var logIns = new SimpleSymbol("LogIns", "Log", 1, 1);
-      var curvedInsShape1 = new CurvedInsVariableSymbol("CurvedIns1", "", 2, 5);
-      var curvedInsShape2 = new CurvedInsVariableSymbol("CurvedIns2", "", 3, 3);
-      var curvedInsShape3 = new CurvedInsVariableSymbol("CurvedIns3", "", 5, 2);
+      var curvedIns = new CurvedInsVariableSymbol("CurvedIns", "");
       var realInsVar = new RealInsulineVariableSymbol();
       // var cteCh = new CteSymbol();
@@ -81 +77 @@
       AddSymbol(logGluc);
 
-      AddSymbol(curvedChShape1);
-      AddSymbol(curvedChShape2);
-      AddSymbol(curvedChShape3);
+      AddSymbol(curvedCh);
+
       AddSymbol(plusCh);
       AddSymbol(minusCh);
@@ -93 +88 @@
       AddSymbol(logCh);
 
-      AddSymbol(curvedInsShape1);
-      AddSymbol(curvedInsShape2);
-      AddSymbol(curvedInsShape3);
+      AddSymbol(curvedIns);
       AddSymbol(plusIns);
       AddSymbol(minusIns);
@@ -174 +167 @@
       }
       // <exprch> ::= (getPrevData(1,k,1) * <cte> * <curvedCH>)
-      AddAllowedChildSymbol(exprCh, curvedChShape1);
-      AddAllowedChildSymbol(exprCh, curvedChShape2);
-      AddAllowedChildSymbol(exprCh, curvedChShape3);
+      AddAllowedChildSymbol(exprCh, curvedCh);
+
 
       /*
@@ -220 +212 @@
       AddAllowedChildSymbol(exprIns, realInsVar);
 
-      AddAllowedChildSymbol(exprIns, curvedInsShape1);
-      AddAllowedChildSymbol(exprIns, curvedInsShape2);
-      AddAllowedChildSymbol(exprIns, curvedInsShape3);
+      AddAllowedChildSymbol(exprIns, curvedIns);
 
       // root is func