Changeset 13475

Timestamp:

12/16/15 17:04:35 (9 years ago)

Author:

abeham

Message:

#2457, #2431: updated from trunk, worked on okb connection for downloading knowledge base

Location:

branches/PerformanceComparison

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis.Views (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Analysis/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/PopulationSimilarityAnalyzer.cs (modified) (5 diffs)
• HeuristicLab.Analysis/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization.Views (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Optimization.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionChartAggregationView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionIteratedSamplingView.Designer.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionIteratedSamplingView.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionIteratedSamplingView.resx (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTableView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/ThresholdTerminatorView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/ThresholdTerminatorView.Designer.cs)
• HeuristicLab.Optimization.Views/3.3/ThresholdTerminatorView.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/ThresholdTerminatorView.cs)
• HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/Interfaces/ISolutionSimilarityCalculator.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ITerminationBasedOperator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ITerminationBasedOperator.cs)
• HeuristicLab.Optimization/3.3/Interfaces/ITerminator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ITerminator.cs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs (modified) (5 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/Termination (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Termination)
• HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.Designer.cs (modified) (17 diffs)
• HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.cs (modified) (7 diffs)
• HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.resx (added)
• HeuristicLab.OptimizationExpertSystem.Views/3.3/HeuristicLab.OptimizationExpertSystem.Views-3.3.csproj (modified) (4 diffs)
• HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystem.cs (modified) (3 diffs)

branches/PerformanceComparison

@@ -2 +2 @@
 *.suo
 *.user
+.git
+.gitignore

@@ -2 +2 @@
 *.suo
 *.user
+.git
+.gitignore

branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/Plugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Analysis.Views plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Analysis.Views", "3.3.12.$WCREV$")]
+  [Plugin("HeuristicLab.Analysis.Views", "3.3.13.$WCREV$")]
   [PluginFile("HeuristicLab.Analysis.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]

branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/Properties/AssemblyInfo.cs.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/Plugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Analysis plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Analysis", "3.3.12.$WCREV$")]
+  [Plugin("HeuristicLab.Analysis", "3.3.13.$WCREV$")]
   [PluginFile("HeuristicLab.Analysis-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/PopulationSimilarityAnalyzer.cs

@@ -39 +39 @@
   public class PopulationSimilarityAnalyzer : SingleSuccessorOperator, IAnalyzer, ISimilarityBasedOperator {
     private const string DiversityResultNameParameterName = "DiversityResultsName";
+    private const string ExecuteInParallelParameterName = "ExecuteInParallel";
+    private const string MaxDegreeOfParallelismParameterName = "MaxDegreeOfParallelism";
 
     #region Backwards compatible code, remove with 3.4
@@ -71 +73 @@
       get { return (FixedValueParameter<StringValue>)Parameters[DiversityResultNameParameterName]; }
     }
+    public IFixedValueParameter<BoolValue> ExecuteInParallelParameter {
+      get { return (IFixedValueParameter<BoolValue>)Parameters[ExecuteInParallelParameterName]; }
+    }
+    public IFixedValueParameter<IntValue> MaxDegreeOfParallelismParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters[MaxDegreeOfParallelismParameterName]; }
+    }
 
     public string DiversityResultName {
@@ -77 +85 @@
     }
 
+    public bool ExecuteInParallel {
+      get { return ExecuteInParallelParameter.Value.Value; }
+      set { ExecuteInParallelParameter.Value.Value = value; }
+    }
+
+    public int MaxDegreeOfParallelism {
+      get { return MaxDegreeOfParallelismParameter.Value.Value; }
+      set { MaxDegreeOfParallelismParameter.Value.Value = value; }
+    }
+
     [StorableConstructor]
     protected PopulationSimilarityAnalyzer(bool deserializing) : base(deserializing) { }
-    protected PopulationSimilarityAnalyzer(PopulationSimilarityAnalyzer original, Cloner cloner) : base(original, cloner) { }
+
+    protected PopulationSimilarityAnalyzer(PopulationSimilarityAnalyzer original, Cloner cloner)
+      : base(original, cloner) {
+      RegisterParametersEventHandlers();
+    }
+
     public PopulationSimilarityAnalyzer(IEnumerable<ISolutionSimilarityCalculator> validSimilarityCalculators)
       : base() {
@@ -89 +112 @@
       Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the operator was called since the last update.", "PopulationDiversityAnalyzerUpdateCounter"));
       Parameters.Add(new FixedValueParameter<StringValue>(DiversityResultNameParameterName, "Specifies how the diversity results should be named.", new StringValue("PopulationDiversity")));
+      Parameters.Add(new FixedValueParameter<BoolValue>(ExecuteInParallelParameterName, "Specifies whether similarity calculations should be parallelized.", new BoolValue(false)));
+      Parameters.Add(new FixedValueParameter<IntValue>(MaxDegreeOfParallelismParameterName, "Specifies the maximum number of threads when calculating similarities in parallel.", new IntValue(-1)));
 
       var similarityCalculators = SimilarityCalculatorParameter.ValidValues;
-      foreach (var sc in validSimilarityCalculators)
+      foreach (var sc in validSimilarityCalculators) {
         similarityCalculators.Add(sc);
-
+      }
 
       ResultsParameter.Hidden = true;
       UpdateCounterParameter.Hidden = true;
+      ExecuteInParallelParameter.Hidden = true;
+      MaxDegreeOfParallelismParameter.Hidden = true;
+
+      RegisterParametersEventHandlers();
+    }
+
+    private void RegisterParametersEventHandlers() {
+      ExecuteInParallelParameter.Value.ValueChanged += Value_ValueChanged;
+      MaxDegreeOfParallelismParameter.Value.ValueChanged += Value_ValueChanged;
+    }
+
+    private void Value_ValueChanged(object sender, EventArgs e) {
+      var similarityCalculators = SimilarityCalculatorParameter.ValidValues;
+      foreach (var similarityCalculator in similarityCalculators) {
+        similarityCalculator.ExecuteInParallel = ExecuteInParallel;
+        similarityCalculator.MaxDegreeOfParallelism = MaxDegreeOfParallelism;
+      }
     }
 
@@ -113 +155 @@
         Parameters.Add(new ConstrainedValueParameter<ISolutionSimilarityCalculator>("SimilarityCalculator", "The similarity calculator that should be used to calculate solution similarity."));
 
-      SimilarityCalculatorParameter.ValidValues.Add(oldSimilarityCalculator);
+      if (oldSimilarityCalculator != null)
+        SimilarityCalculatorParameter.ValidValues.Add(oldSimilarityCalculator);
+
+      if (!Parameters.ContainsKey(ExecuteInParallelParameterName)) {
+        Parameters.Add(new FixedValueParameter<BoolValue>(ExecuteInParallelParameterName,
+          "Specifies whether similarity calculations should be parallelized.", new BoolValue(false)));
+        ExecuteInParallelParameter.Hidden = true;
+      }
+      if (!Parameters.ContainsKey(MaxDegreeOfParallelismParameterName)) {
+        Parameters.Add(new FixedValueParameter<IntValue>(MaxDegreeOfParallelismParameterName,
+          "Specifies the maximum number of threads when calculating similarities in parallel.", new IntValue(-1)));
+        MaxDegreeOfParallelismParameter.Hidden = true;
+      }
+
+      RegisterParametersEventHandlers();
       #endregion
     }

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/Properties/AssemblyInfo.cs.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs

@@ -50 +50 @@
       this.engineViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
-      this.openOperatorGraphButton = new System.Windows.Forms.Button();
-      this.newOperatorGraphButton = new System.Windows.Forms.Button();
-      this.operatorGraphViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.operatorGraphViewHost = new HeuristicLab.Core.Views.BreadcrumbViewHost();
       this.tabControl.SuspendLayout();
       this.parametersTabPage.SuspendLayout();
@@ -219 +217 @@
       // operatorGraphTabPage
       // 
-      this.operatorGraphTabPage.Controls.Add(this.openOperatorGraphButton);
-      this.operatorGraphTabPage.Controls.Add(this.newOperatorGraphButton);
       this.operatorGraphTabPage.Controls.Add(this.operatorGraphViewHost);
       this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22);
@@ -229 +225 @@
       this.operatorGraphTabPage.UseVisualStyleBackColor = true;
       // 
-      // openOperatorGraphButton
-      // 
-      this.openOperatorGraphButton.Enabled = false;
-      this.openOperatorGraphButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
-      this.openOperatorGraphButton.Location = new System.Drawing.Point(33, 3);
-      this.openOperatorGraphButton.Name = "openOperatorGraphButton";
-      this.openOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
-      this.openOperatorGraphButton.TabIndex = 1;
-      this.toolTip.SetToolTip(this.openOperatorGraphButton, "Open Operator Graph");
-      this.openOperatorGraphButton.UseVisualStyleBackColor = true;
-      // 
-      // newOperatorGraphButton
-      // 
-      this.newOperatorGraphButton.Enabled = false;
-      this.newOperatorGraphButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.NewDocument;
-      this.newOperatorGraphButton.Location = new System.Drawing.Point(3, 3);
-      this.newOperatorGraphButton.Name = "newOperatorGraphButton";
-      this.newOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
-      this.newOperatorGraphButton.TabIndex = 1;
-      this.toolTip.SetToolTip(this.newOperatorGraphButton, "New Operator Graph");
-      this.newOperatorGraphButton.UseVisualStyleBackColor = true;
-      // 
       // operatorGraphViewHost
       // 
@@ -258 +232 @@
       this.operatorGraphViewHost.Caption = "View";
       this.operatorGraphViewHost.Content = null;
+      this.operatorGraphViewHost.EnableBreadcrumbs = true;
       this.operatorGraphViewHost.Enabled = false;
-      this.operatorGraphViewHost.Location = new System.Drawing.Point(3, 33);
+      this.operatorGraphViewHost.Location = new System.Drawing.Point(6, 6);
       this.operatorGraphViewHost.Name = "operatorGraphViewHost";
       this.operatorGraphViewHost.ReadOnly = true;
-      this.operatorGraphViewHost.Size = new System.Drawing.Size(699, 431);
+      this.operatorGraphViewHost.ShowSingle = true;
+      this.operatorGraphViewHost.Size = new System.Drawing.Size(693, 455);
       this.operatorGraphViewHost.TabIndex = 0;
       this.operatorGraphViewHost.ViewsLabelVisible = true;
@@ -295 +271 @@
     protected HeuristicLab.MainForm.WindowsForms.ViewHost engineViewHost;
     protected System.Windows.Forms.TabPage operatorGraphTabPage;
-    protected HeuristicLab.MainForm.WindowsForms.ViewHost operatorGraphViewHost;
-    protected System.Windows.Forms.Button openOperatorGraphButton;
-    protected System.Windows.Forms.Button newOperatorGraphButton;
+    protected HeuristicLab.Core.Views.BreadcrumbViewHost operatorGraphViewHost;
 
   }

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

