Changeset 11885 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals/Individual.cs

Timestamp:

02/04/15 13:28:37 (9 years ago)

Author:

abeham

Message:

#2174:

• Some refactorings and bug fixes
• Renamed (Binary|Integer|Real)Encoding to (Binary|Integer|Real)VectorEncoding
• Improved error messages when compiling programmable problems

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Individuals/Individual.cs (modified) (4 diffs)

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

@@ -43 +43 @@
 
     public Individual Copy() {
-      return Copy(new Scope());
+      return CopyToScope(new Scope());
     }
-    internal abstract Individual Copy(IScope scope);
+
+    public abstract Individual CopyToScope(IScope scope);
 
     protected static IItem ExtractScopeValue(string name, IScope scope) {
@@ -64 +65 @@
   public static class IndividualExtensionMethods {
     public static BinaryVector BinaryVector(this Individual individual) {
-      var encoding = individual.GetEncoding<BinaryEncoding>();
+      var encoding = individual.GetEncoding<BinaryVectorEncoding>();
       return individual.BinaryVector(encoding.Name);
     }
@@ -72 +73 @@
 
     public static IntegerVector IntegerVector(this Individual individual) {
-      var encoding = individual.GetEncoding<IntegerEncoding>();
+      var encoding = individual.GetEncoding<IntegerVectorEncoding>();
       return individual.IntegerVector(encoding.Name);
     }
@@ -88 +89 @@
 
     public static RealVector RealVector(this Individual individual) {
-      var encoding = individual.GetEncoding<RealEncoding>();
+      var encoding = individual.GetEncoding<RealVectorEncoding>();
       return individual.RealVector(encoding.Name);
     }