Changeset 11619 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals

Timestamp:

12/02/14 11:44:18 (9 years ago)

Author:

mkommend

Message:

#2174: Refactored individuals.

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals

Files:

• . (added)
• Individual.cs (moved) (moved from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/Individual.cs) (2 diffs)
• MultiEncodingIndividual.cs (moved) (moved from branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/MultiEncodingIndividual.cs) (2 diffs)
• SingleEncodingIndividual.cs (added)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals/Individual.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
@@ -29 +26 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.Programmable {
-  [StorableClass]
-  public class Individual : Item {
-    [Storable]
+  public abstract class Individual {
     public IEncoding Encoding { get; private set; }
-    [Storable]
     protected IScope Scope { get; private set; }
 
-    public Individual(IEncoding encoding, IScope scope) {
+    public string Name { get { return Encoding.Name; } }
+
+    protected Individual(IEncoding encoding, IScope scope) {
       Encoding = encoding;
       Scope = scope;
     }
 
-    [StorableConstructor]
-    protected Individual(bool deserializing) : base(deserializing) { }
+    public abstract IItem this[string name] { get; set; }
 
-    public override IDeepCloneable Clone(Cloner cloner) { return new Individual(this, cloner); }
-    protected Individual(Individual original, Cloner cloner)
-      : base(original, cloner) {
-      Encoding = cloner.Clone(original.Encoding);
-      Scope = cloner.Clone(original.Scope);
+    public Individual Copy() {
+      return Copy(new Scope());
     }
+    internal abstract Individual Copy(IScope scope);
 
-    public virtual IItem this[string name] {
-      get { return ExtractScopeValue(name, Encoding.Name, Scope); }
-      set { SetScopeValue(name, Encoding.Name, Scope, value); }
-    }
-
-    internal virtual Individual Copy(IScope scope) {
-      var individual = Encoding.CreateIndividual(scope);
-      individual[Encoding.Name] = this[Encoding.Name];
-      return individual;
-    }
-
-    protected static IItem ExtractScopeValue(string name, string encodingName, IScope scope) {
-      if (name != encodingName) throw new ArgumentException(string.Format("{0} is not part of the specified encoding.", name));
-      if (!scope.Variables.ContainsKey(name)) throw new ArgumentException(string.Format("Encoding part {0} cannot be found in the provided scope.", name));
+    protected static IItem ExtractScopeValue(string name, IScope scope) {
+      if (!scope.Variables.ContainsKey(name)) throw new ArgumentException(string.Format(" {0} cannot be found in the provided scope.", name));
       var value = scope.Variables[name].Value;
-      if (value == null) throw new ArgumentException(string.Format("Encoding part {0} is null.", name));
+      if (value == null) throw new InvalidOperationException(string.Format("Value of {0} is null.", name));
       return value;
     }
 
-    protected static void SetScopeValue(string name, string encodingName, IScope scope, IItem value) {
-      if (name != encodingName) throw new ArgumentException(string.Format("{0} is not part of the specified encoding.", name));
+    protected static void SetScopeValue(string name, IScope scope, IItem value) {
       if (value == null) throw new ArgumentNullException("value");
-
       if (!scope.Variables.ContainsKey(name)) scope.Variables.Add(new Variable(name, value));
       else scope.Variables[name].Value = value;
-      var variable = scope.Variables[name];
     }
   }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals/MultiEncodingIndividual.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable.Encodings {
+namespace HeuristicLab.Problems.Programmable {
   public sealed class MultiEncodingIndividual : Individual {
     public new MultiEncoding Encoding {
@@ -34 +31 @@
     }
 
-    public MultiEncodingIndividual(IEncoding encoding, IScope scope)
+    private readonly IEnumerable<Individual> individuals;
+    public MultiEncodingIndividual(MultiEncoding encoding, IScope scope)
       : base(encoding, scope) {
-      if (encoding.GetType() != typeof(MultiEncoding))
-        throw new ArgumentException("Encoding must be of type MultiEncoding.k");
+      individuals = encoding.Encodings.Select(e => e.GetIndividual(scope)).ToArray();
     }
 
-    [StorableConstructor]
-    private MultiEncodingIndividual(bool deserializing) : base(deserializing) { }
+    private MultiEncodingIndividual(MultiEncoding encoding, IScope scope, IEnumerable<Individual> individuals)
+      : base(encoding, scope) {
+      this.individuals = individuals;
+    }
 
-    public override IDeepCloneable Clone(Cloner cloner) { return new MultiEncodingIndividual(this, cloner); }
-    private MultiEncodingIndividual(Individual original, Cloner cloner) : base(original, cloner) { }
 
     public override IItem this[string name] {
       get {
-        var encoding = Encoding.Encodings.FirstOrDefault(e => e.Name == name);
-        if (encoding == null) throw new ArgumentException(string.Format("{0} is not part of the specified encoding.", name));
-        return ExtractScopeValue(name, encoding.Name, Scope);
+        var individual = individuals.FirstOrDefault(i => i.Name == name);
+        if (individual == null) throw new ArgumentException(string.Format("{0} is not part of the specified encoding.", name));
+        return individual[name];
       }
       set {
-        var encoding = Encoding.Encodings.FirstOrDefault(e => e.Name == name);
-        if (encoding == null) throw new ArgumentException(string.Format("{0} is not part of the specified encoding.", name));
-        SetScopeValue(name, encoding.Name, Scope, value);
+        var individual = individuals.FirstOrDefault(i => i.Name == name);
+        if (individual == null) throw new ArgumentException(string.Format("{0} is not part of the specified encoding.", name));
+        individual[name] = value;
       }
     }
 
     internal override Individual Copy(IScope scope) {
-      var individual = Encoding.CreateIndividual(scope);
-      foreach (var encoding in Encoding.Encodings)
-        individual[encoding.Name] = this[encoding.Name];
-      return individual;
+      var copies = individuals.Select(i => i.Copy(scope)).ToArray();
+      return new MultiEncodingIndividual(Encoding, scope, copies);
     }
   }