@@ -95 +95 @@
       base.SetEnabledStateOfControls();
       engineViewHost.Enabled = Content != null;
-      newOperatorGraphButton.Enabled = false;
-      openOperatorGraphButton.Enabled = false;
       operatorGraphViewHost.Enabled = Content != null;
       operatorGraphViewHost.ReadOnly = true;

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.Designer.cs

@@ -51 +51 @@
       this.CollapseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.CollapseAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.EditNodeLabelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.optimizersGroupBox.SuspendLayout();
@@ -165 +164 @@
       this.treeView.ImageIndex = 0;
       this.treeView.ImageList = this.imageList;
-      this.treeView.LabelEdit = true;
+      this.treeView.LabelEdit = false;
       this.treeView.Location = new System.Drawing.Point(4, 34);
       this.treeView.Name = "optimizerTreeView";
@@ -220 +219 @@
       // 
       this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.EditNodeLabelToolStripMenuItem,
             this.ExpandToolStripMenuItem,
             this.ExpandAllToolStripMenuItem,
@@ -255 +253 @@
       this.CollapseAllToolStripMenuItem.Text = "Collapse All";
       this.CollapseAllToolStripMenuItem.Click += new System.EventHandler(this.CollapseAllToolStripMenuItem_Click);
-      //
-      // EditNodeLabelToolStripMenuItem
-      //
-      this.EditNodeLabelToolStripMenuItem.Name = "EditNodeLabelToolStripMenuItem";
-      this.EditNodeLabelToolStripMenuItem.Size = new System.Drawing.Size(119, 22);
-      this.EditNodeLabelToolStripMenuItem.Text = "Edit Name";
-      this.EditNodeLabelToolStripMenuItem.Click += new System.EventHandler(this.EditNodeLabelToolStripMenuItem_Click);
 
       // 
