Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/01/14 10:53:46 (10 years ago)
Author:
mkommend
Message:

#2206: Updated data preprocessing branch with trunk changes.

Location:
branches/DataPreprocessing
Files:
5 edited
5 copied

Legend:

Unmodified
Added
Removed

  • branches/DataPreprocessing

  • branches/DataPreprocessing/HeuristicLab.Optimizer/3.3/FileManager.cs

    r9901 r11064  
    2525using System.Windows.Forms;
    2626using HeuristicLab.Common;
     27using HeuristicLab.Core;
    2728using HeuristicLab.MainForm;
    2829using HeuristicLab.PluginInfrastructure;
    … …  
    120121          saveFileDialog.FilterIndex = 2;
    121122        }
    122         saveFileDialog.FileName = string.IsNullOrEmpty(content.Filename) ? "Item" : content.Filename;
     123
     124        INamedItem namedItem = content as INamedItem;
     125        string suggestedFileName = string.Empty;
     126        if (!string.IsNullOrEmpty(content.Filename)) suggestedFileName = content.Filename;
     127        else if (namedItem != null) suggestedFileName = namedItem.Name;
     128        else suggestedFileName = "Item";
     129
     130        saveFileDialog.FileName = suggestedFileName;
    123131
    124132        if (saveFileDialog.ShowDialog() == DialogResult.OK) {

  • branches/DataPreprocessing/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

    r11009 r11064  
    130130    <EmbeddedResource Include="Documents\GE_ArtificialAnt.hl" />
    131131    <EmbeddedResource Include="Documents\GE_SymbReg.hl" />
     132    <EmbeddedResource Include="Documents\GA_QAP_Script.hl" />
     133    <EmbeddedResource Include="Documents\GUI_Automation_Script.hl" />
     134    <EmbeddedResource Include="Documents\OSGA_Rastrigin_Script.hl" />
     135    <EmbeddedResource Include="Documents\GP_Multiplexer.hl" />
    132136    <None Include="Plugin.cs.frame" />
    133137    <Compile Include="OptimizerSingleDocumentMainForm.cs">

  • branches/DataPreprocessing/HeuristicLab.Optimizer/3.3/StartPage.Designer.cs

    r9907 r11064  
    8686      this.firstStepsRichTextBox.Name = "firstStepsRichTextBox";
    8787      this.firstStepsRichTextBox.ReadOnly = true;
    88       this.firstStepsRichTextBox.Size = new System.Drawing.Size(725, 370);
     88      this.firstStepsRichTextBox.Size = new System.Drawing.Size(389, 581);
    8989      this.firstStepsRichTextBox.TabIndex = 1;
    9090      this.firstStepsRichTextBox.Text = "First Steps";
    … …  
    9898      this.titleLabel.Location = new System.Drawing.Point(-1, 0);
    9999      this.titleLabel.Name = "titleLabel";
    100       this.titleLabel.Size = new System.Drawing.Size(729, 30);
     100      this.titleLabel.Size = new System.Drawing.Size(393, 30);
    101101      this.titleLabel.TabIndex = 0;
    102102      this.titleLabel.Text = "Title";
    … …  
    111111      this.samplesGroupBox.Location = new System.Drawing.Point(0, 3);
    112112      this.samplesGroupBox.Name = "samplesGroupBox";
    113       this.samplesGroupBox.Size = new System.Drawing.Size(728, 201);
     113      this.samplesGroupBox.Size = new System.Drawing.Size(332, 637);
    114114      this.samplesGroupBox.TabIndex = 0;
    115115      this.samplesGroupBox.TabStop = false;
    … …  
    127127      this.samplesListView.Name = "samplesListView";
    128128      this.samplesListView.ShowItemToolTips = true;
    129       this.samplesListView.Size = new System.Drawing.Size(722, 182);
     129      this.samplesListView.Size = new System.Drawing.Size(326, 618);
    130130      this.samplesListView.SmallImageList = this.imageList;
    131131      this.samplesListView.Sorting = System.Windows.Forms.SortOrder.Ascending;
    … …  
    154154      // splitContainer
    155155      //
    156       this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    157             | System.Windows.Forms.AnchorStyles.Left)
    158             | System.Windows.Forms.AnchorStyles.Right)));
     156      this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
    159157      this.splitContainer.Location = new System.Drawing.Point(0, 0);
    160158      this.splitContainer.Name = "splitContainer";
    161       this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
    162159      //
    163160      // splitContainer.Panel1
    164161      //
    165162      this.splitContainer.Panel1.Controls.Add(this.titleLabel);
     163      this.splitContainer.Panel1.Controls.Add(this.showStartPageCheckBox);
    166164      this.splitContainer.Panel1.Controls.Add(this.firstStepsRichTextBox);
    167165      //
    … …  
    169167      //
    170168      this.splitContainer.Panel2.Controls.Add(this.samplesGroupBox);
    171       this.splitContainer.Size = new System.Drawing.Size(728, 614);
    172       this.splitContainer.SplitterDistance = 406;
     169      this.splitContainer.Size = new System.Drawing.Size(728, 640);
     170      this.splitContainer.SplitterDistance = 392;
    173171      this.splitContainer.TabIndex = 0;
    174172      //
    … …  
    177175      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    178176      this.Controls.Add(this.splitContainer);
    179       this.Controls.Add(this.showStartPageCheckBox);
    180177      this.Name = "StartPage";
    181178      this.Size = new System.Drawing.Size(728, 640);
    182179      this.samplesGroupBox.ResumeLayout(false);
    183180      this.splitContainer.Panel1.ResumeLayout(false);
     181      this.splitContainer.Panel1.PerformLayout();
    184182      this.splitContainer.Panel2.ResumeLayout(false);
    185183      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
    186184      this.splitContainer.ResumeLayout(false);
    187185      this.ResumeLayout(false);
    188       this.PerformLayout();
    189186
    190187    }

  • branches/DataPreprocessing/HeuristicLab.Optimizer/3.3/StartPage.cs

    r10538 r11064  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2121
    2222using System;
     23using System.Collections.Generic;
    2324using System.IO;
    2425using System.Linq;
    … …  
    3435  [View("Start Page")]
    3536  public partial class StartPage : HeuristicLab.MainForm.WindowsForms.View {
     37    private const string StandardProblemsGroupName = "Standard Problems";
     38    private const string DataAnalysisGroupName = "Data Analysis";
     39    private const string ScriptsGroupName = "Scripts";
     40    private const string UncategorizedGroupName = "Uncategorized";
     41    private const string SampleNamePrefix = "HeuristicLab.Optimizer.Documents.";
     42    private const string SampleNameSuffix = ".hl";
     43
     44    private readonly Dictionary<ListViewGroup, List<string>> GroupLookup = new Dictionary<ListViewGroup, List<string>>();
     45    private readonly ListViewGroup StandardProblemsGroup = new ListViewGroup(StandardProblemsGroupName);
     46    private readonly ListViewGroup DataAnalysisGroup = new ListViewGroup(DataAnalysisGroupName);
     47    private readonly ListViewGroup ScriptsGroup = new ListViewGroup(ScriptsGroupName);
     48    private readonly ListViewGroup UncategorizedGroup = new ListViewGroup(UncategorizedGroupName);
     49
    3650    private IProgress progress;
    3751
    … …  
    5569
    5670      samplesListView.Enabled = false;
     71      samplesListView.Groups.Add(StandardProblemsGroup);
     72      samplesListView.Groups.Add(DataAnalysisGroup);
     73      samplesListView.Groups.Add(ScriptsGroup);
     74      samplesListView.Groups.Add(UncategorizedGroup);
     75      FillGroupLookup();
     76
    5777      showStartPageCheckBox.Checked = Properties.Settings.Default.ShowStartPage;
    5878
    … …  
    7191      progress = MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(samplesListView, "Loading...");
    7292      try {
    73         Assembly assembly = Assembly.GetExecutingAssembly();
    74         var samples = assembly.GetManifestResourceNames().Where(x => x.EndsWith(".hl"));
     93        var assembly = Assembly.GetExecutingAssembly();
     94        var samples = assembly.GetManifestResourceNames().Where(x => x.EndsWith(SampleNameSuffix));
    7595        int count = samples.Count();
    7696        string path = Path.GetTempFileName();
    7797
    78         foreach (string name in samples) {
    79           try {
    80             using (Stream stream = assembly.GetManifestResourceStream(name)) {
    81               WriteStreamToTempFile(stream, path);
    82               INamedItem item = XmlParser.Deserialize<INamedItem>(path);
    83               OnSampleLoaded(item, 1.0 / count);
    84             }
     98        foreach (var entry in GroupLookup) {
     99          var group = entry.Key;
     100          var sampleList = entry.Value;
     101          foreach (var sampleName in sampleList) {
     102            string resourceName = SampleNamePrefix + sampleName + SampleNameSuffix;
     103            LoadSample(resourceName, assembly, path, group, count);
    85104          }
    86           catch (Exception) {
    87           }
    88         }
     105        }
     106
     107        var categorizedSamples = GroupLookup.Select(x => x.Value).SelectMany(x => x).Select(x => SampleNamePrefix + x + SampleNameSuffix);
     108        var uncategorizedSamples = samples.Except(categorizedSamples);
     109
     110        foreach (var resourceName in uncategorizedSamples) {
     111          LoadSample(resourceName, assembly, path, UncategorizedGroup, count);
     112        }
     113
    89114        OnAllSamplesLoaded();
    90115      }
    … …  
    93118      }
    94119    }
    95     private void OnSampleLoaded(INamedItem sample, double progress) {
     120
     121    private void LoadSample(string name, Assembly assembly, string path, ListViewGroup group, int count) {
     122      try {
     123        using (var stream = assembly.GetManifestResourceStream(name)) {
     124          WriteStreamToTempFile(stream, path);
     125          var item = XmlParser.Deserialize<INamedItem>(path);
     126          OnSampleLoaded(item, group, 1.0 / count);
     127        }
     128      }
     129      catch (Exception) { }
     130    }
     131
     132    private void FillGroupLookup() {
     133      var standardProblems = new List<string>(
     134        new[] { "ES_Griewank", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
     135                "IslandGA_TSP", "LS_Knapsack", "PSO_Schwefel", "RAPGA_JSSP",
     136                "SA_Rastrigin", "SGP_SantaFe","GP_Multiplexer", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_TSP"
     137        });
     138      GroupLookup[StandardProblemsGroup] = standardProblems;
     139      var dataAnalysisProblems = new List<string>(new[] { "GE_SymbReg", "GPR", "SGP_SymbClass", "SGP_SymbReg" });
     140      GroupLookup[DataAnalysisGroup] = dataAnalysisProblems;
     141      var scripts = new List<string>(new[] { "GA_QAP_Script", "GUI_Automation_Script", "OSGA_Rastrigin_Script" });
     142      GroupLookup[ScriptsGroup] = scripts;
     143    }
     144
     145    private void OnSampleLoaded(INamedItem sample, ListViewGroup group, double progress) {
    96146      if (InvokeRequired)
    97         Invoke(new Action<INamedItem, double>(OnSampleLoaded), sample, progress);
     147        Invoke(new Action<INamedItem, ListViewGroup, double>(OnSampleLoaded), sample, group, progress);
    98148      else {
    99         ListViewItem item = new ListViewItem(new string[] { sample.Name, sample.Description });
     149        ListViewItem item = new ListViewItem(new string[] { sample.Name, sample.Description }, group);
    100150        item.ToolTipText = sample.ItemName + ": " + sample.ItemDescription;
    101151        samplesListView.SmallImageList.Images.Add(sample.ItemImage);
Note: See TracChangeset for help on using the changeset viewer.