Changeset 4897

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/HeuristicLab.Problems.DataAnalysis-3.3.csproj (modified) (1 diff)
• 3.3/Symbolic/FullFunctionalExpressionGrammar.cs (modified) (2 diffs)
• 3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs (modified) (7 diffs)

branches/GP-MemoryOperations/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

@@ -149 +149 @@
     <Compile Include="Symbolic\Symbols\Constant.cs" />
     <Compile Include="Symbolic\Symbols\ConstantTreeNode.cs" />
+    <Compile Include="Symbolic\Symbols\ReadMem.cs" />
+    <Compile Include="Symbolic\Symbols\ReadMemTreeNode.cs" />
+    <Compile Include="Symbolic\Symbols\SetMem.cs" />
+    <Compile Include="Symbolic\Symbols\SetMemTreeNode.cs" />
     <Compile Include="Symbolic\Symbols\LaggedVariable.cs" />
     <Compile Include="Symbolic\Symbols\LaggedVariableTreeNode.cs" />

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)

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

@@ -57 +57 @@
       public const byte NOT = 15;
 
-
       public const byte Average = 16;
 
@@ -66 +65 @@
       public const byte Constant = 20;
       public const byte Arg = 21;
+
+      public const byte Set = 22;
+      public const byte Read = 23;
     }
 
@@ -90 +92 @@
       { typeof(Constant), OpCodes.Constant },
       { typeof(Argument), OpCodes.Arg },
+      { typeof(SetMem), OpCodes.Set },
+      { typeof(ReadMem), OpCodes.Read },
     };
     private const int ARGUMENT_STACK_SIZE = 1024;
+    private const int MAX_MEMORY_SIZE = 128;
 
     private Dataset dataset;
@@ -99 +104 @@
     private double[] argumentStack = new double[ARGUMENT_STACK_SIZE];
     private int argStackPointer;
+    private double[] memory = new double[MAX_MEMORY_SIZE];
 
     public override bool CanChangeName {
@@ -124 +130 @@
       compiler.AddInstructionPostProcessingHook(PostProcessInstruction);
       code = compiler.Compile(tree, MapSymbolToOpCode);
+      Array.Clear(memory, 0, MAX_MEMORY_SIZE);
       foreach (var row in rows) {
         this.row = row;
@@ -139 +146 @@
         var variableTreeNode = instr.dynamicNode as LaggedVariableTreeNode;
         instr.iArg0 = (ushort)dataset.GetVariableIndex(variableTreeNode.VariableName);
+      } else if (instr.opCode == OpCodes.Set) {
+        var setMemTreeNode = instr.dynamicNode as SetMemTreeNode;
+        instr.iArg0 = (ushort)setMemTreeNode.Address;
+      } else if (instr.opCode == OpCodes.Read) {
+        var readMemTreeNode = instr.dynamicNode as ReadMemTreeNode;
+        instr.iArg0 = (ushort)readMemTreeNode.Address;
       }
       return instr;
@@ -290 +303 @@
             return constTreeNode.Value;
           }
+        case OpCodes.Set: {
+            double d = Evaluate();
+            memory[currentInstr.iArg0] = d;
+            return d;
+          }
+        case OpCodes.Read: {
+            return memory[currentInstr.iArg0];
+          }
         default: throw new NotSupportedException();
       }