@@ -300 +291 @@
     private System.Windows.Forms.ToolStripMenuItem CollapseToolStripMenuItem;
     private System.Windows.Forms.ToolStripMenuItem CollapseAllToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem EditNodeLabelToolStripMenuItem;
 
   }

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

@@ -664 +664 @@
         ExpandToolStripMenuItem.Enabled = ExpandToolStripMenuItem.Visible = !toolStripMenuNode.IsExpanded && toolStripMenuNode.Nodes.Count > 0;
         CollapseToolStripMenuItem.Enabled = CollapseToolStripMenuItem.Visible = toolStripMenuNode.IsExpanded;
-        EditNodeLabelToolStripMenuItem.Enabled = EditNodeLabelToolStripMenuItem.Visible = !Locked && !ReadOnly && toolStripMenuNode.Tag != null && toolStripMenuNode.Tag is INamedItem && ((INamedItem)toolStripMenuNode.Tag).CanChangeName;
       } else {
         ExpandToolStripMenuItem.Enabled = ExpandToolStripMenuItem.Visible = false;
         CollapseToolStripMenuItem.Enabled = CollapseToolStripMenuItem.Visible = false;
-        EditNodeLabelToolStripMenuItem.Enabled = EditNodeLabelToolStripMenuItem.Visible = false;
       }
       ExpandAllToolStripMenuItem.Enabled = ExpandAllToolStripMenuItem.Visible = !treeView.Nodes.OfType<TreeNode>().All(x => TreeNodeIsFullyExpanded(x));
@@ -687 +685 @@
     private void CollapseAllToolStripMenuItem_Click(object sender, EventArgs e) {
       treeView.CollapseAll();
-    }
-    private void EditNodeLabelToolStripMenuItem_Click(object sender, EventArgs e) {
-      if (toolStripMenuNode != null) {
-        if (!toolStripMenuNode.IsEditing) toolStripMenuNode.BeginEdit();
-      }
     }
 

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -150 +150 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -344 +349 @@
       <DependentUpon>RunCollectionEqualityConstraintView.cs</DependentUpon>
     </Compile>
+    <Compile Include="RunCollectionViews\RunCollectionIteratedSamplingView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectionViews\RunCollectionIteratedSamplingView.Designer.cs">
+      <DependentUpon>RunCollectionIteratedSamplingView.cs</DependentUpon>
+    </Compile>
     <Compile Include="RunCollectionViews\RunCollectionRLDView.cs">
       <SubType>UserControl</SubType>
@@ -379 +390 @@
     <Compile Include="TimeLimitRunView.Designer.cs">
       <DependentUpon>TimeLimitRunView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ThresholdTerminatorView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ThresholdTerminatorView.Designer.cs">
+      <DependentUpon>ThresholdTerminatorView.cs</DependentUpon>
     </Compile>
     <Compile Include="UserDefinedAlgorithmView.cs">
@@ -447 +464 @@
     <EmbeddedResource Include="CreateNewSingleEncodingDialog.resx">
       <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="RunCollectionViews\RunCollectionIteratedSamplingView.resx">
+      <DependentUpon>RunCollectionIteratedSamplingView.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/Plugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Optimization.Views plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Optimization.Views", "3.3.12.$WCREV$")]
+  [Plugin("HeuristicLab.Optimization.Views", "3.3.13.$WCREV$")]
   [PluginFile("HeuristicLab.Optimization.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/Properties/AssemblyInfo.cs.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]

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

@@ -248 +248 @@
         matrix[5, i] = seriesValues.StandardDeviation();
         matrix[6, i] = seriesValues.Variance();
-        matrix[7, i] = seriesValues.Percentile(0.25);
-        matrix[8, i] = seriesValues.Percentile(0.75);
+        matrix[7, i] = seriesValues.Quantile(0.25);
+        matrix[8, i] = seriesValues.Quantile(0.75);
       }
       statisticsMatrixView.Content = matrix;

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

@@ -80 +80 @@
         return;
       }
+      UpdateDataTableComboBox(); // will trigger AddRuns
+    }
+    private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
+      if (suppressUpdates) return;
+      if (InvokeRequired) {
+        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved), sender, e);
+        return;
+      }
+      RemoveRuns(e.Items);
       UpdateDataTableComboBox();
       UpdateDataRowComboBox();
