Changeset 11593 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/PermutationEncoding.cs

Timestamp:

11/27/14 10:41:15 (9 years ago)

Author:

mkommend

Message:

#2174: Fixed addition of parameters in the encodings and set default values for encoding operators in MultiEncodingOperator.

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/PermutationEncoding.cs (modified) (2 diffs)

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

@@ -95 +95 @@
     public PermutationEncoding(string name, int length, PermutationTypes type)
       : base(name) {
-      LengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
-      PermutationTypeParameter = new FixedValueParameter<PermutationType>(Name + "Type", new PermutationType(type));
+      lengthParameter = new FixedValueParameter<IntValue>(Name + ".Length", new IntValue(length));
+      permutationTypeParameter = new FixedValueParameter<PermutationType>(Name + ".Type", new PermutationType(type));
+      Parameters.Add(lengthParameter);
+      Parameters.Add(permutationTypeParameter);
 
       SolutionCreator = new RandomPermutationCreator();
@@ -194 +196 @@
     private void ConfigureInversionMoveOperators(IEnumerable<IPermutationInversionMoveOperator> inversionMoveOperators) {
       foreach (var inversionMoveOperator in inversionMoveOperators) {
-        inversionMoveOperator.InversionMoveParameter.ActualName = Name + "_InversionMove";
+        inversionMoveOperator.InversionMoveParameter.ActualName = Name + ".InversionMove";
       }
     }
     private void ConfigureScrambleMoveOperators(IEnumerable<IPermutationScrambleMoveOperator> scrambleMoveOperators) {
       foreach (var scrambleMoveOperator in scrambleMoveOperators) {
-        scrambleMoveOperator.ScrambleMoveParameter.ActualName = Name + "_ScambleMove";
+        scrambleMoveOperator.ScrambleMoveParameter.ActualName = Name + ".ScambleMove";
       }
     }
     private void ConfigureSwap2MoveOperators(IEnumerable<IPermutationSwap2MoveOperator> swap2MoveOperators) {
       foreach (var swap2MoveOperator in swap2MoveOperators) {
-        swap2MoveOperator.Swap2MoveParameter.ActualName = Name + "_Swap2Move";
+        swap2MoveOperator.Swap2MoveParameter.ActualName = Name + ".Swap2Move";
       }
     }
     private void ConfigureTranslocationMoveOperators(IEnumerable<IPermutationTranslocationMoveOperator> translocationMoveOperators) {
       foreach (var translocationMoveOperator in translocationMoveOperators) {
-        translocationMoveOperator.TranslocationMoveParameter.ActualName = Name + "_TranslocationMove";
+        translocationMoveOperator.TranslocationMoveParameter.ActualName = Name + ".TranslocationMove";
       }
     }