Changeset 16141 for branches/2817-BinPackingSpeedup/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler

Timestamp:

09/14/18 11:47:37 (6 years ago)

Author:

abeham

Message:

#2817: updated to trunk r16140

Location:

branches/2817-BinPackingSpeedup

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/Instruction.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/SymbolicExpressionTreeCompiler.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/SymbolicExpressionTreeLinearCompiler.cs (modified) (1 diff)

branches/2817-BinPackingSpeedup/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/Instruction.cs

@@ -29 +29 @@
     public byte opCode;
     // number of arguments of the current instruction
-    public byte nArguments;
+    public ushort nArguments;
     // an optional object value (addresses for calls, argument index for arguments)
     public object data;

branches/2817-BinPackingSpeedup/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/SymbolicExpressionTreeCompiler.cs

@@ -63 +63 @@
         Instruction instr = new Instruction();
         int subtreesCount = node.SubtreeCount;
-        if (subtreesCount > 255) throw new ArgumentException("Number of subtrees is too big (>255)");
-        instr.nArguments = (byte)subtreesCount;
+        if (subtreesCount > ushort.MaxValue) throw new ArgumentException("Number of subtrees is too big (> 65.535)");
+        instr.nArguments = (ushort)subtreesCount;
         instr.opCode = opCodeMapper(node);
         if (node.Symbol is Argument) {

branches/2817-BinPackingSpeedup/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/SymbolicExpressionTreeLinearCompiler.cs

@@ -27 +27 @@
       var root = tree.Root.GetSubtree(0).GetSubtree(0);
       var code = new LinearInstruction[root.GetLength()];
-      code[0] = new LinearInstruction { dynamicNode = root, nArguments = (byte)root.SubtreeCount, opCode = opCodeMapper(root) };
+      if (root.SubtreeCount > ushort.MaxValue) throw new ArgumentException("Number of subtrees is too big (>65.535)");
+      code[0] = new LinearInstruction { dynamicNode = root, nArguments = (ushort)root.SubtreeCount, opCode = opCodeMapper(root) };
       int c = 1, i = 0;
       foreach (var node in root.IterateNodesBreadth()) {
         for (int j = 0; j < node.SubtreeCount; ++j) {
           var s = node.GetSubtree(j);
-          code[c + j] = new LinearInstruction { dynamicNode = s, nArguments = (byte)s.SubtreeCount, opCode = opCodeMapper(s) };
+          if (s.SubtreeCount > ushort.MaxValue) throw new ArgumentException("Number of subtrees is too big (>65.535)");
+          code[c + j] = new LinearInstruction { dynamicNode = s, nArguments = (ushort)s.SubtreeCount, opCode = opCodeMapper(s) };
         }
         code[i].childIndex = c;