Changeset 77

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

Files:

• HeuristicLab.BitVector/BitVectorCrossoverBase.cs (modified) (1 diff)
• HeuristicLab.BitVector/RandomBitVectorGenerator.cs (modified) (1 diff)
• HeuristicLab.Evolutionary/CrossoverBase.cs (modified) (1 diff)
• HeuristicLab.Evolutionary/SubScopesStorer.cs (modified) (2 diffs)
• HeuristicLab.Evolutionary/SuccessRuleMutationStrengthAdjuster.cs (modified) (2 diffs)
• HeuristicLab.Logging/BestAverageWorstQualityCalculator.cs (modified) (2 diffs)
• HeuristicLab.Logging/LinechartInjector.cs (modified) (1 diff)
• HeuristicLab.Logging/QualityLogger.cs (modified) (2 diffs)
• HeuristicLab.Operators.Programmable/ProgrammableOperator.cs (modified) (1 diff)
• HeuristicLab.Operators/ComparatorBase.cs (modified) (1 diff)
• HeuristicLab.Operators/DataCollector.cs (modified) (1 diff)
• HeuristicLab.Operators/SingleObjectiveEvaluatorBase.cs (modified) (1 diff)
• HeuristicLab.Operators/Sorter.cs (modified) (1 diff)
• HeuristicLab.Permutation/PermutationCrossoverBase.cs (modified) (1 diff)
• HeuristicLab.Permutation/RandomPermutationGenerator.cs (modified) (1 diff)
• HeuristicLab.Random/RandomInjector.cs (modified) (1 diff)
• HeuristicLab.RealVector/HeuristicCrossover.cs (modified) (1 diff)
• HeuristicLab.RealVector/RealVectorCrossoverBase.cs (modified) (1 diff)
• HeuristicLab.RealVector/UniformRandomRealVectorGenerator.cs (modified) (1 diff)
• HeuristicLab.Routing.TSP/TSPDistanceMatrixInjectorBase.cs (modified) (1 diff)
• HeuristicLab.Routing.TSP/TSPInjector.cs (modified) (1 diff)
• HeuristicLab.Routing.TSP/TSPTourInjector.cs (modified) (1 diff)
• HeuristicLab.Scheduling.JSSP/CopyVariableFromSubScope.cs (modified) (1 diff)
• HeuristicLab.Scheduling.JSSP/IsSchedulable.cs (modified) (1 diff)
• HeuristicLab.Scheduling.JSSP/ItemListIndexer.cs (modified) (1 diff)
• HeuristicLab.Scheduling.JSSP/JSSPInjector.cs (modified) (1 diff)
• HeuristicLab.Scheduling.JSSP/ScheduleInjector.cs (modified) (1 diff)
• HeuristicLab.Selection.OffspringSelection/OffspringAnalyzer.cs (modified) (5 diffs)
• HeuristicLab.Selection.OffspringSelection/OffspringSelector.cs (modified) (6 diffs)
• HeuristicLab.Selection/ProportionalSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/TournamentSelector.cs (modified) (1 diff)
• HeuristicLab.StructureIdentification/StructIdProblemInjector.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;

trunk/sources/HeuristicLab.Evolutionary/CrossoverBase.cs

@@ -42 +42 @@
       for (int i = 0; i < children; i++) {
         IScope parent1 = scope.SubScopes[0];
+        IScope parent2 = scope.SubScopes[1];
+        IScope child = new Scope(i.ToString());
+        scope.AddSubScope(child);
+        Cross(scope, random, parent1, parent2, child);
         scope.RemoveSubScope(parent1);
-        IScope parent2 = scope.SubScopes[0];
         scope.RemoveSubScope(parent2);
-        IScope child = new Scope(i.ToString());
-        Cross(scope, random, parent1, parent2, child);
-        scope.AddSubScope(child);
       }
 

trunk/sources/HeuristicLab.Evolutionary/SubScopesStorer.cs

@@ -49 +49 @@
           AddVariable(new Variable(info.ActualName, subScopesStore));
         else
-          scope.AddVariable(new Variable(info.ActualName, subScopesStore));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), subScopesStore));
       }
 
@@ -64 +64 @@
             RemoveVariable(info.ActualName);
           else
-            scope.RemoveVariable(info.ActualName);
+            scope.RemoveVariable(scope.TranslateName(info.FormalName));
         }
         return null;

