Changeset 77 for trunk/sources/HeuristicLab.Evolutionary

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.Evolutionary

Files:

• CrossoverBase.cs (modified) (1 diff)
• SubScopesStorer.cs (modified) (2 diffs)
• SuccessRuleMutationStrengthAdjuster.cs (modified) (2 diffs)

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;