Changeset 11593 for branches

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.

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3

Files:

• Encodings/BinaryEncoding.cs (modified) (1 diff)
• Encodings/IntegerEncoding.cs (modified) (2 diffs)
• Encodings/PermutationEncoding.cs (modified) (2 diffs)
• Encodings/RealEncoding.cs (modified) (6 diffs)
• Operators/MultiEncodingOperator.cs (modified) (1 diff)

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

@@ -72 +72 @@
     public BinaryEncoding(string name, int length)
       : base(name) {
-      LengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
+      lengthParameter = new FixedValueParameter<IntValue>(Name + ".Length", new IntValue(length));
+      Parameters.Add(lengthParameter);
+
       SolutionCreator = new RandomBinaryVectorCreator();
       RegisterParameterEvents();

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

@@ -102 +102 @@
       if (step.HasValue) bounds[0, 2] = step.Value;
 
-      LengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
-      BoundsParameter = new ValueParameter<IntMatrix>(Name + "Bounds", bounds);
+      lengthParameter = new FixedValueParameter<IntValue>(Name + ".Length", new IntValue(length));
+      boundsParameter = new ValueParameter<IntMatrix>(Name + ".Bounds", bounds);
+      Parameters.Add(lengthParameter);
+      Parameters.Add(boundsParameter);
 
       SolutionCreator = new UniformRandomIntegerVectorCreator();
@@ -123 +125 @@
       }
 
-      LengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
-      BoundsParameter = new ValueParameter<IntMatrix>(Name + "Bounds", bounds);
+      LengthParameter = new FixedValueParameter<IntValue>(Name + ".Length", new IntValue(length));
+      BoundsParameter = new ValueParameter<IntMatrix>(Name + ".Bounds", bounds);
 
       SolutionCreator = new UniformRandomIntegerVectorCreator();

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";
       }
     }

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

@@ -100 +100 @@
       bounds[0, 1] = max;
 
-      LengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
-      BoundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
+      lengthParameter = new FixedValueParameter<IntValue>(Name + ".Length", new IntValue(length));
+      boundsParameter = new ValueParameter<DoubleMatrix>(Name + ".Bounds", bounds);
+      Parameters.Add(lengthParameter);
+      Parameters.Add(boundsParameter);
 
       SolutionCreator = new UniformRandomRealVectorCreator();
@@ -119 +121 @@
         bounds[i, 1] = max[i];
       }
-      LengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
-      BoundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
+      LengthParameter = new FixedValueParameter<IntValue>(Name + ".Length", new IntValue(length));
+      BoundsParameter = new ValueParameter<DoubleMatrix>(Name + ".Bounds", bounds);
 
       SolutionCreator = new UniformRandomRealVectorCreator();
@@ -228 +230 @@
           var p = sm.StrategyParameterParameter as ILookupParameter;
           if (p != null) {
-            p.ActualName = Name + "Strategy";
+            p.ActualName = Name + ".Strategy";
           }
         }
@@ -244 +246 @@
           c.BoundsParameter.Value = (DoubleMatrix)bounds.Clone();
           c.LengthParameter.ActualName = LengthParameter.Name;
-          c.StrategyParameterParameter.ActualName = Name + "Strategy";
+          c.StrategyParameterParameter.ActualName = Name + ".Strategy";
         }
         var m = s as IRealVectorStdDevStrategyParameterManipulator;
         if (m != null) {
           m.BoundsParameter.Value = (DoubleMatrix)bounds.Clone();
-          m.StrategyParameterParameter.ActualName = Name + "Strategy";
+          m.StrategyParameterParameter.ActualName = Name + ".Strategy";
         }
         var mm = s as StdDevStrategyVectorManipulator;
@@ -258 +260 @@
         var x = s as IRealVectorStdDevStrategyParameterCrossover;
         if (x != null) {
-          x.ParentsParameter.ActualName = Name + "Strategy";
-          x.StrategyParameterParameter.ActualName = Name + "Strategy";
+          x.ParentsParameter.ActualName = Name + ".Strategy";
+          x.StrategyParameterParameter.ActualName = Name + ".Strategy";
         }
       }
@@ -304 +306 @@
     private void ConfigureAdditiveMoveOperator(IEnumerable<IAdditiveRealVectorMoveOperator> additiveMoveOperators) {
       foreach (var additiveMoveOperator in additiveMoveOperators) {
-        additiveMoveOperator.AdditiveMoveParameter.ActualName = Name + "_AdditiveMove";
+        additiveMoveOperator.AdditiveMoveParameter.ActualName = Name + ".AdditiveMove";
       }
     }

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/MultiEncodingOperator.cs

@@ -45 +45 @@
       if (Parameters.ContainsKey(encoding.Name)) throw new ArgumentException(string.Format("Encoding {0} was already added.", encoding.Name));
       var param = new ConstrainedValueParameter<T>(encoding.Name, new ItemSet<T>(encoding.Operators.OfType<T>()));
-
+      param.Value = param.ValidValues.First();
       Parameters.Add(param);
     }