-      AddRuns(e.Items);
-    }
-    private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      if (suppressUpdates) return;
-      if (InvokeRequired) {
-        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved), sender, e);
-        return;
-      }
+      RebuildCombinedDataTable();
+    }
+    private void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
+      if (suppressUpdates) return;
+      if (InvokeRequired) {
+        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset), sender, e);
+        return;
+      }
+      RemoveRuns(e.OldItems);
       UpdateDataTableComboBox();
       UpdateDataRowComboBox();
-      RemoveRuns(e.Items);
-    }
-    private void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      if (suppressUpdates) return;
-      if (InvokeRequired) {
-        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset), sender, e);
-        return;
-      }
-      UpdateDataTableComboBox();
-      UpdateDataRowComboBox();
-      RemoveRuns(e.OldItems);
-      AddRuns(e.Items);
+      RebuildCombinedDataTable();
     }
     private void Content_AlgorithmNameChanged(object sender, EventArgs e) {
@@ -117 +116 @@
       suppressUpdates = Content.UpdateOfRunsInProgress;
       if (!suppressUpdates) {
+        foreach (var run in runMapping)
+          DeregisterRunEvents(run.Key);
+        runMapping.Clear();
+        combinedDataTable.Rows.Clear();
         UpdateDataTableComboBox();
-        UpdateDataRowComboBox();
-        UpdateRuns(Content);
       }
     }

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

@@ -463 +463 @@
       ertTableView.DataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
     }
-
-
     #endregion
 

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

@@ -25 +25 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Collections;
 using HeuristicLab.Core;
 using HeuristicLab.Data.Views;
@@ -122 +123 @@
 
     protected override void UpdateColumnHeaders() {
-      HashSet<string> visibleColumnNames = new HashSet<string>(dataGridView.Columns.OfType<DataGridViewColumn>()
-       .Where(c => c.Visible && !string.IsNullOrEmpty(c.HeaderText)).Select(c => c.HeaderText));
-
+      string[] colNames = base.Content.ColumnNames.ToArray();
+      int colCount = colNames.Length;
       for (int i = 0; i < dataGridView.ColumnCount; i++) {
-        if (i < base.Content.ColumnNames.Count())
-          dataGridView.Columns[i].HeaderText = base.Content.ColumnNames.ElementAt(i);
+        if (i < colCount)
+          dataGridView.Columns[i].HeaderText = colNames[i];
         else
           dataGridView.Columns[i].HeaderText = "Column " + (i + 1);
+      }
+
+      HashSet<string> visibleColumnNames = new HashSet<string>(
+        dataGridView.Columns.OfType<DataGridViewColumn>()
+       .Where(c => c.Visible)
+       .Where(c => !string.IsNullOrEmpty(c.HeaderText))
+       .Where(c => !IsConstant(c.HeaderText))
+       .Select(c => c.HeaderText));
+
+      for (int i = 0; i < dataGridView.ColumnCount; i++) {
         dataGridView.Columns[i].Visible = visibleColumnNames.Count == 0 || visibleColumnNames.Contains(dataGridView.Columns[i].HeaderText);
       }
+    }
+
+    // returns true when all values in the column are the same (missing values are included in the count)
+    private bool IsConstant(string columnName) {
+      Func<IRun, string, string> GetStringValue = (IRun r, string colName) => {
+        // also include missing values in the count
+        IItem v = null;
+        if (r.Parameters.TryGetValue(colName, out v)) return v.ToString();
+        if (r.Results.TryGetValue(colName, out v)) return v.ToString();
+        return string.Empty;
+      };
+
+      var firstRun = Content.First();
+      string firstValue = GetStringValue(firstRun, columnName);
+      return Content.Skip(1).All(run => firstValue == GetStringValue(run, columnName));
     }
 

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

@@ -389 +389 @@
         return;
       ReadOnly = true;
+
       try {
+        RunCollection.UpdateOfRunsInProgress = true;
         RunCollection.Modify();
       } finally {
         ReadOnly = false;
+        RunCollection.UpdateOfRunsInProgress = false;
       }
     }

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs

@@ -65 +65 @@
       // 
       this.engineViewHost.Size = new System.Drawing.Size(693, 402);
-      // 
-      // openOperatorGraphButton
-      // 
-      this.toolTip.SetToolTip(this.openOperatorGraphButton, "Open Operator Graph");
-      this.openOperatorGraphButton.Click += new System.EventHandler(openOperatorGraphButton_Click);
-      // 
-      // newOperatorGraphButton
-      // 
-      this.toolTip.SetToolTip(this.newOperatorGraphButton, "New Operator Graph");
-      this.newOperatorGraphButton.Click += new System.EventHandler(newOperatorGraphButton_Click);
       // 
       // tabControl

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

@@ -57 +57 @@
       base.SetEnabledStateOfControls();
       globalScopeView.Enabled = Content != null;
-      newOperatorGraphButton.Enabled = Content != null && !ReadOnly;
-      openOperatorGraphButton.Enabled = Content != null && !ReadOnly;
       operatorGraphViewHost.ReadOnly = Content == null || ReadOnly;
-    }
-
-    private void newOperatorGraphButton_Click(object sender, EventArgs e) {
-      Content.OperatorGraph = new OperatorGraph();
-    }
-    private void openOperatorGraphButton_Click(object sender, EventArgs e) {
-      openFileDialog.Title = "Open Operator Graph";
-      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
-        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = false;
-        operatorGraphViewHost.Enabled = false;
-
-        ContentManager.LoadAsync(openFileDialog.FileName, delegate(IStorableContent content, Exception error) {
-          try {
-            if (error != null) throw error;
-            OperatorGraph operatorGraph = content as OperatorGraph;
-            if (operatorGraph == null)
-              MessageBox.Show(this, "The selected file does not contain an operator graph.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            else
-              Content.OperatorGraph = operatorGraph;
-          }
-          catch (Exception ex) {
-            ErrorHandling.ShowErrorDialog(this, ex);
-          }
-          finally {
-            Invoke(new Action(delegate() {
-              operatorGraphViewHost.Enabled = true;
-              newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = true;
-            }));
-          }
-        });
-      }
     }
   }

