Changeset 77 for trunk/sources/HeuristicLab.Permutation

Timestamp:

03/18/08 16:00:00 (17 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.Permutation

Files:

• PermutationCrossoverBase.cs (modified) (1 diff)
• RandomPermutationGenerator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Permutation/PermutationCrossoverBase.cs

@@ -34 +34 @@
 
     protected sealed override void Cross(IScope scope, IRandom random, IScope parent1, IScope parent2, IScope child) {
-      IVariableInfo permutationInfo = GetVariableInfo("Permutation");
-      Permutation perm1 = parent1.GetVariableValue<Permutation>(permutationInfo.ActualName, false);
-      Permutation perm2 = parent2.GetVariableValue<Permutation>(permutationInfo.ActualName, false);
+      Permutation perm1 = parent1.GetVariableValue<Permutation>("Permutation", false);
+      Permutation perm2 = parent2.GetVariableValue<Permutation>("Permutation", false);
 
       if (perm1.Data.Length != perm2.Data.Length) throw new InvalidOperationException("Cannot apply crossover to permutations of different length.");
 
       int[] result = Cross(scope, random, perm1.Data, perm2.Data);
-      child.AddVariable(new Variable(permutationInfo.ActualName, new Permutation(result)));
+      child.AddVariable(new Variable(scope.TranslateName("Permutation"), new Permutation(result)));
     }
 

trunk/sources/HeuristicLab.Permutation/RandomPermutationGenerator.cs

@@ -61 +61 @@
 
       int[] perm = Apply(random, length.Data);
-      scope.AddVariable(new Variable(GetVariableInfo("Permutation").ActualName, new Permutation(perm)));
+      scope.AddVariable(new Variable(scope.TranslateName("Permutation"), new Permutation(perm)));
 
       return null;