Context Navigation

Changeset 18133

Timestamp:

12/15/21 14:47:36 (3 years ago)

Author:

dpiringe

Message:

#3136

updated interpeters of type ISymbolicDataAnalysisExpressionTreeInterpreter to support symbols of type SubFunctionSymbol

Location:

branches/3136_Structural_GP

Files:

-                      r16701
+                      r18133
     Cube               = 50,
     CubeRoot           = 51,
+    Tanh               = 52
+    Tanh               = 52,
+    SubFunction        = 53
 };

r16905	r18133
138	138	break;
139	139	}
	140	case OpCodes::SubFunction:
	141	{
	142	in.value = code[in.childIndex].value;
	143	break;
	144	}
140	145	default: in.value = NAN;
141	146	}
…	…
291	296	break;
292	297	}
	298	case OpCodes::SubFunction:
	299	{
	300	load(in.buf, code[in.childIndex].buf);
	301	break;
	302	}
	303
293	304	default: load(in.buf, NAN);
294		}
	305	}
295	306	}
296	307	}

-                      r17351
+                      r18133
               );
+          }
+        case OpCodes.SubFunction: {
+          return MakeExpr(node.GetSubtree(0), variableIndices, row, columns);
+        }
         default:
           throw new NotSupportedException("Unsupported symbol: " + node.Symbol);

-                      r17801
+                      r18133
               break;
+            }
           case OpCodes.Tanh: {
               Tanh(instr.buf, code[c].buf);
               break;
+            }
           case OpCodes.Absolute: {
               Absolute(instr.buf, code[c].buf);
 …
               Load(instr.buf, code[c].buf);
               AnalyticQuotient(instr.buf, code[c + 1].buf);
+              break;
+            }
+          case OpCodes.SubFunction: {
+              Load(instr.buf, code[c].buf);
               break;
+            }

-                      r17180
+                      r18133
                                             " is not supported by the SymbolicDataAnalysisTreeILEmittingInterpreter");
+          }
+        case OpCodes.SubFunction: {
+          CompileInstructions(il, state, ds);
+          return;
+        }
         default:
           throw new NotSupportedException("Interpretation of symbol " + currentInstr.dynamicNode.Symbol.Name +

r17180	r18133
388	388	state.Reset();
389	389	instr.value = interpreter.Evaluate(dataset, ref row, state);
	390	} else if (instr.opCode == OpCodes.SubFunction) {
	391	instr.value = code[instr.childIndex].value;
390	392	} else {
391	393	var errorText = string.Format("The {0} symbol is not supported by the linear interpreter. To support this symbol, please use the SymbolicDataAnalysisExpressionTreeInterpreter.", instr.dynamicNode.Symbol.Name);

-                      r17801
+                      r18133
       (byte)OpCode.Cube,
       (byte)OpCode.Absolute,
+      (byte)OpCode.AnalyticQuotient
+      (byte)OpCode.AnalyticQuotient,
+      (byte)OpCode.SubFunction
     };

Note: See TracChangeset for help on using the changeset viewer.