trunk/sources/HeuristicLab.Evolutionary/SuccessRuleMutationStrengthAdjuster.cs

@@ -47 +47 @@
       if (successProb == null) {
         IVariableInfo successProbInfo = GetVariableInfo("SuccessProbability");
-        Variable successProbVar = new Variable(successProbInfo.ActualName, new DoubleData(targetSuccessProb.Data));
-        if (successProbInfo.Local)
+        IVariable successProbVar;
+        if (successProbInfo.Local) {
+          successProbVar = new Variable(successProbInfo.ActualName, new DoubleData(targetSuccessProb.Data));
           AddVariable(successProbVar);
-        else
+        } else {
+          successProbVar = new Variable(scope.TranslateName(successProbInfo.FormalName), new DoubleData(targetSuccessProb.Data));
           scope.AddVariable(successProbVar);
+        }
         successProb = (DoubleData)successProbVar.Value;
       }
@@ -59 +62 @@
       double success = 0.0;
       for (int i = 0 ; i < scope.SubScopes.Count ; i++) {
-        if (scope.SubScopes[i].GetVariableValue<BoolData>(GetVariableInfo("SuccessfulChild").ActualName, false).Data) {
+        if (scope.SubScopes[i].GetVariableValue<BoolData>("SuccessfulChild", false).Data) {
           success++;
         }
-        scope.SubScopes[i].RemoveVariable(GetVariableInfo("SuccessfulChild").ActualName);
+        scope.SubScopes[i].RemoveVariable(scope.SubScopes[i].TranslateName("SuccessfulChild"));
       }
       if (scope.SubScopes.Count > 0) success /= scope.SubScopes.Count;

trunk/sources/HeuristicLab.Logging/BestAverageWorstQualityCalculator.cs

@@ -46 +46 @@
 
       for (int i = 0; i < scope.SubScopes.Count; i++)
-        qualities[i] = scope.SubScopes[i].GetVariableValue<DoubleData>(GetVariableInfo("Quality").ActualName, false).Data;
+        qualities[i] = scope.SubScopes[i].GetVariableValue<DoubleData>("Quality", false).Data;
 
       double worst = qualities[0];
@@ -78 +78 @@
           AddVariable(new Variable(info.ActualName, data));
         else
-          scope.AddVariable(new Variable(info.ActualName, data));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), data));
       }
       data.Data = value;

trunk/sources/HeuristicLab.Logging/LinechartInjector.cs

@@ -52 +52 @@
           AddVariable(new Variable(info.ActualName, linechart));
         else
-          scope.AddVariable(new Variable(info.ActualName, linechart));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), linechart));
       } else
         linechart.Values = values;

trunk/sources/HeuristicLab.Logging/QualityLogger.cs

@@ -43 +43 @@
 
       for (int i = 0; i < scope.SubScopes.Count; i++)
-        qualities[i] = scope.SubScopes[i].GetVariableValue<DoubleData>(GetVariableInfo("Quality").ActualName, false).Data;
+        qualities[i] = scope.SubScopes[i].GetVariableValue<DoubleData>("Quality", false).Data;
 
       double min = qualities[0];
@@ -62 +62 @@
           AddVariable(new Variable(info.ActualName, log));
         else
-          scope.AddVariable(new Variable(info.ActualName, log));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), log));
       }
       log.Items.Add(new DoubleArrayData(new double[] { min, average, max } ));

trunk/sources/HeuristicLab.Operators.Programmable/ProgrammableOperator.cs

@@ -163 +163 @@
               AddVariable(new Variable(info.ActualName, value));
             } else {
-              scope.AddVariable(new Variable(info.ActualName, value));
+              scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), value));
             }
             parameters[i] = value;

trunk/sources/HeuristicLab.Operators/ComparatorBase.cs

@@ -42 +42 @@
           AddVariable(new Variable(info.ActualName, result));
         else
-          scope.AddVariable(new Variable(info.ActualName, result));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), result));
       }
       IItem leftSide = GetVariableValue<IItem>("LeftSide", scope, true);

trunk/sources/HeuristicLab.Operators/DataCollector.cs

@@ -50 +50 @@
           AddVariable(new Variable(info.ActualName, values));
         else
-          scope.AddVariable(new Variable(info.ActualName, values));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), values));
       }
 

