Changeset 77 for trunk/sources/HeuristicLab.BitVector

Timestamp:

03/18/08 16:00:00 (16 years ago)

Author:

swagner

Message:

Fixed ticket #67

• adapted accessing of variables in operators due to changes of variable lookup and the new name aliasing mechanism (actual/formal name translations should not be done directly anymore; instead the new method Scope.TranslateName should be used)

Location:

trunk/sources/HeuristicLab.BitVector

Files:

• BitVectorCrossoverBase.cs (modified) (1 diff)
• RandomBitVectorGenerator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.BitVector/BitVectorCrossoverBase.cs

@@ -36 +36 @@
     protected sealed override void Cross(IScope scope, IRandom random, IScope parent1, IScope parent2, IScope child) {
       IVariableInfo bitVectorInfo = GetVariableInfo("BitVector");
-      BoolArrayData vector1 = parent1.GetVariableValue<BoolArrayData>(bitVectorInfo.ActualName, false);
-      BoolArrayData vector2 = parent2.GetVariableValue<BoolArrayData>(bitVectorInfo.ActualName, false);
+      BoolArrayData vector1 = parent1.GetVariableValue<BoolArrayData>(bitVectorInfo.FormalName, false);
+      BoolArrayData vector2 = parent2.GetVariableValue<BoolArrayData>(bitVectorInfo.FormalName, false);
 
       if (vector1.Data.Length != vector2.Data.Length) throw new InvalidOperationException("Cannot apply crossover to bit vectors of different length.");
 
       bool[] result = Cross(scope, random, vector1.Data, vector2.Data);
-      child.AddVariable(new Variable(bitVectorInfo.ActualName, new BoolArrayData(result)));
+      child.AddVariable(new Variable(child.TranslateName(bitVectorInfo.FormalName), new BoolArrayData(result)));
     }
 

trunk/sources/HeuristicLab.BitVector/RandomBitVectorGenerator.cs

@@ -56 +56 @@
 
             bool[] vector = Apply(random, length);
-            scope.AddVariable(new Variable(GetVariableInfo("BitVector").ActualName, new BoolArrayData(vector)));
+            scope.AddVariable(new Variable(scope.TranslateName("BitVector"), new BoolArrayData(vector)));
 
             return null;