branches/PerformanceComparison/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

@@ -67 +67 @@
       }
     }
+    [Storable]
     private T solutionCreator;
     public T SolutionCreator {

branches/PerformanceComparison/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -209 +209 @@
     <Compile Include="Interfaces\ISimilarityBasedOperator.cs" />
     <Compile Include="Interfaces\ISolutionSimilarityCalculator.cs" />
+    <Compile Include="Interfaces\ITerminationBasedOperator.cs" />
+    <Compile Include="Interfaces\ITerminator.cs" />
     <Compile Include="MetaOptimizers\BatchRun.cs" />
     <Compile Include="MetaOptimizers\Experiment.cs" />
     <Compile Include="MetaOptimizers\TimeLimitRun.cs" />
     <Compile Include="Results\ResultParameter.cs" />
+    <Compile Include="RunCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
     <Compile Include="Plugin.cs" />
@@ -220 +225 @@
     <Compile Include="RunCollectionModification\RunCollectionValueRemover.cs" />
     <Compile Include="Interfaces\IRunCollectionModifier.cs" />
+    <Compile Include="Termination\ComparisonTerminator.cs" />
+    <Compile Include="Termination\ExecutionTimeTerminator.cs" />
+    <Compile Include="Termination\MultiTerminator.cs" />
+    <Compile Include="Termination\SingleObjectiveQualityTerminator.cs" />
+    <Compile Include="Termination\TerminationOperator.cs" />
+    <Compile Include="Termination\Terminator.cs" />
+    <Compile Include="Termination\ThresholdTerminator.cs" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Algorithms\Algorithm.cs" />
@@ -265 +277 @@
     <Compile Include="OptimizerList.cs" />
     <Compile Include="Interfaces\IOptimizer.cs" />
-    <Compile Include="RunCollection.cs" />
     <Compile Include="Run.cs" />
     <Compile Include="Results\IResult.cs" />

branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Interfaces/ISolutionSimilarityCalculator.cs

@@ -30 +30 @@
     string SolutionVariableName { get; set; }
     string QualityVariableName { get; set; }
+    bool ExecuteInParallel { get; set; }
+    int MaxDegreeOfParallelism { get; set; }
 
     /// <summary>

branches/PerformanceComparison/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

@@ -24 +24 @@
 using System.Drawing;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -345 +346 @@
 
     private readonly object locker = new object();
+    private readonly object runsLocker = new object();
     private void optimizer_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       lock (locker)
@@ -350 +352 @@
     }
     private void optimizer_ExecutionTimeChanged(object sender, EventArgs e) {
-      lock (locker)
+      // only wait for maximally 100ms to acquire lock, otherwise return and don't update the execution time 
+      var success = Monitor.TryEnter(locker, 100);
+      if (!success) return;
+      try {
         ExecutionTime = Optimizers.Aggregate(TimeSpan.Zero, (t, o) => t + o.ExecutionTime);
+      }
+      finally {
+        Monitor.Exit(locker);
+      }
     }
     private void optimizer_Paused(object sender, EventArgs e) {
@@ -378 +387 @@
     }
     private void optimizer_Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      lock (locker) {
+      lock (runsLocker) {
         Runs.RemoveRange(e.OldItems);
         Runs.AddRange(e.Items);
@@ -384 +393 @@
     }
     private void optimizer_Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      lock (locker)
+      lock (runsLocker)
         Runs.AddRange(e.Items);
     }
     private void optimizer_Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      lock (locker)
+      lock (runsLocker)
         Runs.RemoveRange(e.Items);
     }

branches/PerformanceComparison/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Plugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Optimization plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Optimization", "3.3.12.$WCREV$")]
+  [Plugin("HeuristicLab.Optimization", "3.3.13.$WCREV$")]
   [PluginFile("HeuristicLab.Optimization-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.cs.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]

branches/PerformanceComparison/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -483 +483 @@
     #region Filtering
     private void UpdateFiltering(bool reset) {
-      var oldUpateRuns = UpdateOfRunsInProgress;
-      UpdateOfRunsInProgress = true;
       if (reset)
         list.ForEach(r => r.Visible = true);
       foreach (IRunCollectionConstraint constraint in this.constraints)
         constraint.Check();
-      UpdateOfRunsInProgress = oldUpateRuns;
     }
 
@@ -539 +536 @@
     protected virtual void Constraint_ConstraintOperationChanged(object sender, EventArgs e) {
       IRunCollectionConstraint constraint = (IRunCollectionConstraint)sender;
-      if (constraint.Active)
-        this.UpdateFiltering(true);
+      if (constraint.Active) {
+        var oldUpdateRuns = UpdateOfRunsInProgress;
+        try {
+          UpdateOfRunsInProgress = true;
+          UpdateFiltering(true);
+        } finally { UpdateOfRunsInProgress = oldUpdateRuns; }
+      }
     }
     protected virtual void Constraint_ConstraintDataChanged(object sender, EventArgs e) {
       IRunCollectionConstraint constraint = (IRunCollectionConstraint)sender;
-      if (constraint.Active)
-        this.UpdateFiltering(true);
+      if (constraint.Active) {
+        var oldUpdateRuns = UpdateOfRunsInProgress;
+        try {
+          UpdateOfRunsInProgress = true;
+          UpdateFiltering(true);
+        } finally { UpdateOfRunsInProgress = oldUpdateRuns; }
+      }
     }
     #endregion
@@ -551 +558 @@
     #region Modification
     public void Modify() {
-      var oldUpateRuns = UpdateOfRunsInProgress;
-      UpdateOfRunsInProgress = true;
       var runs = this.ToList();
       var selectedRuns = runs.Where(r => r.Visible).ToList();
@@ -566 +571 @@
         }
       }
-      UpdateOfRunsInProgress = oldUpateRuns;
     }
 

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.Designer.cs

