Changeset 11575 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

Timestamp:

11/24/14 17:08:24 (9 years ago)

Author:

mkommend

Message:

#2174: Adapted permutation encoding.

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs (modified) (3 diffs)

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

@@ -205 +205 @@
       if (intEnc != null) {
         DynamicEncodingParameters.AddRange(intEnc.Parameters);
-        return intEnc.DefaultSolutionCreator;
+        return intEnc.SolutionCreator;
+      }
+      #endregion
+      #region Configure Permutation Creator
+      var permEnc = encoding as PermutationEncoding;
+      if (permEnc != null) {
+        DynamicEncodingParameters.AddRange(permEnc.Parameters);
+        return permEnc.SolutionCreator;
       }
       #endregion
@@ -219 +226 @@
       }
       #endregion
-      #region Configure Permutation Creator
-      var permEnc = encoding as PermutationEncoding;
-      if (permEnc != null) {
-        var l = new ValueParameter<IntValue>(permEnc.Name + "Length", permEnc.Length);
-        DynamicEncodingParameters.Add(l);
-
-        var creator = new RandomPermutationCreator();
-        creator.PermutationParameter.ActualName = permEnc.Name;
-        creator.LengthParameter.ActualName = l.Name;
-        creator.PermutationTypeParameter.Value = permEnc.Type;
-        return creator;
-      }
-      #endregion
       throw new ArgumentException(string.Format("Encoding {0} is unknown.", encoding != null ? encoding.GetType().FullName : "(null)"));
     }
 
-
-    private IEnumerable<IOperator> GetDiscoveredOperators<T>() where T : class,IOperator {
-      return ApplicationManager.Manager.GetInstances<T>()
-          .Except(Operators.OfType<T>(), new TypeEqualityComparer<T>());
-    }
     protected virtual void ConfigureSingleEncodingOperators(ISolutionCreator newCreator, IEncoding encoding) {
       // remove all multiencoding operators
@@ -283 +272 @@
       #endregion
       #region Configure Operators for PermutationEncoding
-      var permCreator = newCreator as IPermutationCreator;
-      if (permCreator != null) {
-        var paramName = permCreator.PermutationParameter.ActualName;
+      var permEncoding = encoding as PermutationEncoding;
+      if (permEncoding != null) {
         // do not replace a permutation creator that was manually set
         if (!(SolutionCreator is IPermutationCreator)
-            || ((IPermutationCreator)SolutionCreator).PermutationParameter.ActualName != permCreator.PermutationParameter.ActualName) {
+            || ((IPermutationCreator)SolutionCreator).PermutationParameter.ActualName != permEncoding.Name) {
           Operators.Remove(SolutionCreator);
           SolutionCreator = newCreator;
-          Operators.Add(SolutionCreator);
-        }
-
-        #region Wire Permutation Crossovers
-        var crossovers = Operators.OfType<IPermutationCrossover>()
-          .Union(ApplicationManager.Manager.GetInstances<IPermutationCrossover>(), new TypeEqualityComparer<IPermutationCrossover>())
-          .ToList();
-        foreach (var xo in crossovers) {
-          xo.ChildParameter.ActualName = permCreator.PermutationParameter.ActualName;
-          xo.ChildParameter.Hidden = true;
-          xo.ParentsParameter.ActualName = permCreator.PermutationParameter.ActualName;
-          xo.ParentsParameter.Hidden = true;
-        }
-        Operators.AddRange(crossovers.Except(Operators.OfType<IPermutationCrossover>()));
-        #endregion
-        #region Wire Permutation Manipulators
-        var manipulators = Operators.OfType<IPermutationManipulator>()
-          .Union(ApplicationManager.Manager.GetInstances<IPermutationManipulator>(), new TypeEqualityComparer<IPermutationManipulator>())
-          .ToList();
-        foreach (var m in manipulators) {
-          m.PermutationParameter.ActualName = permCreator.PermutationParameter.ActualName;
-          m.PermutationParameter.Hidden = true;
-        }
-        Operators.AddRange(manipulators.Except(Operators.OfType<IPermutationManipulator>()));
-        #endregion
-        #region Wire Permutation ShakingOperators
-        var shakingOperators = Operators.OfType<IPermutationMultiNeighborhoodShakingOperator>()
-          .Union(ApplicationManager.Manager.GetInstances<IPermutationMultiNeighborhoodShakingOperator>(), new TypeEqualityComparer<IPermutationMultiNeighborhoodShakingOperator>())
-          .ToList();
-        foreach (var op in shakingOperators) {
-          op.PermutationParameter.ActualName = paramName;
-          op.PermutationParameter.Hidden = true;
-        }
-        Operators.AddRange(shakingOperators.Except(Operators.OfType<IPermutationMultiNeighborhoodShakingOperator>()));
-        #endregion
+        }
       } else {
         Operators.RemoveAll(x => x is IPermutationCrossover