Changeset 13359 for branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Individuals

Timestamp:

11/24/15 15:24:12 (9 years ago)

Author:

abeham

Message:

#2521: worked on multi-encoding (it works again). Some issues are still present:

• The programmable template needs to be slightly updated for multi-encoding
• The encoding is recreated every time it is compiled making it impossible to configure operators

File:

• branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/MultiSolution.cs (modified) (4 diffs)

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/MultiSolution.cs

@@ -35 +35 @@
     protected IScope Scope { get; private set; }
 
-    private readonly Dictionary<string, ISolution> solutions;
-
     [StorableConstructor]
     private CombinedSolution(bool deserializing) : base(deserializing) { }
@@ -44 +42 @@
       Encoding = cloner.Clone(original.Encoding);
       Scope = cloner.Clone(original.Scope);
-      solutions = original.solutions.ToDictionary(x => x.Key, x => cloner.Clone(x.Value));
     }
     public CombinedSolution(IScope scope, MultiEncoding encoding) {
       Encoding = encoding;
       Scope = scope;
-      solutions = encoding.Encodings.Select(e => new { Name = e.Name, Solution = ScopeUtil.GetSolution(scope, e) })
-                                    .ToDictionary(x => x.Name, x => x.Solution);
     }
 
@@ -58 +53 @@
 
     public ISolution this[string name] {
-      get {
-        ISolution result;
-        if (!solutions.TryGetValue(name, out result)) throw new ArgumentException(string.Format("{0} is not part of the specified encoding.", name));
-        return result;
-      }
-      set {
-        if (!solutions.ContainsKey(name)) throw new ArgumentException(string.Format("{0} is not part of the specified encoding.", name));
-        solutions[name] = value;
-      }
+      get { return ScopeUtil.GetSolution(Scope, name); }
+      set { ScopeUtil.CopySolutionToScope(Scope, name, value); }
     }
 
@@ -80 +68 @@
     }
 
-    public TSolution GetSolution<TSolution>() where TSolution : class, ISolution {
-      TSolution solution;
-      try {
-        solution = (TSolution)solutions.SingleOrDefault(s => s.Value is TSolution).Value;
-      } catch (InvalidOperationException) {
-        throw new InvalidOperationException(string.Format("The solution uses multiple {0} .", typeof(TSolution).GetPrettyName()));
-      }
-      if (solution == null) throw new InvalidOperationException(string.Format("The solution does not use a {0}.", typeof(TSolution).GetPrettyName()));
-      return solution;
+    public TSolution GetSolution<TSolution>(string name) where TSolution : class, ISolution {
+      return (TSolution)ScopeUtil.GetSolution(Scope, name);
     }
   }