@@ -34 +34 @@
     /// </summary>
     private void InitializeComponent() {
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ExpertSystemView));
       this.evaluationsLimitabel = new System.Windows.Forms.Label();
       this.maxEvaluationsTextBox = new System.Windows.Forms.TextBox();
@@ -50 +51 @@
       this.algorithmInstancesViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.problemInstancesTabPage = new System.Windows.Forms.TabPage();
-      this.problemInstancesView = new HeuristicLab.Optimization.Views.RunCollectionBubbleChartView();
+      this.problemInstancesView = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.instancesDropPanel = new System.Windows.Forms.Panel();
+      this.dragFLAHereLabel = new System.Windows.Forms.Label();
+      this.refreshMapButton = new System.Windows.Forms.Button();
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+      this.okbDownloadButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -59 +64 @@
       this.okbTabPage.SuspendLayout();
       this.problemInstancesTabPage.SuspendLayout();
+      this.instancesDropPanel.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -83 +89 @@
       // maxEvaluationsTextBox
       // 
-      this.maxEvaluationsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+      this.maxEvaluationsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.maxEvaluationsTextBox.Location = new System.Drawing.Point(75, 26);
@@ -94 +100 @@
       // 
       this.tabControl.AllowDrop = true;
-      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.tabControl.Controls.Add(this.problemTabPage);
@@ -127 +133 @@
       // problemViewHost
       // 
-      this.problemViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.problemViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.problemViewHost.Caption = "View";
@@ -143 +149 @@
       // openProblemButton
       // 
-      this.openProblemButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
+      this.openProblemButton.Image = ((System.Drawing.Image)(resources.GetObject("openProblemButton.Image")));
       this.openProblemButton.Location = new System.Drawing.Point(36, 6);
       this.openProblemButton.Name = "openProblemButton";
@@ -154 +160 @@
       // newProblemButton
       // 
-      this.newProblemButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.NewDocument;
+      this.newProblemButton.Image = ((System.Drawing.Image)(resources.GetObject("newProblemButton.Image")));
       this.newProblemButton.Location = new System.Drawing.Point(6, 6);
       this.newProblemButton.Name = "newProblemButton";
@@ -178 +184 @@
       // algorithmViewHost
       // 
-      this.algorithmViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.algorithmViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.algorithmViewHost.Caption = "View";
@@ -203 +209 @@
       // suggestedInstancesComboBox
       // 
-      this.suggestedInstancesComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+      this.suggestedInstancesComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.suggestedInstancesComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -237 +243 @@
       // okbTabPage
       // 
+      this.okbTabPage.Controls.Add(this.okbDownloadButton);
       this.okbTabPage.Controls.Add(this.algorithmInstancesViewHost);
       this.okbTabPage.Location = new System.Drawing.Point(4, 22);
@@ -248 +255 @@
       // algorithmInstancesViewHost
       // 
+      this.algorithmInstancesViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.algorithmInstancesViewHost.Caption = "View";
       this.algorithmInstancesViewHost.Content = null;
-      this.algorithmInstancesViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
       this.algorithmInstancesViewHost.Enabled = false;
-      this.algorithmInstancesViewHost.Location = new System.Drawing.Point(3, 3);
+      this.algorithmInstancesViewHost.Location = new System.Drawing.Point(3, 35);
       this.algorithmInstancesViewHost.Name = "algorithmInstancesViewHost";
       this.algorithmInstancesViewHost.ReadOnly = false;
-      this.algorithmInstancesViewHost.Size = new System.Drawing.Size(532, 329);
+      this.algorithmInstancesViewHost.Size = new System.Drawing.Size(532, 297);
       this.algorithmInstancesViewHost.TabIndex = 0;
       this.algorithmInstancesViewHost.ViewsLabelVisible = true;
@@ -263 +272 @@
       // 
       this.problemInstancesTabPage.Controls.Add(this.problemInstancesView);
+      this.problemInstancesTabPage.Controls.Add(this.instancesDropPanel);
+      this.problemInstancesTabPage.Controls.Add(this.refreshMapButton);
       this.problemInstancesTabPage.Location = new System.Drawing.Point(4, 22);
       this.problemInstancesTabPage.Name = "problemInstancesTabPage";
@@ -273 +284 @@
       // problemInstancesView
       // 
-      this.problemInstancesView.BackColor = System.Drawing.SystemColors.Window;
-      this.problemInstancesView.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.problemInstancesView.Caption = "Bubble Chart";
+      this.problemInstancesView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.problemInstancesView.Caption = "View";
       this.problemInstancesView.Content = null;
-      this.problemInstancesView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.problemInstancesView.Location = new System.Drawing.Point(3, 3);
+      this.problemInstancesView.Enabled = false;
+      this.problemInstancesView.Location = new System.Drawing.Point(3, 34);
       this.problemInstancesView.Name = "problemInstancesView";
       this.problemInstancesView.ReadOnly = false;
