Changeset 5357 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding

Timestamp:

01/23/11 12:47:33 (14 years ago)

Author:

cneumuel

Message:

#1215

• changed ordering of parameter combinations to make them better readable
• changed handling of invalid parameter settings from penalty approach to repair approach

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding

Files:

• ParameterCombinationsEnumerator.cs (modified) (1 diff)
• ValueConfigurations/ValueConfiguration.cs (modified) (2 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterCombinationsEnumerator.cs

@@ -109 +109 @@
             }
           }
+          enumerators.Reverse(); // this makes the list of combinations better readable
         }
       }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/ValueConfiguration.cs

@@ -214 +214 @@
       get {
         StringBuilder sb = new StringBuilder();
-        if (this.Optimize) {
-          if (this.ParameterConfigurations.Count > 0) {
-            var parameterInfos = new List<string>();
-            foreach (var pc in this.ParameterConfigurations) {
-              if (pc.Optimize) parameterInfos.Add(pc.ParameterInfoString);
-            }
-            sb.Append(string.Join(", ", parameterInfos.ToArray()));
-          }
+        if (this.Optimize && this.ParameterConfigurations.Count > 0) {
+          var parameterInfos = new List<string>();
+          foreach (var pc in this.ParameterConfigurations) {
+            if (pc.Optimize) parameterInfos.Add(pc.ParameterInfoString);
+          }
+          sb.Append(string.Join(", ", parameterInfos.ToArray()));
         }
         return sb.ToString();
@@ -273 +271 @@
       var list = new List<IOptimizable>();
       foreach (var pc in ParameterConfigurations) {
-        if(pc.Optimize) {
-          if(pc.ValueConfigurations.CheckedItems.Count() > 1) list.Add(pc); // only add if there are more than 1 choices. otherwise it makes no sense to optimize which VC is selected
+        if (pc.Optimize) {
+          if (pc.ValueConfigurations.CheckedItems.Count() > 1) list.Add(pc); // only add if there are more than 1 choices. otherwise it makes no sense to optimize which VC is selected
           list.AddRange(pc.GetAllOptimizables());
         }