Changeset 2174 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/TreeEvaluatorBase.cs

Timestamp:

07/20/09 20:14:47 (15 years ago)

Author:

gkronber

Message:

Implemented #302 (Show variable names instead of var<index> in GP function trees).

• Added a new operator that chooses a random value from a list of possible values.
• Changed mutation operator for variables and differentials
• Changed internal linear representation of function trees to support different types for local data.

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/TreeEvaluatorBase.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/TreeEvaluatorBase.cs

@@ -78 +78 @@
         case EvaluatorSymbolTable.DIFFERENTIAL:
         case EvaluatorSymbolTable.VARIABLE: {
-            instr.i_arg0 = (short)f.data[0]; // var
-            instr.d_arg0 = f.data[1]; // weight
-            instr.i_arg1 = (short)f.data[2]; // sample-offset
+            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
             break;
           }
         case EvaluatorSymbolTable.CONSTANT: {
-            instr.d_arg0 = f.data[0]; // value
+            instr.d_arg0 = (double)f.localData[0]; // value
             break;
           }