Changeset 13792

Timestamp:

04/25/16 13:00:00 (8 years ago)

Author:

abeham

Message:

#2457: merged changes from trunk

Location:

branches/PerformanceComparison

Files:

• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis.Views (modified) (1 prop)
• HeuristicLab.Encodings.PermutationEncoding (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization.Views (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTableView.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Termination/ExecutionTimeTerminator.cs (modified) (1 diff)

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

@@ -133 +133 @@
         Invoke(new EventHandler(Content_ProblemChanged), sender, e);
       else {
-        problemViewHost.ViewType = null;
+        if (problemViewHost.Content != null && Content.Problem != null &&
+          problemViewHost.Content.GetType() != Content.Problem.GetType())
+          problemViewHost.ViewType = null;
         problemViewHost.Content = Content.Problem;
       }

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTableView.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Core;
-using HeuristicLab.Data.Views;
-using HeuristicLab.MainForm;
 using System;
 using System.Collections.Generic;
@@ -28 +25 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Core;
+using HeuristicLab.Data.Views;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Optimization.Views {

branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Termination/ExecutionTimeTerminator.cs

@@ -38 +38 @@
     protected ExecutionTimeTerminator(ExecutionTimeTerminator original, Cloner cloner)
       : base(original, cloner) {
-      executable = cloner.Clone(executable);
+      executable = cloner.Clone(original.executable);
     }
     public override IDeepCloneable Clone(Cloner cloner) {