Changeset 18160

Timestamp:

12/20/21 13:24:09 (3 years ago)

Author:

dpiringe

Message:

#3140

• merged branch into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/HeuristicLab.NativeInterpreter-0.1/hl-native-interpreter-msvc-x64.dll (modified) (previous)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/HeuristicLab.NativeInterpreter-0.1/hl-native-interpreter-msvc-x86.dll (modified) (previous)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/instruction.h (modified) (2 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.cpp (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.h (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/OpCodes.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeNativeInterpreter.cs (modified) (1 diff)

trunk/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/instruction.h

@@ -19 +19 @@
     Exp                = 9,
     Var                = 18,
-    Const              = 20,
+    Number             = 20,
     Power              = 22,
     Root               = 23,
@@ -28 +28 @@
     Cube               = 50,
     CubeRoot           = 51,
-    Tanh               = 52
+    Tanh               = 52,
+    Constant           = 54
 };
 

trunk/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.cpp

@@ -32 +32 @@
         in.buf = buffer + (i * BATCHSIZE);
 
-        if (in.opcode == OpCodes::Const)
+        if (in.opcode == OpCodes::Constant || in.opcode == OpCodes::Number)
         {
             load(in.buf, in.value);

trunk/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.h

@@ -12 +12 @@
         switch (in.opcode)
         {
-            case OpCodes::Const: /* nothing to do */ break;
+            case OpCodes::Number: /* nothing to do */ break;
+            case OpCodes::Constant: /* nothing to do */ break;
             case OpCodes::Var:
                 {
@@ -165 +166 @@
                     break;
                 }
-            case OpCodes::Const: /* nothing to do because buffers for constants are already set */ break;
+            case OpCodes::Number: /* nothing to do because buffers for numbers are already set */ break;
+            case OpCodes::Constant: /* nothing to do because buffers for constants are already set */ break;
             case OpCodes::Add:
                 {

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/OpCodes.cs

@@ -79 +79 @@
     CubeRoot = 51,
     Tanh = 52,
-    Constant = 53
+    Constant = 54
   };
   public static class OpCodes {

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeNativeInterpreter.cs

@@ -103 +103 @@
     private static readonly HashSet<byte> supportedOpCodes = new HashSet<byte>() {
       (byte)OpCode.Constant,
+      (byte)OpCode.Number,
       (byte)OpCode.Variable,
       (byte)OpCode.Add,