Changeset 2202 for branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/TreeEvaluatorBase.cs

Timestamp:

07/28/09 19:24:23 (15 years ago)

Author:

gkronber

Message:

Created a branch for #713

Location:

branches/GP-Refactoring-713

Files:

• . (copied) (copied from trunk)
• sources/HeuristicLab.GP.StructureIdentification/3.3/TreeEvaluatorBase.cs (modified) (2 diffs)

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/TreeEvaluatorBase.cs

@@ -28 +28 @@
 using System.Diagnostics;
 using HeuristicLab.DataAnalysis;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -78 +79 @@
         case EvaluatorSymbolTable.DIFFERENTIAL:
         case EvaluatorSymbolTable.VARIABLE: {
-            instr.i_arg0 = (short)dataset.GetVariableIndex((string)f.localData[0]); // var
-            instr.d_arg0 = (double)f.localData[1]; // weight
-            instr.i_arg1 = (short)(int)f.localData[2]; // sample-offset
+            instr.i_arg0 = (short)dataset.GetVariableIndex((((StringData)f.localData[1].Value).Data)); // var
+            instr.d_arg0 = ((DoubleData)f.localData[0].Value).Data; // weight
+            instr.i_arg1 = (short)((ConstrainedIntData)f.localData[2].Value).Data; // sample-offset
             break;
           }
         case EvaluatorSymbolTable.CONSTANT: {
-            instr.d_arg0 = (double)f.localData[0]; // value
+            instr.d_arg0 = ((DoubleData)f.localData[0].Value).Data; // value
             break;
           }