Changeset 16356 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/2915-AbsoluteSymbol (added) merged: 15943-15944,16236-16240,16304,16306,16332,16344-16352,16355 /branches/2937_SymReg_AnalyticalQuotient (added) merged: 16083
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs
r15583 r16356 215 215 if (instr.nArguments == 1) p = 1.0 / p; 216 216 instr.value = p; 217 } else if (instr.opCode == OpCodes.AnalyticalQuotient) { 218 var x1 = code[instr.childIndex].value; 219 var x2 = code[instr.childIndex + 1].value; 220 instr.value = x1 / Math.Sqrt(1 + x2 * x2); 217 221 } else if (instr.opCode == OpCodes.Average) { 218 222 double s = code[instr.childIndex].value; … … 221 225 } 222 226 instr.value = s / instr.nArguments; 227 } else if (instr.opCode == OpCodes.Absolute) { 228 instr.value = Math.Abs(code[instr.childIndex].value); 223 229 } else if (instr.opCode == OpCodes.Cos) { 224 230 instr.value = Math.Cos(code[instr.childIndex].value); … … 229 235 } else if (instr.opCode == OpCodes.Square) { 230 236 instr.value = Math.Pow(code[instr.childIndex].value, 2); 237 } else if (instr.opCode == OpCodes.Cube) { 238 instr.value = Math.Pow(code[instr.childIndex].value, 3); 231 239 } else if (instr.opCode == OpCodes.Power) { 232 240 double x = code[instr.childIndex].value; … … 235 243 } else if (instr.opCode == OpCodes.SquareRoot) { 236 244 instr.value = Math.Sqrt(code[instr.childIndex].value); 245 } else if (instr.opCode == OpCodes.CubeRoot) { 246 instr.value = Math.Pow(code[instr.childIndex].value, 1.0 / 3.0); 237 247 } else if (instr.opCode == OpCodes.Root) { 238 248 double x = code[instr.childIndex].value;
Note: See TracChangeset
for help on using the changeset viewer.