Changeset 15256 for branches/PerformanceComparison/HeuristicLab.Encodings.LinearLinkageEncoding

Timestamp:

07/15/17 14:25:44 (7 years ago)

Author:

abeham

Message:

#2457: merged trunk into branch

Location:

branches/PerformanceComparison/HeuristicLab.Encodings.LinearLinkageEncoding

Files:

• . (modified) (1 prop)
• 3.4/HeuristicLab.Encodings.LinearLinkageEncoding-3.4.csproj (modified) (2 diffs)
• 3.4/Interfaces/ILinearLinkageEMSSMoveOperator.cs (copied) (copied from trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Interfaces/ILinearLinkageEMSSMoveOperator.cs)
• 3.4/LinearLinkageEqualityComparer.cs (modified) (2 diffs)
• 3.4/Moves/EMSS (copied) (copied from trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/EMSS)
• 3.4/Moves/ExtractMove.cs (deleted)
• 3.4/Moves/MergeMove.cs (deleted)
• 3.4/Moves/Move.cs (deleted)
• 3.4/Moves/ShiftMove.cs (deleted)
• 3.4/Moves/SplitMove.cs (deleted)
• 3.4/Moves/StaticAPI (deleted)
• 3.4/Moves/Swap/ExhaustiveSwap2MoveGenerator.cs (modified) (1 diff)
• 3.4/Moves/Swap/StochasticSwap2SingleMoveGenerator.cs (modified) (1 diff)
• 3.4/SimilarityCalculators/HammingSimilarityCalculator.cs (modified) (2 diffs)

branches/PerformanceComparison/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/HeuristicLab.Encodings.LinearLinkageEncoding-3.4.csproj

@@ -155 +155 @@
     <Compile Include="Crossovers\SinglePointCrossover.cs" />
     <Compile Include="Interfaces\ILinearLinkageMoveOperator.cs" />
+    <Compile Include="Interfaces\ILinearLinkageEMSSMoveOperator.cs" />
     <Compile Include="Interfaces\ILinearLinkageSwap2MoveOperator.cs" />
     <Compile Include="Interfaces\ILinearLinkageCreator.cs" />
@@ -167 +168 @@
     <Compile Include="Manipulators\MergeGroupManipulator.cs" />
     <Compile Include="Manipulators\MultiLLEManipulator.cs" />
-    <Compile Include="Moves\ExtractMove.cs" />
-    <Compile Include="Moves\MergeMove.cs" />
-    <Compile Include="Moves\Move.cs" />
-    <Compile Include="Moves\ShiftMove.cs" />
-    <Compile Include="Moves\SplitMove.cs" />
-    <Compile Include="Moves\StaticAPI\MoveGenerator.cs" />
+    <Compile Include="Moves\EMSS\EMSSMoveMaker.cs" />
+    <Compile Include="Moves\EMSS\ExtractMove.cs" />
+    <Compile Include="Moves\EMSS\MergeMove.cs" />
+    <Compile Include="Moves\EMSS\EMSSMove.cs" />
+    <Compile Include="Moves\EMSS\ExhaustiveEMSSMoveGenerator.cs" />
+    <Compile Include="Moves\EMSS\EMSSMoveGenerator.cs" />
+    <Compile Include="Moves\EMSS\StochasticEMSSMultiMoveGenerator.cs" />
+    <Compile Include="Moves\EMSS\StochasticEMSSSingleMoveGenerator.cs" />
+    <Compile Include="Moves\EMSS\ShiftMove.cs" />
+    <Compile Include="Moves\EMSS\SplitMove.cs" />
     <Compile Include="Moves\Swap\ExhaustiveSwap2MoveGenerator.cs" />
     <Compile Include="Moves\Swap\StochasticSwap2MultiMoveGenerator.cs" />

branches/PerformanceComparison/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/LinearLinkageEqualityComparer.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Encodings.LinearLinkageEncoding {
+  [NonDiscoverableType]
   public class LinearLinkageEqualityComparer : EqualityComparer<LinearLinkage> {
     public override bool Equals(LinearLinkage x, LinearLinkage y) {
-      if (x == null && y == null) return true;
+      if (ReferenceEquals(x, y)) return true;
       if (x == null || y == null) return false;
       if (x.Length != y.Length) return false;
@@ -34 +37 @@
 
     public override int GetHashCode(LinearLinkage obj) {
+      if (obj == null) throw new ArgumentNullException("obj", "LinearLinkageEqualityComparer: Cannot compute hash value of null.");
       unchecked {
         int hash = 17;

branches/PerformanceComparison/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/Swap/ExhaustiveSwap2MoveGenerator.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.LinearLinkageEncoding {
-  [Item("ExhaustiveSwap2MoveGenerator", "Generates all possible swap-2 moves from a given permutation.")]
+  [Item("ExhaustiveSwap2MoveGenerator", "Generates all possible swap-2 moves from a given lle grouping.")]
   [StorableClass]
   public class ExhaustiveSwap2MoveGenerator : Swap2MoveGenerator, IExhaustiveMoveGenerator {

branches/PerformanceComparison/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/Swap/StochasticSwap2SingleMoveGenerator.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.LinearLinkageEncoding {
-  [Item("StochasticSwap2SingleMoveGenerator", "Randomly samples a single from all possible swap-2 moves from a given grouping.")]
+  [Item("StochasticSwap2SingleMoveGenerator", "Randomly samples a single from all possible swap-2 moves from a given lle grouping.")]
   [StorableClass]
   public class StochasticSwap2SingleMoveGenerator : Swap2MoveGenerator, IStochasticOperator, ISingleMoveGenerator {

branches/PerformanceComparison/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/SimilarityCalculators/HammingSimilarityCalculator.cs

@@ -30 +30 @@
   [StorableClass]
   public sealed class HammingSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
-
-    protected override bool IsCommutative {
-      get { return true; }
-    }
+    protected override bool IsCommutative { get { return true; } }
 
     [StorableConstructor]
     private HammingSimilarityCalculator(bool deserializing) : base(deserializing) { }
     private HammingSimilarityCalculator(HammingSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
-    public HammingSimilarityCalculator() { }
+    public HammingSimilarityCalculator() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -45 +42 @@
 
     public static double CalculateSimilarity(LinearLinkage left, LinearLinkage right) {
-      if (left.Length != right.Length) throw new ArgumentException("Comparing encodings of unequal length");
+      if (left == null || right == null)
+        throw new ArgumentException("Cannot calculate similarity because one or both of the provided solutions is null.");
+      if (left.Length != right.Length)
+        throw new ArgumentException("Cannot calculate similarity because the provided solutions have different lengths.");
+      if (left.Length == 0)
+        throw new ArgumentException("Cannot calculate similarity because solutions are of length 0.");
+      if (ReferenceEquals(left, right)) return 1.0;
+
       var similarity = 0;
       for (var i = 0; i < left.Length; i++) {