Changeset 14133 for stable/HeuristicLab.Optimization

Timestamp:

07/20/16 18:02:08 (8 years ago)

Author:

mkommend

Message:

#2281: Merged r14037,r14056,r14057,r14071, r14100 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/Interfaces/IResult.cs (deleted)
• HeuristicLab.Optimization/3.3/Result.cs (deleted)
• HeuristicLab.Optimization/3.3/ResultCollection.cs (deleted)
• HeuristicLab.Optimization/3.3/Results (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Results)
• HeuristicLab.Optimization/3.3/Results/ResultParameter.cs (modified) (5 diffs)

stable/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -155 +155 @@
     <Compile Include="Interfaces\ILocalImprovementAlgorithmOperator.cs" />
     <Compile Include="Interfaces\IMultiObjectiveOperator.cs" />
+    <Compile Include="Results\IResultParameter.cs" />
     <Compile Include="Interfaces\ISingleObjectiveOperator.cs" />
     <Compile Include="Interfaces\ISingleObjectivePathRelinker.cs" />
@@ -168 +169 @@
     <Compile Include="MetaOptimizers\Experiment.cs" />
     <Compile Include="MetaOptimizers\TimeLimitRun.cs" />
+    <Compile Include="Results\ResultParameter.cs" />
     <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
     <Compile Include="Plugin.cs" />
@@ -229 +231 @@
     <Compile Include="RunCollection.cs" />
     <Compile Include="Run.cs" />
-    <Compile Include="Interfaces\IResult.cs" />
+    <Compile Include="Results\IResult.cs" />
     <Compile Include="Interfaces\IDiscreteDoubleValueModifier.cs" />
     <Compile Include="Interfaces\IExhaustiveMoveGenerator.cs" />
@@ -253 +255 @@
     <Compile Include="Interfaces\ITabuChecker.cs" />
     <Compile Include="Interfaces\ITabuMaker.cs" />
-    <Compile Include="Result.cs" />
+    <Compile Include="Results\Result.cs" />
     <Compile Include="Algorithms\UserDefinedAlgorithm.cs" />
     <Compile Include="Algorithms\EngineAlgorithm.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ResultCollection.cs" />
+    <Compile Include="Results\ResultCollection.cs" />
     <Compile Include="Problems\UserDefinedProblem.cs" />
   </ItemGroup>

stable/HeuristicLab.Optimization/3.3/Results/ResultParameter.cs

@@ -33 +33 @@
   public sealed class ResultParameter<T> : LookupParameter<T>, IResultParameter<T> where T : class, IItem {
     public override Image ItemImage { get { return VSImageLibrary.Exception; } }
+    public override bool CanChangeDescription { get { return true; } }
 
     [Storable]
@@ -71 +72 @@
     }
     public ResultParameter() : this("Anonymous", string.Empty, "Results") { }
-    public ResultParameter(string name) : this(name, string.Empty, "Results") { }
     public ResultParameter(string name, string description) : this(name, description, "Results") { }
+
     public ResultParameter(string name, string description, string resultCollectionName)
       : base(name, description, string.Empty) {
       if (string.IsNullOrEmpty(resultCollectionName)) throw new ArgumentException("resultCollectionName");
       this.resultCollectionName = resultCollectionName;
+      Hidden = false;
     }
     public ResultParameter(string name, string description, string resultCollectionName, T defaultValue)
@@ -84 +86 @@
       this.resultCollectionName = resultCollectionName;
       this.defaultValue = defaultValue;
+      Hidden = false;
     }
 
@@ -102 +105 @@
       if (!results.TryGetValue(ActualName, out result)) {
         if (DefaultValue == null) throw new InvalidOperationException("ResultParameter (" + ActualName + "): Result not found and no default value specified.");
-        result = new Result(ActualName, (T)DefaultValue.Clone());
+        result = ItemDescription == Description ? new Result(ActualName, (T)DefaultValue.Clone()) : new Result(ActualName, Description, (T)DefaultValue.Clone());
         results.Add(result);
       }
@@ -127 +130 @@
       IResult result;
       if (!results.TryGetValue(ActualName, out result)) {
-        result = new Result(ActualName, value);
+        result = ItemDescription == Description ? new Result(ActualName, value) : new Result(ActualName, Description, value);
         results.Add(result);
       } else result.Value = value;