Changeset 11582 for branches

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

Files:

• Encodings/BinaryEncoding.cs (modified) (2 diffs)
• Encodings/Encoding.cs (modified) (2 diffs)
• Encodings/IntegerEncoding.cs (modified) (3 diffs)
• Encodings/PermutationEncoding.cs (modified) (2 diffs)
• Encodings/RealEncoding.cs (modified) (2 diffs)
• Interfaces/IEncoding.cs (modified) (2 diffs)
• MultiObjectiveProgrammableProblem.cs (modified) (2 diffs)
• SingleObjectiveProgrammableProblem.cs (modified) (3 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();
     }
 

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Interfaces/IEncoding.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.Programmable {
-  public interface IEncoding : INamedItem
-  {
-    
-    ISolutionCreator DefaultSolutionCreator { get; }
+  public interface IEncoding : INamedItem {
     ISolutionCreator SolutionCreator { get; set; }
-
 
     IEnumerable<IValueParameter> Parameters { get; }
@@ -41 +33 @@
 
     void ConfigureOperator(IOperator @operator);
-    void ConfigureOperators(IEnumerable<IOperator> operators);    
+    void ConfigureOperators(IEnumerable<IOperator> operators);
   }
 }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

@@ -176 +176 @@
 
     protected virtual ISolutionCreator ConfigureCreator(IEncoding encoding) {
-      #region Configure RealVector Creator
-      var realEnc = encoding as RealEncoding;
-      if (realEnc != null) {
-        DynamicEncodingParameters.AddRange(realEnc.Parameters);
-        return realEnc.DefaultSolutionCreator;
-      }
-      #endregion
-      #region Configure BinaryVector Creator
-      var binEnc = encoding as BinaryEncoding;
-      if (binEnc != null) {
-        DynamicEncodingParameters.AddRange(binEnc.Parameters);
-        return binEnc.DefaultSolutionCreator;
-      }
-      #endregion
-      #region Configure IntegerVector Creator
-      var intEnc = encoding as IntegerEncoding;
-      if (intEnc != null) {
-        DynamicEncodingParameters.AddRange(intEnc.Parameters);
-        return intEnc.DefaultSolutionCreator;
-      }
-      #endregion
       #region Configure MultiEncoding Creator
       var multiEncoding = encoding as MultiEncoding;
@@ -208 +187 @@
       }
       #endregion
+      #region Configure RealVector Creator
+      var realEnc = encoding as RealEncoding;
+      if (realEnc != null) {
+        DynamicEncodingParameters.AddRange(realEnc.Parameters);
+        return realEnc.SolutionCreator;
+      }
+      #endregion
+      #region Configure BinaryVector Creator
+      var binEnc = encoding as BinaryEncoding;
+      if (binEnc != null) {
+        DynamicEncodingParameters.AddRange(binEnc.Parameters);
+        return binEnc.SolutionCreator;
+      }
+      #endregion
+      #region Configure IntegerVector Creator
+      var intEnc = encoding as IntegerEncoding;
+      if (intEnc != null) {
+        DynamicEncodingParameters.AddRange(intEnc.Parameters);
+        return intEnc.SolutionCreator;
+      }
+      #endregion
       #region Configure Permutation Creator
       var permEnc = encoding as PermutationEncoding;
       if (permEnc != null) {
-        var l = new ValueParameter<IntValue>(permEnc.Name + "Length", new IntValue(permEnc.Length));
-        DynamicEncodingParameters.Add(l);
-
-        var creator = new RandomPermutationCreator();
-        creator.PermutationParameter.ActualName = permEnc.Name;
-        creator.LengthParameter.ActualName = l.Name;
-        creator.PermutationTypeParameter.Value = new PermutationType(permEnc.Type);
-        return creator;
+        DynamicEncodingParameters.AddRange(permEnc.Parameters);
+        return permEnc.SolutionCreator;
       }
       #endregion
+
+
       throw new ArgumentException(string.Format("Encoding {0} is unknown.", encoding != null ? encoding.GetType().FullName : "(null)"));
     }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -35 +35 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.Programmable {
@@ -187 +186 @@
 
     protected virtual ISolutionCreator ConfigureCreator(IEncoding encoding) {
-      #region Configure RealVector Creator
-      var realEnc = encoding as RealEncoding;
-      if (realEnc != null) {
-        DynamicEncodingParameters.AddRange(realEnc.Parameters);
-        return realEnc.DefaultSolutionCreator;
-      }
-      #endregion
-      #region Configure BinaryVector Creator
-      var binEnc = encoding as BinaryEncoding;
-      if (binEnc != null) {
-        DynamicEncodingParameters.AddRange(binEnc.Parameters);
-        return binEnc.DefaultSolutionCreator;
-      }
-      #endregion
-      #region Configure IntegerVector Creator
-      var intEnc = encoding as IntegerEncoding;
-      if (intEnc != null) {
-        DynamicEncodingParameters.AddRange(intEnc.Parameters);
-        return intEnc.SolutionCreator;
-      }
-      #endregion
-      #region Configure Permutation Creator
-      var permEnc = encoding as PermutationEncoding;
-      if (permEnc != null) {
-        DynamicEncodingParameters.AddRange(permEnc.Parameters);
-        return permEnc.SolutionCreator;
-      }
-      #endregion
       #region Configure MultiEncoding Creator
       var multiEncoding = encoding as MultiEncoding;
@@ -224 +195 @@
         }
         return creator;
+      }
+      #endregion
+
+      #region Configure RealVector Creator
+      var realEnc = encoding as RealEncoding;
+      if (realEnc != null) {
+        DynamicEncodingParameters.AddRange(realEnc.Parameters);
+        return realEnc.SolutionCreator;
+      }
+      #endregion
+      #region Configure BinaryVector Creator
+      var binEnc = encoding as BinaryEncoding;
+      if (binEnc != null) {
+        DynamicEncodingParameters.AddRange(binEnc.Parameters);
+        return binEnc.SolutionCreator;
+      }
+      #endregion
+      #region Configure IntegerVector Creator
+      var intEnc = encoding as IntegerEncoding;
+      if (intEnc != null) {
+        DynamicEncodingParameters.AddRange(intEnc.Parameters);
+        return intEnc.SolutionCreator;
+      }
+      #endregion
+      #region Configure Permutation Creator
+      var permEnc = encoding as PermutationEncoding;
+      if (permEnc != null) {
+        DynamicEncodingParameters.AddRange(permEnc.Parameters);
+        return permEnc.SolutionCreator;
       }
       #endregion