Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/16/15 17:04:35 (8 years ago)
Author:
abeham
Message:

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

Location:
branches/PerformanceComparison
Files:
3 added
18 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/PerformanceComparison

    • Property svn:ignore

      •  

        old new  
        22*.suo
        33*.user
         4.git
         5.gitignore

  • branches/PerformanceComparison/HeuristicLab.Optimization.Views

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

    r12012 r13475  
    5050      this.engineViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    5151      this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
    52       this.openOperatorGraphButton = new System.Windows.Forms.Button();
    53       this.newOperatorGraphButton = new System.Windows.Forms.Button();
    54       this.operatorGraphViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
     52      this.operatorGraphViewHost = new HeuristicLab.Core.Views.BreadcrumbViewHost();
    5553      this.tabControl.SuspendLayout();
    5654      this.parametersTabPage.SuspendLayout();
    … …  
    219217      // operatorGraphTabPage
    220218      //
    221       this.operatorGraphTabPage.Controls.Add(this.openOperatorGraphButton);
    222       this.operatorGraphTabPage.Controls.Add(this.newOperatorGraphButton);
    223219      this.operatorGraphTabPage.Controls.Add(this.operatorGraphViewHost);
    224220      this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22);
    … …  
    229225      this.operatorGraphTabPage.UseVisualStyleBackColor = true;
    230226      //
    231       // openOperatorGraphButton
    232       //
    233       this.openOperatorGraphButton.Enabled = false;
    234       this.openOperatorGraphButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
    235       this.openOperatorGraphButton.Location = new System.Drawing.Point(33, 3);
    236       this.openOperatorGraphButton.Name = "openOperatorGraphButton";
    237       this.openOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
    238       this.openOperatorGraphButton.TabIndex = 1;
    239       this.toolTip.SetToolTip(this.openOperatorGraphButton, "Open Operator Graph");
    240       this.openOperatorGraphButton.UseVisualStyleBackColor = true;
    241       //
    242       // newOperatorGraphButton
    243       //
    244       this.newOperatorGraphButton.Enabled = false;
    245       this.newOperatorGraphButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.NewDocument;
    246       this.newOperatorGraphButton.Location = new System.Drawing.Point(3, 3);
    247       this.newOperatorGraphButton.Name = "newOperatorGraphButton";
    248       this.newOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
    249       this.newOperatorGraphButton.TabIndex = 1;
    250       this.toolTip.SetToolTip(this.newOperatorGraphButton, "New Operator Graph");
    251       this.newOperatorGraphButton.UseVisualStyleBackColor = true;
    252       //
    253227      // operatorGraphViewHost
    254228      //
    … …  
    258232      this.operatorGraphViewHost.Caption = "View";
    259233      this.operatorGraphViewHost.Content = null;
     234      this.operatorGraphViewHost.EnableBreadcrumbs = true;
    260235      this.operatorGraphViewHost.Enabled = false;
    261       this.operatorGraphViewHost.Location = new System.Drawing.Point(3, 33);
     236      this.operatorGraphViewHost.Location = new System.Drawing.Point(6, 6);
    262237      this.operatorGraphViewHost.Name = "operatorGraphViewHost";
    263238      this.operatorGraphViewHost.ReadOnly = true;
    264       this.operatorGraphViewHost.Size = new System.Drawing.Size(699, 431);
     239      this.operatorGraphViewHost.ShowSingle = true;
     240      this.operatorGraphViewHost.Size = new System.Drawing.Size(693, 455);
    265241      this.operatorGraphViewHost.TabIndex = 0;
    266242      this.operatorGraphViewHost.ViewsLabelVisible = true;
    … …  
    295271    protected HeuristicLab.MainForm.WindowsForms.ViewHost engineViewHost;
    296272    protected System.Windows.Forms.TabPage operatorGraphTabPage;
    297     protected HeuristicLab.MainForm.WindowsForms.ViewHost operatorGraphViewHost;
    298     protected System.Windows.Forms.Button openOperatorGraphButton;
    299     protected System.Windows.Forms.Button newOperatorGraphButton;
     273    protected HeuristicLab.Core.Views.BreadcrumbViewHost operatorGraphViewHost;
    300274
    301275  }

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

    r12012 r13475  
    9595      base.SetEnabledStateOfControls();
    9696      engineViewHost.Enabled = Content != null;
    97       newOperatorGraphButton.Enabled = false;
    98       openOperatorGraphButton.Enabled = false;
    9997      operatorGraphViewHost.Enabled = Content != null;
    10098      operatorGraphViewHost.ReadOnly = true;

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

    r12012 r13475  
    5151      this.CollapseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    5252      this.CollapseAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    53       this.EditNodeLabelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    5453      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    5554      this.optimizersGroupBox.SuspendLayout();
    … …  
    165164      this.treeView.ImageIndex = 0;
    166165      this.treeView.ImageList = this.imageList;
    167       this.treeView.LabelEdit = true;
     166      this.treeView.LabelEdit = false;
    168167      this.treeView.Location = new System.Drawing.Point(4, 34);
    169168      this.treeView.Name = "optimizerTreeView";
    … …  
    220219      //
    221220      this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
    222             this.EditNodeLabelToolStripMenuItem,
    223221            this.ExpandToolStripMenuItem,
    224222            this.ExpandAllToolStripMenuItem,
    … …  
    255253      this.CollapseAllToolStripMenuItem.Text = "Collapse All";
    256254      this.CollapseAllToolStripMenuItem.Click += new System.EventHandler(this.CollapseAllToolStripMenuItem_Click);
    257       //
    258       // EditNodeLabelToolStripMenuItem
    259       //
    260       this.EditNodeLabelToolStripMenuItem.Name = "EditNodeLabelToolStripMenuItem";
    261       this.EditNodeLabelToolStripMenuItem.Size = new System.Drawing.Size(119, 22);
    262       this.EditNodeLabelToolStripMenuItem.Text = "Edit Name";
    263       this.EditNodeLabelToolStripMenuItem.Click += new System.EventHandler(this.EditNodeLabelToolStripMenuItem_Click);
    264255
    265256      //
    … …  
    300291    private System.Windows.Forms.ToolStripMenuItem CollapseToolStripMenuItem;
    301292    private System.Windows.Forms.ToolStripMenuItem CollapseAllToolStripMenuItem;
    302     private System.Windows.Forms.ToolStripMenuItem EditNodeLabelToolStripMenuItem;
    303293
    304294  }

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

    r12012 r13475  
    664664        ExpandToolStripMenuItem.Enabled = ExpandToolStripMenuItem.Visible = !toolStripMenuNode.IsExpanded && toolStripMenuNode.Nodes.Count > 0;
    665665        CollapseToolStripMenuItem.Enabled = CollapseToolStripMenuItem.Visible = toolStripMenuNode.IsExpanded;
    666         EditNodeLabelToolStripMenuItem.Enabled = EditNodeLabelToolStripMenuItem.Visible = !Locked && !ReadOnly && toolStripMenuNode.Tag != null && toolStripMenuNode.Tag is INamedItem && ((INamedItem)toolStripMenuNode.Tag).CanChangeName;
    667666      } else {
    668667        ExpandToolStripMenuItem.Enabled = ExpandToolStripMenuItem.Visible = false;
    669668        CollapseToolStripMenuItem.Enabled = CollapseToolStripMenuItem.Visible = false;
    670         EditNodeLabelToolStripMenuItem.Enabled = EditNodeLabelToolStripMenuItem.Visible = false;
    671669      }
    672670      ExpandAllToolStripMenuItem.Enabled = ExpandAllToolStripMenuItem.Visible = !treeView.Nodes.OfType<TreeNode>().All(x => TreeNodeIsFullyExpanded(x));
    … …  
    687685    private void CollapseAllToolStripMenuItem_Click(object sender, EventArgs e) {
    688686      treeView.CollapseAll();
    689     }
    690     private void EditNodeLabelToolStripMenuItem_Click(object sender, EventArgs e) {
    691       if (toolStripMenuNode != null) {
    692         if (!toolStripMenuNode.IsEditing) toolStripMenuNode.BeginEdit();
    693       }
    694687    }
    695688

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

    r12804 r13475  
    150150      <Private>False</Private>
    151151    </Reference>
     152    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     153      <SpecificVersion>False</SpecificVersion>
     154      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     155      <Private>False</Private>
     156    </Reference>
    152157    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    153158      <SpecificVersion>False</SpecificVersion>
    … …  
    344349      <DependentUpon>RunCollectionEqualityConstraintView.cs</DependentUpon>
    345350    </Compile>
     351    <Compile Include="RunCollectionViews\RunCollectionIteratedSamplingView.cs">
     352      <SubType>UserControl</SubType>
     353    </Compile>
     354    <Compile Include="RunCollectionViews\RunCollectionIteratedSamplingView.Designer.cs">
     355      <DependentUpon>RunCollectionIteratedSamplingView.cs</DependentUpon>
     356    </Compile>
    346357    <Compile Include="RunCollectionViews\RunCollectionRLDView.cs">
    347358      <SubType>UserControl</SubType>
    … …  
    379390    <Compile Include="TimeLimitRunView.Designer.cs">
    380391      <DependentUpon>TimeLimitRunView.cs</DependentUpon>
     392    </Compile>
     393    <Compile Include="ThresholdTerminatorView.cs">
     394      <SubType>UserControl</SubType>
     395    </Compile>
     396    <Compile Include="ThresholdTerminatorView.Designer.cs">
     397      <DependentUpon>ThresholdTerminatorView.cs</DependentUpon>
    381398    </Compile>
    382399    <Compile Include="UserDefinedAlgorithmView.cs">
    … …  
    447464    <EmbeddedResource Include="CreateNewSingleEncodingDialog.resx">
    448465      <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
     466    </EmbeddedResource>
     467    <EmbeddedResource Include="RunCollectionViews\RunCollectionIteratedSamplingView.resx">
     468      <DependentUpon>RunCollectionIteratedSamplingView.cs</DependentUpon>
    449469    </EmbeddedResource>
    450470  </ItemGroup>

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

    r12753 r13475  
    2626  /// Plugin class for HeuristicLab.Optimization.Views plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Optimization.Views", "3.3.12.$WCREV$")]
     28  [Plugin("HeuristicLab.Optimization.Views", "3.3.13.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Optimization.Views-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Analysis", "3.3")]

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

    r12753 r13475  
    5454// by using the '*' as shown below:
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
     56[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]

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

    r12813 r13475  
    248248        matrix[5, i] = seriesValues.StandardDeviation();
    249249        matrix[6, i] = seriesValues.Variance();
    250         matrix[7, i] = seriesValues.Percentile(0.25);
    251         matrix[8, i] = seriesValues.Percentile(0.75);
     250        matrix[7, i] = seriesValues.Quantile(0.25);
     251        matrix[8, i] = seriesValues.Quantile(0.75);
    252252      }
    253253      statisticsMatrixView.Content = matrix;

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

    r12692 r13475  
    8080        return;
    8181      }
     82      UpdateDataTableComboBox(); // will trigger AddRuns
     83    }
     84    private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
     85      if (suppressUpdates) return;
     86      if (InvokeRequired) {
     87        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved), sender, e);
     88        return;
     89      }
     90      RemoveRuns(e.Items);
    8291      UpdateDataTableComboBox();
    8392      UpdateDataRowComboBox();
    84       AddRuns(e.Items);
    85     }
    86     private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
    87       if (suppressUpdates) return;
    88       if (InvokeRequired) {
    89         Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved), sender, e);
    90         return;
    91       }
     93      RebuildCombinedDataTable();
     94    }
     95    private void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
     96      if (suppressUpdates) return;
     97      if (InvokeRequired) {
     98        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset), sender, e);
     99        return;
     100      }
     101      RemoveRuns(e.OldItems);
    92102      UpdateDataTableComboBox();
    93103      UpdateDataRowComboBox();
    94       RemoveRuns(e.Items);
    95     }
    96     private void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
    97       if (suppressUpdates) return;
    98       if (InvokeRequired) {
    99         Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset), sender, e);
    100         return;
    101       }
    102       UpdateDataTableComboBox();
    103       UpdateDataRowComboBox();
    104       RemoveRuns(e.OldItems);
    105       AddRuns(e.Items);
     104      RebuildCombinedDataTable();
    106105    }
    107106    private void Content_AlgorithmNameChanged(object sender, EventArgs e) {
    … …  
    117116      suppressUpdates = Content.UpdateOfRunsInProgress;
    118117      if (!suppressUpdates) {
     118        foreach (var run in runMapping)
     119          DeregisterRunEvents(run.Key);
     120        runMapping.Clear();
     121        combinedDataTable.Rows.Clear();
    119122        UpdateDataTableComboBox();
    120         UpdateDataRowComboBox();
    121         UpdateRuns(Content);
    122123      }
    123124    }

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

    r12956 r13475  
    463463      ertTableView.DataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
    464464    }
    465 
    466 
    467465    #endregion
    468466

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

    r12692 r13475  
    2525using System.Linq;
    2626using System.Windows.Forms;
     27using HeuristicLab.Collections;
    2728using HeuristicLab.Core;
    2829using HeuristicLab.Data.Views;
    … …  
    122123
    123124    protected override void UpdateColumnHeaders() {
    124       HashSet<string> visibleColumnNames = new HashSet<string>(dataGridView.Columns.OfType<DataGridViewColumn>()
    125        .Where(c => c.Visible && !string.IsNullOrEmpty(c.HeaderText)).Select(c => c.HeaderText));
    126 
     125      string[] colNames = base.Content.ColumnNames.ToArray();
     126      int colCount = colNames.Length;
    127127      for (int i = 0; i < dataGridView.ColumnCount; i++) {
    128         if (i < base.Content.ColumnNames.Count())
    129           dataGridView.Columns[i].HeaderText = base.Content.ColumnNames.ElementAt(i);
     128        if (i < colCount)
     129          dataGridView.Columns[i].HeaderText = colNames[i];
    130130        else
    131131          dataGridView.Columns[i].HeaderText = "Column " + (i + 1);
     132      }
     133
     134      HashSet<string> visibleColumnNames = new HashSet<string>(
     135        dataGridView.Columns.OfType<DataGridViewColumn>()
     136       .Where(c => c.Visible)
     137       .Where(c => !string.IsNullOrEmpty(c.HeaderText))
     138       .Where(c => !IsConstant(c.HeaderText))
     139       .Select(c => c.HeaderText));
     140
     141      for (int i = 0; i < dataGridView.ColumnCount; i++) {
    132142        dataGridView.Columns[i].Visible = visibleColumnNames.Count == 0 || visibleColumnNames.Contains(dataGridView.Columns[i].HeaderText);
    133143      }
     144    }
     145
     146    // returns true when all values in the column are the same (missing values are included in the count)
     147    private bool IsConstant(string columnName) {
     148      Func<IRun, string, string> GetStringValue = (IRun r, string colName) => {
     149        // also include missing values in the count
     150        IItem v = null;
     151        if (r.Parameters.TryGetValue(colName, out v)) return v.ToString();
     152        if (r.Results.TryGetValue(colName, out v)) return v.ToString();
     153        return string.Empty;
     154      };
     155
     156      var firstRun = Content.First();
     157      string firstValue = GetStringValue(firstRun, columnName);
     158      return Content.Skip(1).All(run => firstValue == GetStringValue(run, columnName));
    134159    }
    135160

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

    r12692 r13475  
    389389        return;
    390390      ReadOnly = true;
     391
    391392      try {
     393        RunCollection.UpdateOfRunsInProgress = true;
    392394        RunCollection.Modify();
    393395      } finally {
    394396        ReadOnly = false;
     397        RunCollection.UpdateOfRunsInProgress = false;
    395398      }
    396399    }

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

    r12627 r13475  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

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

    r12627 r13475  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

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

    r12012 r13475  
    6565      //
    6666      this.engineViewHost.Size = new System.Drawing.Size(693, 402);
    67       //
    68       // openOperatorGraphButton
    69       //
    70       this.toolTip.SetToolTip(this.openOperatorGraphButton, "Open Operator Graph");
    71       this.openOperatorGraphButton.Click += new System.EventHandler(openOperatorGraphButton_Click);
    72       //
    73       // newOperatorGraphButton
    74       //
    75       this.toolTip.SetToolTip(this.newOperatorGraphButton, "New Operator Graph");
    76       this.newOperatorGraphButton.Click += new System.EventHandler(newOperatorGraphButton_Click);
    7767      //
    7868      // tabControl

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

    r12012 r13475  
    5757      base.SetEnabledStateOfControls();
    5858      globalScopeView.Enabled = Content != null;
    59       newOperatorGraphButton.Enabled = Content != null && !ReadOnly;
    60       openOperatorGraphButton.Enabled = Content != null && !ReadOnly;
    6159      operatorGraphViewHost.ReadOnly = Content == null || ReadOnly;
    62     }
    63 
    64     private void newOperatorGraphButton_Click(object sender, EventArgs e) {
    65       Content.OperatorGraph = new OperatorGraph();
    66     }
    67     private void openOperatorGraphButton_Click(object sender, EventArgs e) {
    68       openFileDialog.Title = "Open Operator Graph";
    69       if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
    70         newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = false;
    71         operatorGraphViewHost.Enabled = false;
    72 
    73         ContentManager.LoadAsync(openFileDialog.FileName, delegate(IStorableContent content, Exception error) {
    74           try {
    75             if (error != null) throw error;
    76             OperatorGraph operatorGraph = content as OperatorGraph;
    77             if (operatorGraph == null)
    78               MessageBox.Show(this, "The selected file does not contain an operator graph.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
    79             else
    80               Content.OperatorGraph = operatorGraph;
    81           }
    82           catch (Exception ex) {
    83             ErrorHandling.ShowErrorDialog(this, ex);
    84           }
    85           finally {
    86             Invoke(new Action(delegate() {
    87               operatorGraphViewHost.Enabled = true;
    88               newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = true;
    89             }));
    90           }
    91         });
    92       }
    9360    }
    9461  }
Note: See TracChangeset for help on using the changeset viewer.