Changeset 11363 for branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Datastructures/ParameterVector.cs

Timestamp:

09/15/14 10:23:34 (10 years ago)

Author:

abeham

Message:

#2174:

• Removed SimSharp reference (not the purpose of this branch anymore)
• Fixed bugs regarding parameter names when no parameter have been defined
• Added a method to the problem definition to retrieve a neighborhood solution
  • Programmable problem now works with LocalSearch and SimulatedAnnealing

File:

• branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Datastructures/ParameterVector.cs (modified) (7 diffs)

branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Datastructures/ParameterVector.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
@@ -28 +29 @@
 
 namespace HeuristicLab.Problems.Programmable {
-  public class ParameterVector {
-    protected Dictionary<string, BinaryVector> BinaryParameters;
-    protected Dictionary<string, IntegerVector> IntegerParameters;
-    protected Dictionary<string, RealVector> RealParameters;
-    protected Dictionary<string, Permutation> PermutationParameters;
+  public sealed class ParameterVector : IDeepCloneable {
+    private Dictionary<string, BinaryVector> BinaryParameters;
+    private Dictionary<string, IntegerVector> IntegerParameters;
+    private Dictionary<string, RealVector> RealParameters;
+    private Dictionary<string, Permutation> PermutationParameters;
 
     public ParameterVector(IEnumerable<KeyValuePair<string, BinaryVector>> binaryVectors = null,
@@ -42 +43 @@
       if (realVectors != null) RealParameters = realVectors.ToDictionary(x => x.Key, x => x.Value);
       if (permutations != null) PermutationParameters = permutations.ToDictionary(x => x.Key, x => x.Value);
+    }
+    private ParameterVector(ParameterVector original, Cloner cloner) {
+      cloner.RegisterClonedObject(original, this);
+      if (original.BinaryParameters != null) {
+        BinaryParameters = new Dictionary<string, BinaryVector>(original.BinaryParameters.Comparer);
+        foreach (var param in original.BinaryParameters)
+          BinaryParameters[param.Key] = cloner.Clone(param.Value);
+      }
+      if (original.IntegerParameters != null) {
+        IntegerParameters = new Dictionary<string, IntegerVector>(original.IntegerParameters.Comparer);
+        foreach (var param in original.IntegerParameters)
+          IntegerParameters[param.Key] = cloner.Clone(param.Value);
+      }
+      if (original.RealParameters != null) {
+        RealParameters = new Dictionary<string, RealVector>(original.RealParameters.Comparer);
+        foreach (var param in original.RealParameters)
+          RealParameters[param.Key] = cloner.Clone(param.Value);
+      }
+      if (original.PermutationParameters != null) {
+        PermutationParameters = new Dictionary<string, Permutation>(original.PermutationParameters.Comparer);
+        foreach (var param in original.PermutationParameters)
+          PermutationParameters[param.Key] = cloner.Clone(param.Value);
+      }
+    }
+
+    public object Clone() {
+      return Clone(new Cloner());
+    }
+
+    public IDeepCloneable Clone(Cloner cloner) {
+      return new ParameterVector(this, cloner);
     }
 
@@ -53 +85 @@
 
     public IEnumerable<string> BinaryNames {
-      get { return BinaryParameters.Keys; }
+      get { return BinaryParameters != null ? BinaryParameters.Keys : Enumerable.Empty<string>(); }
     }
 
@@ -65 +97 @@
 
     public IEnumerable<string> IntegerNames {
-      get { return IntegerParameters.Keys; }
+      get { return IntegerParameters != null ? IntegerParameters.Keys : Enumerable.Empty<string>(); }
     }
 
@@ -77 +109 @@
 
     public IEnumerable<string> RealNames {
-      get { return RealParameters.Keys; }
+      get { return RealParameters != null ? RealParameters.Keys : Enumerable.Empty<string>(); }
     }
 
@@ -85 +117 @@
 
     public IEnumerable<string> PermutationNames {
-      get { return PermutationParameters.Keys; }
+      get { return PermutationParameters != null ? PermutationParameters.Keys : Enumerable.Empty<string>(); }
     }
   }