-      this.problemInstancesView.Size = new System.Drawing.Size(532, 329);
-      this.problemInstancesView.TabIndex = 0;
+      this.problemInstancesView.Size = new System.Drawing.Size(532, 298);
+      this.problemInstancesView.TabIndex = 3;
+      this.problemInstancesView.ViewsLabelVisible = true;
+      this.problemInstancesView.ViewType = null;
+      // 
+      // instancesDropPanel
+      // 
+      this.instancesDropPanel.AllowDrop = true;
+      this.instancesDropPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.instancesDropPanel.BackColor = System.Drawing.Color.LightYellow;
+      this.instancesDropPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+      this.instancesDropPanel.Controls.Add(this.dragFLAHereLabel);
+      this.instancesDropPanel.Location = new System.Drawing.Point(35, 7);
+      this.instancesDropPanel.Name = "instancesDropPanel";
+      this.instancesDropPanel.Size = new System.Drawing.Size(500, 21);
+      this.instancesDropPanel.TabIndex = 2;
+      this.instancesDropPanel.DragDrop += new System.Windows.Forms.DragEventHandler(this.instancesDropPanel_DragDrop);
+      this.instancesDropPanel.DragEnter += new System.Windows.Forms.DragEventHandler(this.instancesDropPanel_DragEnter);
+      this.instancesDropPanel.DragOver += new System.Windows.Forms.DragEventHandler(this.instancesDropPanel_DragOver);
+      // 
+      // dragFLAHereLabel
+      // 
+      this.dragFLAHereLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
+      this.dragFLAHereLabel.AutoSize = true;
+      this.dragFLAHereLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+      this.dragFLAHereLabel.Location = new System.Drawing.Point(155, 3);
+      this.dragFLAHereLabel.Name = "dragFLAHereLabel";
+      this.dragFLAHereLabel.Size = new System.Drawing.Size(175, 13);
+      this.dragFLAHereLabel.TabIndex = 0;
+      this.dragFLAHereLabel.Text = "Drag and drop runs with FLA here...";
+      // 
+      // refreshMapButton
+      // 
+      this.refreshMapButton.Location = new System.Drawing.Point(3, 6);
+      this.refreshMapButton.Name = "refreshMapButton";
+      this.refreshMapButton.Size = new System.Drawing.Size(26, 23);
+      this.refreshMapButton.TabIndex = 1;
+      this.refreshMapButton.Text = "Refresh";
+      this.refreshMapButton.UseVisualStyleBackColor = true;
+      this.refreshMapButton.Click += new System.EventHandler(this.refreshMapButton_Click);
       // 
       // openFileDialog
@@ -290 +341 @@
       this.openFileDialog.Filter = "HeuristicLab Files|*.hl|All Files|*.*";
       this.openFileDialog.Title = "Open Optimizer";
+      // 
+      // okbDownloadButton
+      // 
+      this.okbDownloadButton.Location = new System.Drawing.Point(6, 6);
+      this.okbDownloadButton.Name = "okbDownloadButton";
+      this.okbDownloadButton.Size = new System.Drawing.Size(146, 23);
+      this.okbDownloadButton.TabIndex = 1;
+      this.okbDownloadButton.Text = "Download from OKB";
+      this.okbDownloadButton.UseVisualStyleBackColor = true;
+      this.okbDownloadButton.Click += new System.EventHandler(this.okbDownloadButton_Click);
       // 
       // ExpertSystemView
@@ -313 +374 @@
       this.okbTabPage.ResumeLayout(false);
       this.problemInstancesTabPage.ResumeLayout(false);
+      this.instancesDropPanel.ResumeLayout(false);
+      this.instancesDropPanel.PerformLayout();
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -337 +400 @@
     private MainForm.WindowsForms.ViewHost algorithmInstancesViewHost;
     private System.Windows.Forms.TabPage problemInstancesTabPage;
-    private Optimization.Views.RunCollectionBubbleChartView problemInstancesView;
+    private System.Windows.Forms.Panel instancesDropPanel;
+    private System.Windows.Forms.Button refreshMapButton;
+    private System.Windows.Forms.Label dragFLAHereLabel;
+    private MainForm.WindowsForms.ViewHost problemInstancesView;
+    private System.Windows.Forms.Button okbDownloadButton;
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3/ExpertSystemView.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections;
 using System.ComponentModel;
+using System.IO;
+using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Clients.OKB.Administration;
+using HeuristicLab.Clients.OKB.Query;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.PluginInfrastructure;
 
@@ -43 +51 @@
     public ExpertSystemView() {
       InitializeComponent();
+      refreshMapButton.Text = string.Empty;
+      refreshMapButton.Image = VSImageLibrary.Refresh;
     }
 
@@ -83 +93 @@
           runsView.Content = null;
           algorithmInstancesViewHost.Content = null;
+          problemInstancesView.Content = null;
         } else {
           maxEvaluationsTextBox.Text = Content.MaximumEvaluations.ToString();
@@ -88 +99 @@
           runsView.Content = Content.Runs;
           algorithmInstancesViewHost.Content = Content.AlgorithmInstances;
+          problemInstancesView.Content = Content.ProblemInstances;
         }
       } finally { SuppressEvents = false; }
@@ -103 +115 @@
       runsView.Enabled = Content != null;
       algorithmInstancesViewHost.Enabled = Content != null;
+      refreshMapButton.Enabled = Content != null;
+      okbDownloadButton.Enabled = Content != null && Content.Problem != null && !ReadOnly && !Locked;
     }
 
@@ -131 +145 @@
       try {
         switch (e.PropertyName) {
+          case "AlgorithmInstances": algorithmInstancesViewHost.Content = Content.AlgorithmInstances; break;
           case "MaximumEvaluations": maxEvaluationsTextBox.Text = Content.MaximumEvaluations.ToString(); break;
           case "Problem": problemViewHost.Content = Content.Problem; break;
+          case "ProblemInstances": problemInstancesView.Content = Content.ProblemInstances; break;
         }
       } finally { SuppressEvents = false; }
+      SetEnabledStateOfControls();
     }
 
@@ -233 +250 @@
     }
     #endregion
