Changeset 4897 for branches/GP-MemoryOperations/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/FullFunctionalExpressionGrammar.cs

Timestamp:

11/22/10 10:34:37 (14 years ago)

Author:

gkronber

Message:

Implemented set-memory and read-memory operation for GP-based data-analysis. #1290

Location:

branches/GP-MemoryOperations/HeuristicLab.Problems.DataAnalysis

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis)
• 3.3/Symbolic/FullFunctionalExpressionGrammar.cs (modified) (2 diffs)

branches/GP-MemoryOperations/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/FullFunctionalExpressionGrammar.cs

@@ -60 +60 @@
       var or = new Or();
       var not = new Not();
+      var setMem = new SetMem();
+      var readMem = new ReadMem();
       var constant = new Constant();
       constant.MinValue = -20;
@@ -67 +69 @@
       laggedVariable.InitialFrequency = 0.0;
 
-      var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, exp, @if, gt, lt, and, or, not, constant, variableSymbol, laggedVariable };
-      var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, not };
+      var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, exp, @if, gt, lt, and, or, not, setMem, readMem, constant, variableSymbol, laggedVariable };
+      var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, not, setMem};
       var binaryFunctionSymbols = new List<Symbol>() { gt, lt };
       var functionSymbols = new List<Symbol>() { add, sub, mul, div, mean, and, or };
-      var terminalSymbols = new List<Symbol>() { variableSymbol, constant, laggedVariable };
+      var terminalSymbols = new List<Symbol>() { variableSymbol, constant, laggedVariable, readMem };
 
       foreach (var symb in allSymbols)