trunk/sources/HeuristicLab.Operators/SingleObjectiveEvaluatorBase.cs

@@ -42 +42 @@
           AddVariable(new Variable(qualityInfo.ActualName, quality));
         else
-          scope.AddVariable(new Variable(qualityInfo.ActualName, quality));
+          scope.AddVariable(new Variable(scope.TranslateName(qualityInfo.FormalName), quality));
       } else {
         quality.Data = qualityValue;

trunk/sources/HeuristicLab.Operators/Sorter.cs

@@ -44 +44 @@
 
       for (int i = 0; i < keys.Length; i++) {
-        keys[i] = scope.SubScopes[i].GetVariableValue<DoubleData>(GetVariableInfo("Value").ActualName, false).Data;
+        keys[i] = scope.SubScopes[i].GetVariableValue<DoubleData>("Value", false).Data;
         sequence[i] = i;
       }

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;

trunk/sources/HeuristicLab.Random/RandomInjector.cs

@@ -56 +56 @@
       }
       MersenneTwister mersenneTwister = new MersenneTwister((uint)seed.Data);
-      scope.AddVariable(new Variable(GetVariableInfo("Random").ActualName, mersenneTwister));
+
+      scope.AddVariable(new Variable(scope.TranslateName("Random"), mersenneTwister));
       return null;
     }

trunk/sources/HeuristicLab.RealVector/HeuristicCrossover.cs

@@ -35 +35 @@
     protected sealed override void Cross(IScope scope, IRandom random, IScope parent1, IScope parent2, IScope child) {
       bool maximization = GetVariableValue<BoolData>("Maximization", scope, true).Data;
-      IVariableInfo realVectorInfo = GetVariableInfo("RealVector");
-      IVariableInfo qualityInfo = GetVariableInfo("Quality");
-      DoubleArrayData vector1 = parent1.GetVariableValue<DoubleArrayData>(realVectorInfo.ActualName, false);
-      DoubleData quality1 = parent1.GetVariableValue<DoubleData>(qualityInfo.ActualName, false);
-      DoubleArrayData vector2 = parent2.GetVariableValue<DoubleArrayData>(realVectorInfo.ActualName, false);
-      DoubleData quality2 = parent2.GetVariableValue<DoubleData>(qualityInfo.ActualName, false);
+      DoubleArrayData vector1 = parent1.GetVariableValue<DoubleArrayData>("RealVector", false);
+      DoubleData quality1 = parent1.GetVariableValue<DoubleData>("Quality", false);
+      DoubleArrayData vector2 = parent2.GetVariableValue<DoubleArrayData>("RealVector", false);
+      DoubleData quality2 = parent2.GetVariableValue<DoubleData>("Quality", false);
 
       if (vector1.Data.Length != vector2.Data.Length) throw new InvalidOperationException("Cannot apply crossover to real vectors of different length.");
 
       double[] result = Apply(random, maximization, vector1.Data, quality1.Data, vector2.Data, quality2.Data);
-      child.AddVariable(new Variable(realVectorInfo.ActualName, new DoubleArrayData(result)));
+      child.AddVariable(new Variable(child.TranslateName("RealVector"), new DoubleArrayData(result)));
     }
   }

trunk/sources/HeuristicLab.RealVector/RealVectorCrossoverBase.cs

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

trunk/sources/HeuristicLab.RealVector/UniformRandomRealVectorGenerator.cs

@@ -54 +54 @@
 
       double[] vector = Apply(random, length, min, max);
-      scope.AddVariable(new Variable(GetVariableInfo("RealVector").ActualName, new DoubleArrayData(vector)));
+      scope.AddVariable(new Variable(scope.TranslateName("RealVector"), new DoubleArrayData(vector)));
 
       return null;

trunk/sources/HeuristicLab.Routing.TSP/TSPDistanceMatrixInjectorBase.cs

@@ -49 +49 @@
         }
       }
-      scope.AddVariable(new Variable(GetVariableInfo("DistanceMatrix").ActualName, new DoubleMatrixData(distanceMatrix)));
+      scope.AddVariable(new Variable(scope.TranslateName("DistanceMatrix"), new DoubleMatrixData(distanceMatrix)));
 
       return null;

trunk/sources/HeuristicLab.Routing.TSP/TSPInjector.cs