+
+    private bool validDragOperation;
+    private void instancesDropPanel_DragEnter(object sender, DragEventArgs e) {
+      validDragOperation = false;
+      if (!ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IRun)) {
+        validDragOperation = true;
+      } else if (!ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable)) {
+        validDragOperation = true;
+        var items = (IEnumerable)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
+        foreach (object item in items)
+          validDragOperation = validDragOperation && (item is IRun);
+      }
+    }
+    private void instancesDropPanel_DragOver(object sender, DragEventArgs e) {
+      e.Effect = DragDropEffects.None;
+      if (!validDragOperation) return;
+      if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
+      else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
+      else if (e.AllowedEffect.HasFlag(DragDropEffects.Copy)) e.Effect = DragDropEffects.Copy;
+      else if (e.AllowedEffect.HasFlag(DragDropEffects.Move)) e.Effect = DragDropEffects.Move;
+      else if (e.AllowedEffect.HasFlag(DragDropEffects.Link)) e.Effect = DragDropEffects.Link;
+    }
+    private void instancesDropPanel_DragDrop(object sender, DragEventArgs e) {
+      if (e.Effect == DragDropEffects.None) return;
+      if (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IRun) {
+        var item = (IRun)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
+        Content.ProblemInstances.Add(e.Effect.HasFlag(DragDropEffects.Copy) ? (IRun)item.Clone() : item);
+      } else if (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable) {
+        var items = ((IEnumerable)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat)).Cast<IRun>();
+        if (e.Effect.HasFlag(DragDropEffects.Copy)) {
+          var cloner = new Cloner();
+          items = items.Select(x => cloner.Clone(x));
+        }
+        Content.ProblemInstances.AddRange(items);
+      }
+    }
     #endregion
+
+    private void refreshMapButton_Click(object sender, EventArgs e) {
+      Content.UpdateInstanceMap();
+    }
+
+    private void okbDownloadButton_Click(object sender, EventArgs e) {
+      var queryClient = QueryClient.Instance;
+      queryClient.Refresh();
+
+      var problemTypeFilter = (StringComparisonAvailableValuesFilter)queryClient.Filters.Single(x => x.Label == "Problem Data Type Name");
+      problemTypeFilter.Value = Content.Problem.GetType().Name;
+
+      var runIds = queryClient.GetRunIds(problemTypeFilter).ToList();
+      var count = queryClient.GetNumberOfRuns(problemTypeFilter);
+      if (count > 0) {
+        var list = new ItemList<IAlgorithm>();
+        var adminClient = AdministrationClient.Instance;
+        adminClient.Refresh();
+        var runs = queryClient.GetRuns(runIds, true).ToList();
+        foreach (var rGroup in runs.GroupBy(x => x.Algorithm.Id)) {
+          var data = AdministrationClient.GetAlgorithmData(rGroup.Key);
+          if (data != null) {
+            using (var stream = new MemoryStream(data)) {
+              try {
+                var alg = (IAlgorithm)XmlParser.Deserialize<IContent>(stream);
+                alg.Runs.AddRange(rGroup.Select(x => queryClient.ConvertToOptimizationRun(x)));
+                list.Add(alg);
+              } catch (Exception) { }
+              stream.Close();
+            }
+          }
+        }
+        Content.AlgorithmInstances = list;
+      }
+    }
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Views/3.3/HeuristicLab.OptimizationExpertSystem.Views-3.3.csproj

@@ -78 +78 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Clients.OKB-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Clients.OKB-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -121 +126 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -136 +146 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
@@ -185 +196 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ExpertSystemView.resx">
+      <DependentUpon>ExpertSystemView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystem.cs

@@ -71 +71 @@
         algorithmInstances = value;
         OnPropertyChanged("AlgorithmInstances");
+        // TODO: Attach event handlers
       }
     }
@@ -155 +156 @@
       var runCollection = sender as RunCollection;
       if (runCollection != null && runCollection.UpdateOfRunsInProgress) return;
-      UpdateInstanceMap();
       UpdateSuggestions();
     }
 
-    private void UpdateInstanceMap() {
+    public void UpdateInstanceMap() {
       var flaValues = ProblemInstances.ResultNames
                       .Where(x => x.StartsWith("Characteristic.")
@@ -203 +203 @@
           } else instance.Results.Add("Projection.PCA2", new DoubleValue(y));
 
+          instanceCounter++;
+
           var bkQuality = ((DoubleValue)instance.Parameters["BestKnownQuality"]).Value;
           var maximization = ((BoolValue)instance.Parameters["Maximization"]).Value;
+
+          if (!algInstRunDict.ContainsKey(probInstanceName)) continue;
           foreach (var kvp in algInstRunDict[probInstanceName]) {
             var algInstanceName = kvp.Key;
-            foreach (var run in kvp.Value) {
-              // TODO: Things needs to be configurable here (table name, targets)
-              foreach (var target in new[] { 1, 1.01, 1.05, 1.1, 1.2, 1.5 }) {
-                var result = ExpectedRuntimeHelper.CalculateErt(kvp.Value, "QualityPerEvaluations", bkQuality * target, maximization);
-                var resultName = algInstanceName + "@" + ((target - 1) * 100) + "%";
-                if (run.Results.TryGetValue(resultName, out item))
-                  ((DoubleValue)item).Value = result.ExpectedRuntime;
-                else run.Results.Add(resultName, new DoubleValue(result.ExpectedRuntime));
-              }
+            // TODO: Things needs to be configurable here (table name, targets)
+            foreach (var target in new[] { 1, 1.01, 1.05, 1.1, 1.2, 1.5 }) {
+              var result = ExpectedRuntimeHelper.CalculateErt(kvp.Value, "QualityPerEvaluations", bkQuality * target, maximization);
+              var resultName = algInstanceName + "@" + ((target - 1) * 100) + "%";
+              if (instance.Results.TryGetValue(resultName, out item)) {
+                ((DoubleValue)item).Value = Math.Log10(result.ExpectedRuntime);
+              } else instance.Results.Add(resultName, new DoubleValue(Math.Log10(result.ExpectedRuntime)));
             }
           }

@@ -2 +2 @@
 *.suo
 *.user
+.git
+.gitignore