Changeset 14429 for branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3

Timestamp:

11/29/16 15:46:48 (8 years ago)

Author:

abeham

Message:

#2701, #2708: Made a new branch from ProblemRefactoring and removed ScopedBasicAlgorithm branch (which becomes MemPR branch)

Location:

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3

Files:

• Crossovers/NPointCrossover.cs (modified) (4 diffs)
• Crossovers/SinglePointCrossover.cs (modified) (1 diff)
• HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj (modified) (3 diffs)
• Interfaces/IBinaryLocalSearch.cs (added)
• Interfaces/IBinaryVectorCrossover.cs (modified) (2 diffs)
• LocalSearch (added)
• LocalSearch/ExhaustiveBitflip.cs (added)
• Manipulators/BitflipManipulator.cs (added)
• Manipulators/MultiBitflipManipulator.cs (added)
• Manipulators/SingleBitflipManipulator.cs (added)

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/NPointCrossover.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -70 +71 @@
     /// <param name="n">Number of crossover points.</param>
     /// <returns>The newly created binary vector, resulting from the N point crossover.</returns>
-    public static BinaryVector Apply(IRandom random, BinaryVector parent1, BinaryVector parent2, IntValue n) {
+    public static BinaryVector Apply(IRandom random, BinaryVector parent1, BinaryVector parent2, int n) {
       if (parent1.Length != parent2.Length)
         throw new ArgumentException("NPointCrossover: The parents are of different length.");
 
-      if (n.Value > parent1.Length)
+      if (n > parent1.Length)
         throw new ArgumentException("NPointCrossover: There cannot be more breakpoints than the size of the parents.");
 
-      if (n.Value < 1)
+      if (n < 1)
         throw new ArgumentException("NPointCrossover: N cannot be < 1.");
 
       int length = parent1.Length;
       bool[] result = new bool[length];
-      int[] breakpoints = new int[n.Value];
+      int[] breakpoints = new int[n];
 
       //choose break points
@@ -90 +91 @@
         breakpointPool.Add(i);
 
-      for (int i = 0; i < n.Value; i++) {
+      for (int i = 0; i < n; i++) {
         int index = random.Next(breakpointPool.Count);
         breakpoints[i] = breakpointPool[index];
@@ -137 +138 @@
       if (NParameter.ActualValue == null) throw new InvalidOperationException("NPointCrossover: Parameter " + NParameter.ActualName + " could not be found.");
 
-      return Apply(random, parents[0], parents[1], NParameter.ActualValue);
+      return Apply(random, parents[0], parents[1], NParameter.ActualValue.Value);
+    }
+  }
+
+  [Item("N-point Crossover", "", ExcludeGenericTypeInfo = true)]
+  [StorableClass]
+  public sealed class NPointCrossover<TContext> : ParameterizedNamedItem, IBinaryCrossover<TContext>
+    where TContext : IMatingContext<BinaryVector>, IStochasticContext {
+
+    [Storable]
+    private IValueParameter<IntValue> nparameter;
+    public int N {
+      get { return nparameter.Value.Value; }
+      set {
+        if (value < 1) throw new ArgumentException("Cannot set N to less than 1.");
+        nparameter.Value.Value = value;
+      }
+    }
+
+    [StorableConstructor]
+    private NPointCrossover(bool deserializing) : base(deserializing) { }
+    private NPointCrossover(NPointCrossover<TContext> original, Cloner cloner)
+      : base(original, cloner) {
+      nparameter = cloner.Clone(original.nparameter);
+    }
+    public NPointCrossover() {
+      Parameters.Add(nparameter = new ValueParameter<IntValue>("N", "The number of crossover points.", new IntValue(1)));
+    }
+
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new NPointCrossover<TContext>(this, cloner);
+    }
+
+    public void Cross(TContext context) {
+      context.Child.Solution = NPointCrossover.Apply(context.Random, context.Parents.Item1.Solution, context.Parents.Item2.Solution, N);
     }
   }

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/SinglePointCrossover.cs

@@ -57 +57 @@
       if (parents.Length != 2) throw new ArgumentException("ERROR in SinglePointCrossover: The number of parents is not equal to 2");
 
-      return NPointCrossover.Apply(random, parents[0], parents[1], new IntValue(1));
+      return NPointCrossover.Apply(random, parents[0], parents[1], 1);
     }
   }

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj

@@ -126 +126 @@
     <Compile Include="Crossovers\NPointCrossover.cs" />
     <Compile Include="BinaryVector.cs" />
+    <Compile Include="Interfaces\IBinaryLocalSearch.cs" />
     <Compile Include="Interfaces\IBinaryVectorMultiNeighborhoodShakingOperator.cs" />
     <Compile Include="Interfaces\IBinaryVectorSolutionsOperator.cs" />
@@ -139 +140 @@
     <Compile Include="BinaryVectorManipulator.cs" />
     <Compile Include="Interfaces\IBinaryVectorMoveOperator.cs" />
+    <Compile Include="LocalSearch\ExhaustiveBitflip.cs" />
+    <Compile Include="Manipulators\MultiBitflipManipulator.cs" />
+    <Compile Include="Manipulators\SingleBitflipManipulator.cs" />
+    <Compile Include="Manipulators\BitflipManipulator.cs" />
     <Compile Include="Manipulators\SomePositionsBitflipManipulator.cs" />
     <Compile Include="Manipulators\SinglePositionBitflipManipulator.cs" />
@@ -205 +210 @@
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
       <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
+      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
+      <Name>HeuristicLab.Random-3.3</Name>
     </ProjectReference>
   </ItemGroup>

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorCrossover.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Crossover;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -31 +32 @@
     ILookupParameter<BinaryVector> ChildParameter { get; }
   }
+
+  // TODO: probably unecessary
+  public interface IBinaryCrossover<TContext> : ICrossover<TContext> { }
 }