@@ -51 +51 @@
 
     public override IOperation Apply(IScope scope) {
-      scope.AddVariable(new Variable(GetVariableInfo("Maximization").ActualName, new BoolData(false)));
-      scope.AddVariable(new Variable(GetVariableInfo("Cities").ActualName, (IItem)GetVariable("Cities").Value.Clone()));
-      scope.AddVariable(new Variable(GetVariableInfo("Coordinates").ActualName, (IItem)GetVariable("Coordinates").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("Maximization"), new BoolData(false)));
+      scope.AddVariable(new Variable(scope.TranslateName("Cities"), (IItem)GetVariable("Cities").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("Coordinates"), (IItem)GetVariable("Coordinates").Value.Clone()));
       if (GetVariable("InjectBestKnownQuality").GetValue<BoolData>().Data)
-        scope.AddVariable(new Variable(GetVariableInfo("BestKnownQuality").ActualName, (IItem)GetVariable("BestKnownQuality").Value.Clone()));
+        scope.AddVariable(new Variable(scope.TranslateName("BestKnownQuality"), (IItem)GetVariable("BestKnownQuality").Value.Clone()));
       return null;
     }

trunk/sources/HeuristicLab.Routing.TSP/TSPTourInjector.cs

@@ -50 +50 @@
           AddVariable(new Variable(info.ActualName, tour));
         else
