Changeset 11582 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings

Timestamp:

11/25/14 13:05:14 (10 years ago)

Author:

mkommend

Message:

#2174: Configured solution creator in single encodings.

Location:

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

Files:

• BinaryEncoding.cs (modified) (2 diffs)
• Encoding.cs (modified) (2 diffs)
• IntegerEncoding.cs (modified) (3 diffs)
• PermutationEncoding.cs (modified) (2 diffs)
• RealEncoding.cs (modified) (2 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/BinaryEncoding.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -74 +73 @@
       : base(name) {
       lengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
+      RegisterParameterEvents();
+      DiscoverOperators();
+      SolutionCreator = Operators.OfType<RandomBinaryVectorCreator>().Single();
     }
 

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/Encoding.cs

@@ -49 +49 @@
 
 
-    ISolutionCreator IEncoding.DefaultSolutionCreator { get { return DefaultSolutionCreator; } }
-    public virtual T DefaultSolutionCreator {
-      get { return null; }
-    }
-
-
     ISolutionCreator IEncoding.SolutionCreator {
       get { return SolutionCreator; }
@@ -65 +59 @@
     public T SolutionCreator {
       get {
-        if (solutionCreator == null) return DefaultSolutionCreator;
         return solutionCreator;
       }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/IntegerEncoding.cs

@@ -87 +87 @@
       boundsParameter = cloner.Clone(original.boundsParameter);
       RegisterParameterEvents();
-      DiscoverOperators();
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new IntegerEncoding(this, cloner); }
@@ -102 +101 @@
       RegisterParameterEvents();
       DiscoverOperators();
+      SolutionCreator = Operators.OfType<UniformRandomIntegerVectorCreator>().Single();
     }
     public IntegerEncoding(string name, int length, IList<int> min, IList<int> max, IList<int> step = null)
@@ -118 +118 @@
       RegisterParameterEvents();
       DiscoverOperators();
+      SolutionCreator = Operators.OfType<UniformRandomIntegerVectorCreator>().Single();
     }
 

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/PermutationEncoding.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
@@ -96 +95 @@
       RegisterParameterEvents();
       DiscoverOperators();
+      SolutionCreator = Operators.OfType<RandomPermutationCreator>().Single();
     }
 

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/RealEncoding.cs

@@ -103 +103 @@
       RegisterParameterEvents();
       DiscoverOperators();
+      SolutionCreator = Operators.OfType<UniformRandomRealVectorCreator>().Single();
     }
 
@@ -120 +121 @@
       RegisterParameterEvents();
       DiscoverOperators();
+      SolutionCreator = Operators.OfType<UniformRandomRealVectorCreator>().Single();
     }