Changeset 12643 for branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/LinearLinkageEncoding.cs

Timestamp:

07/07/15 13:52:18 (9 years ago)

Author:

abeham

Message:

#2319:

• Added two new solution creators
• Added swap2 neighborhood
• Added license headers
• Pruned usings
• Fixed namespaces

File:

• branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/LinearLinkageEncoding.cs (modified) (4 diffs)

branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/LinearLinkageEncoding.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.LinearLinkageEncoding.Creators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -108 +107 @@
           typeof (ILinearLinkageCrossover),
           typeof (ILinearLinkageManipulator),
-          typeof (ILinearLinkageShakingOperator)
+          typeof (ILinearLinkageShakingOperator),
+          typeof (ILinearLinkageMoveOperator)
       };
     }
@@ -128 +128 @@
       ConfigureManipulators(operators.OfType<ILinearLinkageManipulator>());
       ConfigureShakingOperators(operators.OfType<ILinearLinkageShakingOperator>());
+      ConfigureMoveOperators(operators.OfType<ILinearLinkageMoveOperator>());
+      ConfigureSwap2MoveOperators(operators.OfType<ILinearLinkageSwap2MoveOperator>());
     }
 
@@ -153 +155 @@
       }
     }
+    private void ConfigureMoveOperators(IEnumerable<ILinearLinkageMoveOperator> moveOperators) {
+      foreach (var moveOperator in moveOperators) {
+        moveOperator.LLEParameter.ActualName = Name;
+      }
+    }
+    private void ConfigureSwap2MoveOperators(IEnumerable<ILinearLinkageSwap2MoveOperator> swap2MoveOperators) {
+      foreach (var swap2MoveOperator in swap2MoveOperators) {
+        swap2MoveOperator.Swap2MoveParameter.ActualName = Name + ".Swap2Move";
+      }
+    }
     #endregion
   }