Changeset 13376 for branches/ProblemRefactoring/HeuristicLab.Optimization/3.3

Timestamp:

11/24/15 17:44:26 (9 years ago)

Author:

abeham

Message:

#2521: working on refactoring

Location:

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3

Files:

• BasicProblems/CombinedEncoding.cs (moved) (moved from branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/MultiEncoding.cs) (3 diffs)
• BasicProblems/CombinedSolution.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/MultiSolution.cs) (3 diffs)
• BasicProblems/Individuals (deleted)
• BasicProblems/Operators/MultiEncodingCreator.cs (modified) (1 diff)
• BasicProblems/Operators/MultiEncodingCrossover.cs (modified) (1 diff)
• BasicProblems/Problem.cs (modified) (1 diff)
• HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/CombinedEncoding.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Optimization {
-  [Item("MultiEncoding", "Describes a combined encoding consisting of multiple simpler encodings.")]
+  [Item("CombinedEncoding", "Describes a combined encoding consisting of multiple simpler encodings.")]
   [StorableClass]
-  public sealed class MultiEncoding : Encoding<CombinedSolution> {
+  public sealed class CombinedEncoding : Encoding<CombinedSolution> {
 
     private ItemCollection<IEncoding> encodings;
@@ -46 +46 @@
 
     [StorableConstructor]
-    private MultiEncoding(bool deserializing) : base(deserializing) { }
-    public override IDeepCloneable Clone(Cloner cloner) { return new MultiEncoding(this, cloner); }
-    private MultiEncoding(MultiEncoding original, Cloner cloner)
+    private CombinedEncoding(bool deserializing) : base(deserializing) { }
+    public override IDeepCloneable Clone(Cloner cloner) { return new CombinedEncoding(this, cloner); }
+    private CombinedEncoding(CombinedEncoding original, Cloner cloner)
       : base(original, cloner) {
       encodings = new ItemCollection<IEncoding>(original.Encodings.Select(cloner.Clone));
     }
-    public MultiEncoding()
-      : base("MultiEncoding") {
+    public CombinedEncoding()
+      : base("CombinedEncoding") {
       encodings = new ItemCollection<IEncoding>();
       SolutionCreator = new MultiEncodingCreator() { SolutionParameter = { ActualName = Name } };
@@ -62 +62 @@
     }
 
-    public MultiEncoding Add(IEncoding encoding) {
-      if (encoding is MultiEncoding) throw new InvalidOperationException("Nesting of MultiEncodings is not supported.");
+    public CombinedEncoding Add(IEncoding encoding) {
+      if (encoding is CombinedEncoding) throw new InvalidOperationException("Nesting of CombinedEncodings is not supported.");
       if (Encodings.Any(e => e.Name == encoding.Name)) throw new ArgumentException("Encoding name must be unique", "encoding.Name");
       encodings.Add(encoding);

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/CombinedSolution.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -32 +31 @@
   public sealed class CombinedSolution : Item, ISolution {
 
-    private MultiEncoding Encoding { get; set; }
-    protected IScope Scope { get; private set; }
+    private CombinedEncoding Encoding { get; set; }
+    private IScope Scope { get; set; }
 
     [StorableConstructor]
     private CombinedSolution(bool deserializing) : base(deserializing) { }
-
     private CombinedSolution(CombinedSolution original, Cloner cloner)
       : base(original, cloner) {
@@ -43 +41 @@
       Scope = cloner.Clone(original.Scope);
     }
-    public CombinedSolution(IScope scope, MultiEncoding encoding) {
+    public CombinedSolution(IScope scope, CombinedEncoding encoding) {
       Encoding = encoding;
       Scope = scope;

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCreator.cs

@@ -65 +65 @@
 
     public override IOperation InstrumentedApply() {
-      SolutionParameter.ActualValue = new CombinedSolution(ExecutionContext.Scope, (MultiEncoding)EncodingParameter.ActualValue);
+      SolutionParameter.ActualValue = new CombinedSolution(ExecutionContext.Scope, (CombinedEncoding)EncodingParameter.ActualValue);
       return base.InstrumentedApply();
     }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCrossover.cs

@@ -38 +38 @@
 
     public override IOperation InstrumentedApply() {
-      SolutionParameter.ActualValue = new CombinedSolution(ExecutionContext.Scope, (MultiEncoding)EncodingParameter.ActualValue);
+      SolutionParameter.ActualValue = new CombinedSolution(ExecutionContext.Scope, (CombinedEncoding)EncodingParameter.ActualValue);
       return base.InstrumentedApply();
     }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

@@ -127 +127 @@
       if (oldEncoding.GetType() != newEncoding.GetType()) return;
 
-      if (oldEncoding.GetType() == typeof(MultiEncoding)) {
-        var oldMultiEncoding = (MultiEncoding)oldEncoding;
-        var newMultiEncoding = (MultiEncoding)newEncoding;
+      if (oldEncoding.GetType() == typeof(CombinedEncoding)) {
+        var oldMultiEncoding = (CombinedEncoding)oldEncoding;
+        var newMultiEncoding = (CombinedEncoding)newEncoding;
         if (!oldMultiEncoding.Encodings.SequenceEqual(newMultiEncoding.Encodings, new TypeEqualityComparer<IEncoding>())) return;
 

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -121 +121 @@
   <ItemGroup>
     <Compile Include="Algorithms\BasicAlgorithm.cs" />
-    <Compile Include="BasicProblems\Individuals\MultiSolution.cs" />
+    <Compile Include="BasicProblems\CombinedSolution.cs" />
     <Compile Include="BasicProblems\Interfaces\IMultiEncodingOperator.cs" />
     <Compile Include="BasicProblems\Interfaces\IMultiObjectiveProblem.cs" />
     <Compile Include="BasicProblems\Interfaces\ISingleObjectiveProblem.cs" />
-    <Compile Include="BasicProblems\MultiEncoding.cs" />
+    <Compile Include="BasicProblems\CombinedEncoding.cs" />
     <Compile Include="BasicProblems\Operators\MultiEncodingCreator.cs" />
     <Compile Include="BasicProblems\Operators\MultiEncodingCrossover.cs" />