Changeset 18161 for branches/3136_Structural_GP/HeuristicLab.ExtLibs

Timestamp:

12/20/21 13:52:58 (3 years ago)

Author:

dpiringe

Message:

#3136

• merged trunk into branch

Location:

branches/3136_Structural_GP

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)

branches/3136_Structural_GP/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,
@@ -29 +29 @@
     CubeRoot           = 51,
     Tanh               = 52,
-    SubFunction        = 53
+    SubFunction        = 53,
+    Constant           = 54
 };
 

branches/3136_Structural_GP/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);

branches/3136_Structural_GP/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:
                 {
@@ -170 +171 @@
                     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:
                 {