Changeset 1159

Timestamp:

01/21/09 15:46:27 (15 years ago)

Author:

abeham

Message:

implemented changes to crossover described in ticket #470

• added ChildrenInitializer operator
• modified CrossoverBase and MultiCrossoverBase
• removed unnecessary operators in HeuristicLab.RealVector

Location:

trunk/sources

Files:

• HeuristicLab.Evolutionary/ChildrenInitializer.cs (added)
• HeuristicLab.Evolutionary/CrossoverBase.cs (modified) (1 diff)
• HeuristicLab.Evolutionary/HeuristicLab.Evolutionary.csproj (modified) (1 diff)
• HeuristicLab.Evolutionary/MultiCrossoverBase.cs (modified) (2 diffs)
• HeuristicLab.RealVector/HeuristicLab.RealVector.csproj (modified) (2 diffs)
• HeuristicLab.RealVector/SelfAdaptiveIntermediateMultiCrossover.cs (deleted)
• HeuristicLab.RealVector/VariableStrengthNormalAllPositionsManipulator.cs (deleted)

trunk/sources/HeuristicLab.Evolutionary/CrossoverBase.cs

@@ -50 +50 @@
       IRandom random = GetVariableValue<IRandom>("Random", scope, true);
 
-      if ((scope.SubScopes.Count % 2) != 0)
-        throw new InvalidOperationException("Size of mating pool is not even");
+      if (scope.SubScopes.Count != 2)
+        throw new InvalidOperationException("ERROR: Number of parents is != 2");
 
-      int children = scope.SubScopes.Count / 2;
-      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);
-        scope.RemoveSubScope(parent2);
-      }
+      IScope parent1 = scope.SubScopes[0];
+      IScope parent2 = scope.SubScopes[1];
+      IScope child = scope;
+      Cross(scope, random, parent1, parent2, child);
 
       return null;

trunk/sources/HeuristicLab.Evolutionary/HeuristicLab.Evolutionary.csproj

@@ -60 +60 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ChildrenInitializer.cs" />
     <Compile Include="MultiCrossoverBase.cs" />
     <Compile Include="SASEGASAReunificator.cs" />

trunk/sources/HeuristicLab.Evolutionary/MultiCrossoverBase.cs

@@ -38 +38 @@
     public MultiCrossoverBase()
       : base() {
-      AddVariableInfo(new VariableInfo("Parents", "Number of parents that should be crossed", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo("Random", "Pseudo random number generator", typeof(IRandom), VariableKind.In));
     }
@@ -53 +52 @@
     public override IOperation Apply(IScope scope) {
       IRandom random = GetVariableValue<IRandom>("Random", scope, true);
-      int parents = GetVariableValue<IntData>("Parents", scope, true).Data;
+      int parents = scope.SubScopes.Count;
 
-      if ((scope.SubScopes.Count % parents) != 0)
-        throw new InvalidOperationException("Size of mating pool and number of parents don't match");
+      if (parents < 2)
+        throw new InvalidOperationException("ERROR: Number of parents is < 2");
 
-      int children = scope.SubScopes.Count / parents;
-      for (int i = 0; i < children; i++) {
-        IScope[] parentScopes = new IScope[parents];
-        for (int j = 0; j < parentScopes.Length; j++)
-          parentScopes[j] = scope.SubScopes[j];
+      IScope[] parentScopes = new IScope[parents];
+      for (int i = 0; i < parents; i++)
+        parentScopes[i] = scope.SubScopes[i];
+      IScope child = scope;
+      Cross(scope, random, parentScopes, child);
 
-        IScope child = new Scope(i.ToString());
-        scope.AddSubScope(child);
-        Cross(scope, random, parentScopes, child);
-
-        for (int j = 0; j < parentScopes.Length; j++)
-          scope.RemoveSubScope(parentScopes[j]);
-      }
       return null;
     }

trunk/sources/HeuristicLab.RealVector/HeuristicLab.RealVector.csproj

@@ -75 +75 @@
     <Compile Include="RealVectorSelfAdaptiveMultiCrossoverBase.cs" />
     <Compile Include="SelfAdaptiveDiscreteMultiCrossover.cs" />
-    <Compile Include="SelfAdaptiveIntermediateMultiCrossover.cs" />
     <Compile Include="SelfAdaptiveNormalAllPositionsManipulator.cs" />
     <Compile Include="UniformAllPositionsManipulator.cs" />
@@ -85 +84 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SinglePointCrossover.cs" />
-    <Compile Include="VariableStrengthNormalAllPositionsManipulator.cs" />
   </ItemGroup>
   <ItemGroup>