Changeset 4489 for trunk

Timestamp:

09/24/10 15:26:27 (14 years ago)

Author:

gkronber

Message:

Removed code fragments from class Scope which updated the SubScopes list when setting the parent property of a scope. ##1207

Location:

trunk/sources

Files:

• HeuristicLab.Core/3.3/Scope.cs (modified) (1 diff)
• HeuristicLab.Optimization.Operators/3.3/SASEGASAReunificator.cs (modified) (1 diff)
• HeuristicLab.Selection/3.3/OffspringSelector.cs (modified) (1 diff)
• HeuristicLab.Selection/3.3/RightChildReducer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/3.3/Scope.cs

@@ -42 +42 @@
       set {
         if (parent != value) {
-          IScope oldParent = parent;
-          parent = null;
-          if (oldParent != null) oldParent.SubScopes.Remove(this);
           parent = value;
-          if ((parent != null) && !parent.SubScopes.Contains(this)) parent.SubScopes.Add(this);
         }
       }

trunk/sources/HeuristicLab.Optimization.Operators/3.3/SASEGASAReunificator.cs

@@ -69 +69 @@
 
       // reduce number of villages by 1 and partition the population again
-      scope.SubScopes.Remove(scope.SubScopes[scope.SubScopes.Count - 1]);
+      scope.SubScopes.RemoveAt(scope.SubScopes.Count - 1);
       villageCount--;
       int populationPerVillage = population.Count / villageCount;

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

@@ -148 +148 @@
         scope.SubScopes.Remove(parents);
         scope.SubScopes.Remove(offspring);
-        while (parents.SubScopes.Count > 0)
-          scope.SubScopes.Add(parents.SubScopes[0]);
+        while (parents.SubScopes.Count > 0) {
+          IScope parent = parents.SubScopes[0];
+          parents.SubScopes.RemoveAt(0);
+          scope.SubScopes.Add(parent);
+        }
 
         IOperator moreOffspring = OffspringCreatorParameter.ActualValue as IOperator;

trunk/sources/HeuristicLab.Selection/3.3/RightChildReducer.cs

@@ -55 +55 @@
 
         // merge right children
-        while (leftRightChild.SubScopes.Count > 0)
-          rightChild.SubScopes.Add(leftRightChild.SubScopes[0]);
+        while (leftRightChild.SubScopes.Count > 0) {
+          IScope leftRightChildChild = leftRightChild.SubScopes[0];
+          leftRightChild.SubScopes.RemoveAt(0);
+          rightChild.SubScopes.Add(leftRightChildChild);
+        }
 
         leftChild = leftChild.SubScopes[0];