Changeset 16722 for branches/2988_ModelsOfModels2/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs

Timestamp:

03/28/19 11:22:24 (5 years ago)

Author:

msemenki

Message:

#2988: Add first version of GP for Evolvment models of models.

Location:

branches/2988_ModelsOfModels2

Files:

• . (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Symbolic) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs (modified) (6 diffs)

branches/2988_ModelsOfModels2/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs

@@ -51 +51 @@
       }
     }
-
+    private void SubTreeEvoluate(BatchInstruction instr, int[] rows, int rowIndex, int batchSize) {
+      for (int i = 0; i < batchSize; ++i) {
+        var row = rows[rowIndex] + i;
+        instr.buf[i] = instr.data[row];  // не забыть заполнить
+      }
+    }
     private void Evaluate(BatchInstruction[] code, int[] rows, int rowIndex, int batchSize) {
       for (int i = code.Length - 1; i >= 0; --i) {
@@ -61 +66 @@
           case OpCodes.Variable: {
               LoadData(instr, rows, rowIndex, batchSize);
+              break;
+            }
+          case OpCodes.TreeModel: {
+              SubTreeEvoluate(instr, rows, rowIndex, batchSize);
               break;
             }
@@ -159 +168 @@
               break;
             }
-
+          case OpCodes.Tanh: {
+              Tanh(instr.buf, code[c].buf);
+              break;
+            }
           case OpCodes.Absolute: {
               Absolute(instr.buf, code[c].buf);
@@ -201 +213 @@
       }
 
-      var code = Compile(tree, dataset, OpCodes.MapSymbolToOpCode);
+      var code = Compile(tree, dataset, OpCodes.MapSymbolToOpCode, rows);
       var remainingRows = rows.Length % BATCHSIZE;
       var roundedTotal = rows.Length - remainingRows;
@@ -233 +245 @@
     }
 
-    private BatchInstruction[] Compile(ISymbolicExpressionTree tree, IDataset dataset, Func<ISymbolicExpressionTreeNode, byte> opCodeMapper) {
+    private BatchInstruction[] Compile(ISymbolicExpressionTree tree, IDataset dataset, Func<ISymbolicExpressionTreeNode, byte> opCodeMapper, int[] rows) {
       var root = tree.Root.GetSubtree(0).GetSubtree(0);
       var code = new BatchInstruction[root.GetLength()];
       if (root.SubtreeCount > ushort.MaxValue) throw new ArgumentException("Number of subtrees is too big (>65.535)");
       int c = 1, i = 0;
+      var allRows = Enumerable.Range(0, dataset.Rows).ToArray();
       foreach (var node in root.IterateNodesBreadth()) {
         if (node.SubtreeCount > ushort.MaxValue) throw new ArgumentException("Number of subtrees is too big (>65.535)");
@@ -258 +271 @@
           for (int j = 0; j < BATCHSIZE; ++j)
             code[i].buf[j] = code[i].value;
+        } else if (node is TreeModelTreeNode subtree) {
+          code[i].data = GetValues(subtree.Tree, dataset, allRows);
+          EvaluatedSolutions--;
         }
         c += node.SubtreeCount;