-          scope.AddVariable(new Variable(info.ActualName, tour));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), tour));
       } else {
         tour.Coordinates = coordinates;

trunk/sources/HeuristicLab.Scheduling.JSSP/CopyVariableFromSubScope.cs

@@ -46 +46 @@
         IItem var = GetVariableValue<IItem>("Variable", s, false);
         if(var != null) {
-          if(scope.GetVariable(GetVariableInfo("Variable").ActualName) != null) {
-            scope.RemoveVariable(GetVariableInfo("Variable").ActualName);
+          if(scope.GetVariable(scope.TranslateName("Variable")) != null) {
+            scope.RemoveVariable(scope.TranslateName("Variable"));
           }
-          scope.AddVariable(new Variable(GetVariableInfo("Variable").ActualName, var));
+          scope.AddVariable(new Variable(scope.TranslateName("Variable"), var));
           return null;
         }

trunk/sources/HeuristicLab.Scheduling.JSSP/IsSchedulable.cs

@@ -40 +40 @@
     public override IOperation Apply(IScope scope) {
       Operation op = GetVariableValue<Operation>("Operation", scope, true);
-      if(scope.GetVariable(GetVariableInfo("Schedulable").ActualName) != null) {
+      if(scope.GetVariable(scope.TranslateName("Schedulable")) != null) {
         BoolData isSchedulable = GetVariableValue<BoolData>("Schedulable", scope, false);
         isSchedulable.Data = (op.Predecessors.Count == 0);
       } else {
-        scope.AddVariable(new Variable(GetVariableInfo("Schedulable").ActualName, new BoolData((op.Predecessors.Count == 0))));
+        scope.AddVariable(new Variable(scope.TranslateName("Schedulable"), new BoolData((op.Predecessors.Count == 0))));
       }
       return null;

trunk/sources/HeuristicLab.Scheduling.JSSP/ItemListIndexer.cs

@@ -45 +45 @@
       ItemList list = GetVariableValue<ItemList>("List", scope, true);
       int index = GetVariableValue<IntData>("Index", scope, true).Data;
-      if(scope.GetVariable(GetVariableInfo("Object").ActualName) != null) {
-        scope.RemoveVariable(GetVariableInfo("Object").ActualName);
+      if(scope.GetVariable(scope.TranslateName("Object")) != null) {
+        scope.RemoveVariable(scope.TranslateName("Object"));
       }
       if((list != null) && (index < list.Count)) {
-        scope.AddVariable(new Variable(GetVariableInfo("Object").ActualName, (IItem)list[index].Clone()));
+        scope.AddVariable(new Variable(scope.TranslateName("Object"), (IItem)list[index].Clone()));
       }
       return null;

trunk/sources/HeuristicLab.Scheduling.JSSP/JSSPInjector.cs

@@ -66 +66 @@
 
     public override IOperation Apply(IScope scope) {
-      scope.AddVariable(new Variable(GetVariableInfo("Machines").ActualName, machines.Clone() as IntData));
-      scope.AddVariable(new Variable(GetVariableInfo("Jobs").ActualName, jobs.Clone() as IntData));
-      scope.AddVariable(new Variable(GetVariableInfo("Operations").ActualName, (ItemList)operations.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("Machines"), machines.Clone() as IntData));
+      scope.AddVariable(new Variable(scope.TranslateName("Jobs"), jobs.Clone() as IntData));
+      scope.AddVariable(new Variable(scope.TranslateName("Operations"), (ItemList)operations.Clone()));
       return base.Apply(scope);
     }

trunk/sources/HeuristicLab.Scheduling.JSSP/ScheduleInjector.cs

@@ -51 +51 @@
       IntData timespan = GetVariableValue<IntData>("Timespan", scope, true);
       schedule = new Schedule(machines.Data, timespan.Data);
-      scope.AddVariable(new Variable(GetVariableInfo("Schedule").ActualName, schedule));
+      scope.AddVariable(new Variable(scope.TranslateName("Schedule"), schedule));
       return null;
     }

trunk/sources/HeuristicLab.Selection.OffspringSelection/OffspringAnalyzer.cs

@@ -60 +60 @@
         double[] qualitiesArray = new double[scope.SubScopes.Count];
         for (int i = 0; i < qualitiesArray.Length; i++)
-          qualitiesArray[i] = scope.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
+          qualitiesArray[i] = scope.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
         qualities = new DoubleArrayData(qualitiesArray);
         IVariableInfo parentQualitiesInfo = GetVariableInfo("ParentQualities");
@@ -66 +66 @@
           AddVariable(new Variable(parentQualitiesInfo.ActualName, qualities));
         else
-          scope.AddVariable(new Variable(parentQualitiesInfo.ActualName, qualities));
+          scope.AddVariable(new Variable(scope.TranslateName(parentQualitiesInfo.FormalName), qualities));
 
         CompositeOperation next = new CompositeOperation();
@@ -82 +82 @@
           }
           IVariableInfo qualityInfo = GetVariableInfo("Quality");
-          double child = scope.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
+          double child = scope.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
           double threshold;
 
@@ -97 +97 @@
           else
             successful = new BoolData(false);
-          scope.SubScopes[i].AddVariable(new Variable(successfulInfo.ActualName, successful));
+          scope.SubScopes[i].AddVariable(new Variable(scope.TranslateName(successfulInfo.FormalName), successful));
         }
 
@@ -105 +105 @@
           RemoveVariable(parentQualitiesInfo.ActualName);
         else
-          scope.RemoveVariable(parentQualitiesInfo.ActualName);
+          scope.RemoveVariable(scope.TranslateName(parentQualitiesInfo.FormalName));
 
         return null;

trunk/sources/HeuristicLab.Selection.OffspringSelection/OffspringSelector.cs

@@ -57 +57 @@
           AddVariable(new Variable(goodChildrenInfo.ActualName, goodChildren));
         else
-          scope.AddVariable(new Variable(goodChildrenInfo.ActualName, goodChildren));
+          scope.AddVariable(new Variable(scope.TranslateName(goodChildrenInfo.FormalName), goodChildren));
       }
       ItemList<IScope> badChildren = GetVariableValue<ItemList<IScope>>("BadChildren", scope, false, false);
@@ -66 +66 @@
           AddVariable(new Variable(badChildrenInfo.ActualName, badChildren));
         else
-          scope.AddVariable(new Variable(badChildrenInfo.ActualName, badChildren));
+          scope.AddVariable(new Variable(scope.TranslateName(badChildrenInfo.FormalName), badChildren));
       }
 
@@ -73 +73 @@
       while (children.SubScopes.Count > 0) {
         IScope child = children.SubScopes[0];
-        bool successful = child.GetVariableValue<BoolData>(successfulInfo.ActualName, false).Data;
+        bool successful = child.GetVariableValue<BoolData>(successfulInfo.FormalName, false).Data;
         if (successful) goodChildren.Add(child);
         else badChildren.Add(child);
@@ -87 +87 @@
           AddVariable(new Variable(selectionPressureInfo.ActualName, selectionPressure));
         else
-          scope.AddVariable(new Variable(selectionPressureInfo.ActualName, selectionPressure));
+          scope.AddVariable(new Variable(scope.TranslateName(selectionPressureInfo.FormalName), selectionPressure));
       }
       DoubleData successRatio = GetVariableValue<DoubleData>("SuccessRatio", scope, false, false);
