Changeset 15171 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurationTree.cs

Timestamp:

07/08/17 12:31:54 (7 years ago)

Author:

jkarder

Message:

#1853: worked on ParameterConfigurationEncoding

• updated to .NET 4.5
• replaced CreateExperimentDialogV2 with CreateExperimentView
• improved experiment generation
• fixed plugin dependencies and cleaned project references

Location:

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3

Files:

• . (modified) (1 prop)
• ParameterConfigurationTree.cs (modified) (3 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurationTree.cs

@@ -25 +25 @@
 using System.Linq;
 using System.Text;
-using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -31 +30 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Encodings.ParameterConfigurationEncoding {
@@ -340 +338 @@
         string algorithmInfo = this.AlgorithmConfiguration.ParameterInfoString;
         string problemInfo = this.ProblemConfiguration.ParameterInfoString;
-        var sb = new StringBuilder();
-        if (!string.IsNullOrEmpty(algorithmInfo)) {
-          sb.Append("Algorithm (");
-          sb.Append(algorithmInfo);
-          sb.Append(")");
-        }
-        if (!string.IsNullOrEmpty(problemInfo)) {
-          if (sb.Length > 0)
-            sb.Append(", ");
-          sb.Append("Problem( ");
-          sb.Append(problemInfo);
-          sb.Append(")");
-        }
+
+        var sb = new StringBuilder(AlgorithmConfiguration.NumberedName);
+        if (!string.IsNullOrEmpty(algorithmInfo)) sb.AppendFormat(" ({0})", algorithmInfo);
+        if (!string.IsNullOrEmpty(problemInfo)) sb.AppendFormat(", {0} ({1})", ProblemConfiguration.NumberedName, problemInfo);
+
         return sb.ToString();
       }