@@ -96 +96 @@
           AddVariable(new Variable(successRatioInfo.ActualName, successRatio));
         else
-          scope.AddVariable(new Variable(successRatioInfo.ActualName, successRatio));
+          scope.AddVariable(new Variable(scope.TranslateName(successRatioInfo.FormalName), successRatio));
       }
       int goodCount = goodChildren.Count;
@@ -130 +130 @@
           RemoveVariable(goodChildrenInfo.ActualName);
         else
-          scope.RemoveVariable(goodChildrenInfo.ActualName);
+          scope.RemoveVariable(scope.TranslateName(goodChildrenInfo.FormalName));
         IVariableInfo badChildrenInfo = GetVariableInfo("BadChildren");
         if (badChildrenInfo.Local)
           RemoveVariable(badChildrenInfo.ActualName);
         else
-          scope.RemoveVariable(badChildrenInfo.ActualName);
+          scope.RemoveVariable(scope.TranslateName(badChildrenInfo.FormalName));
 
         return null;

trunk/sources/HeuristicLab.Selection/ProportionalSelector.cs

@@ -81 +81 @@
       if (subScopes < 1) throw new InvalidOperationException("No source scopes to select available.");
 
-      double best = source.SubScopes[0].GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
-      double worst = source.SubScopes[subScopes - 1].GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
+      double best = source.SubScopes[0].GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
+      double worst = source.SubScopes[subScopes - 1].GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
       double limit = Math.Min(worst * 2, double.MaxValue);
       double min = Math.Min(best, worst);
@@ -90 +90 @@
       // preprocess fitness values, apply windowing if desired
       for (int i = 0; i < qualities.Length; i++) {
-        solutionQuality = source.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
+        solutionQuality = source.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
         if (solutionQuality < min || solutionQuality > max) {
           // something has obviously gone wrong here

trunk/sources/HeuristicLab.Selection/TournamentSelector.cs

@@ -52 +52 @@
         for (int j = 0; j < groupSize; j++) {
           IScope scope = source.SubScopes[random.Next(source.SubScopes.Count)];
-          double quality = scope.GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
+          double quality = scope.GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
           if (((maximization) && (quality > best)) ||
               ((!maximization) && (quality < best))) {

trunk/sources/HeuristicLab.StructureIdentification/StructIdProblemInjector.cs

@@ -57 +57 @@
 
     public override IOperation Apply(IScope scope) {
-      scope.AddVariable(new Variable(GetVariableInfo("Maximization").ActualName, new BoolData(false)));
-      scope.AddVariable(new Variable(GetVariableInfo("Dataset").ActualName, (IItem)GetVariable("Dataset").Value.Clone()));
-      scope.AddVariable(new Variable(GetVariableInfo("TargetVariable").ActualName, (IItem)GetVariable("TargetVariable").Value.Clone()));
-      scope.AddVariable(new Variable(GetVariableInfo("MaxTreeHeight").ActualName, (IItem)GetVariable("MaxTreeHeight").Value.Clone()));
-      scope.AddVariable(new Variable(GetVariableInfo("MaxTreeSize").ActualName, (IItem)GetVariable("MaxTreeSize").Value.Clone()));
-      scope.AddVariable(new Variable(GetVariableInfo("TrainingSamplesStart").ActualName, (IItem)GetVariable("TrainingSamplesStart").Value.Clone()));
-      scope.AddVariable(new Variable(GetVariableInfo("TrainingSamplesEnd").ActualName, (IItem)GetVariable("TrainingSamplesEnd").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("Maximization"), new BoolData(false)));
+      scope.AddVariable(new Variable(scope.TranslateName("Dataset"), (IItem)GetVariable("Dataset").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("TargetVariable"), (IItem)GetVariable("TargetVariable").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("MaxTreeHeight"), (IItem)GetVariable("MaxTreeHeight").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("MaxTreeSize"), (IItem)GetVariable("MaxTreeSize").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("TrainingSamplesStart"), (IItem)GetVariable("TrainingSamplesStart").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("TrainingSamplesEnd"), (IItem)GetVariable("TrainingSamplesEnd").Value.Clone()));
       return null;
     }