Changeset 11048 for trunk/sources

Timestamp:

06/25/14 14:59:50 (11 years ago)

Author:

jkarder

Message:

#2195:

• redesigned start page
• added scripting samples

Location:

trunk/sources/HeuristicLab.Optimizer/3.3

Files:

• Documents/GA_QAP_Script.hl (added)
• Documents/GUI_Automation_Script.hl (added)
• Documents/OSGA_Rastrigin_Script.hl (added)
• HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)
• StartPage.Designer.cs (modified) (7 diffs)
• StartPage.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -130 +130 @@
     <EmbeddedResource Include="Documents\GE_ArtificialAnt.hl" />
     <EmbeddedResource Include="Documents\GE_SymbReg.hl" />
+    <EmbeddedResource Include="Documents\GA_QAP_Script.hl" />
+    <EmbeddedResource Include="Documents\GUI_Automation_Script.hl" />
+    <EmbeddedResource Include="Documents\OSGA_Rastrigin_Script.hl" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="OptimizerSingleDocumentMainForm.cs">

trunk/sources/HeuristicLab.Optimizer/3.3/StartPage.Designer.cs

@@ -86 +86 @@
       this.firstStepsRichTextBox.Name = "firstStepsRichTextBox";
       this.firstStepsRichTextBox.ReadOnly = true;
-      this.firstStepsRichTextBox.Size = new System.Drawing.Size(725, 370);
+      this.firstStepsRichTextBox.Size = new System.Drawing.Size(389, 581);
       this.firstStepsRichTextBox.TabIndex = 1;
       this.firstStepsRichTextBox.Text = "First Steps";
@@ -98 +98 @@
       this.titleLabel.Location = new System.Drawing.Point(-1, 0);
       this.titleLabel.Name = "titleLabel";
-      this.titleLabel.Size = new System.Drawing.Size(729, 30);
+      this.titleLabel.Size = new System.Drawing.Size(393, 30);
       this.titleLabel.TabIndex = 0;
       this.titleLabel.Text = "Title";
@@ -111 +111 @@
       this.samplesGroupBox.Location = new System.Drawing.Point(0, 3);
       this.samplesGroupBox.Name = "samplesGroupBox";
-      this.samplesGroupBox.Size = new System.Drawing.Size(728, 201);
+      this.samplesGroupBox.Size = new System.Drawing.Size(332, 637);
       this.samplesGroupBox.TabIndex = 0;
       this.samplesGroupBox.TabStop = false;
@@ -127 +127 @@
       this.samplesListView.Name = "samplesListView";
       this.samplesListView.ShowItemToolTips = true;
-      this.samplesListView.Size = new System.Drawing.Size(722, 182);
+      this.samplesListView.Size = new System.Drawing.Size(326, 618);
       this.samplesListView.SmallImageList = this.imageList;
       this.samplesListView.Sorting = System.Windows.Forms.SortOrder.Ascending;
@@ -154 +154 @@
       // splitContainer
       // 
-      this.splitContainer.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.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
       this.splitContainer.Location = new System.Drawing.Point(0, 0);
       this.splitContainer.Name = "splitContainer";
-      this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
       // 
       // splitContainer.Panel1
       // 
       this.splitContainer.Panel1.Controls.Add(this.titleLabel);
+      this.splitContainer.Panel1.Controls.Add(this.showStartPageCheckBox);
       this.splitContainer.Panel1.Controls.Add(this.firstStepsRichTextBox);
       // 
@@ -169 +167 @@
       // 
       this.splitContainer.Panel2.Controls.Add(this.samplesGroupBox);
-      this.splitContainer.Size = new System.Drawing.Size(728, 614);
-      this.splitContainer.SplitterDistance = 406;
+      this.splitContainer.Size = new System.Drawing.Size(728, 640);
+      this.splitContainer.SplitterDistance = 392;
       this.splitContainer.TabIndex = 0;
       // 
@@ -177 +175 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.splitContainer);
-      this.Controls.Add(this.showStartPageCheckBox);
       this.Name = "StartPage";
       this.Size = new System.Drawing.Size(728, 640);
       this.samplesGroupBox.ResumeLayout(false);
       this.splitContainer.Panel1.ResumeLayout(false);
+      this.splitContainer.Panel1.PerformLayout();
       this.splitContainer.Panel2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
       this.splitContainer.ResumeLayout(false);
       this.ResumeLayout(false);
-      this.PerformLayout();
 
     }

trunk/sources/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -34 +35 @@
   [View("Start Page")]
   public partial class StartPage : HeuristicLab.MainForm.WindowsForms.View {
+    private const string StandardProblemsGroupName = "Standard Problems";
+    private const string DataAnalysisGroupName = "Data Analysis";
+    private const string ScriptsGroupName = "Scripts";
+    private const string UncategorizedGroupName = "Uncategorized";
+    private const string SampleNamePrefix = "HeuristicLab.Optimizer.Documents.";
+    private const string SampleNameSuffix = ".hl";
+
+    private readonly Dictionary<ListViewGroup, List<string>> GroupLookup = new Dictionary<ListViewGroup, List<string>>();
+    private readonly ListViewGroup StandardProblemsGroup = new ListViewGroup(StandardProblemsGroupName);
+    private readonly ListViewGroup DataAnalysisGroup = new ListViewGroup(DataAnalysisGroupName);
+    private readonly ListViewGroup ScriptsGroup = new ListViewGroup(ScriptsGroupName);
+    private readonly ListViewGroup UncategorizedGroup = new ListViewGroup(UncategorizedGroupName);
+
     private IProgress progress;
 
@@ -55 +69 @@
 
       samplesListView.Enabled = false;
+      samplesListView.Groups.Add(StandardProblemsGroup);
+      samplesListView.Groups.Add(DataAnalysisGroup);
+      samplesListView.Groups.Add(ScriptsGroup);
+      samplesListView.Groups.Add(UncategorizedGroup);
+      FillGroupLookup();
+
       showStartPageCheckBox.Checked = Properties.Settings.Default.ShowStartPage;
 
@@ -71 +91 @@
       progress = MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(samplesListView, "Loading...");
       try {
-        Assembly assembly = Assembly.GetExecutingAssembly();
-        var samples = assembly.GetManifestResourceNames().Where(x => x.EndsWith(".hl"));
+        var assembly = Assembly.GetExecutingAssembly();
+        var samples = assembly.GetManifestResourceNames().Where(x => x.EndsWith(SampleNameSuffix));
         int count = samples.Count();
         string path = Path.GetTempFileName();
 
-        foreach (string name in samples) {
-          try {
-            using (Stream stream = assembly.GetManifestResourceStream(name)) {
-              WriteStreamToTempFile(stream, path);
-              INamedItem item = XmlParser.Deserialize<INamedItem>(path);
-              OnSampleLoaded(item, 1.0 / count);
-            }
+        foreach (var entry in GroupLookup) {
+          var group = entry.Key;
+          var sampleList = entry.Value;
+          foreach (var sampleName in sampleList) {
+            string resourceName = SampleNamePrefix + sampleName + SampleNameSuffix;
+            LoadSample(resourceName, assembly, path, group, count);
           }
-          catch (Exception) {
-          }
-        }
+        }
+
+        var categorizedSamples = GroupLookup.Select(x => x.Value).SelectMany(x => x).Select(x => SampleNamePrefix + x + SampleNameSuffix);
+        var uncategorizedSamples = samples.Except(categorizedSamples);
+
+        foreach (var resourceName in uncategorizedSamples) {
+          LoadSample(resourceName, assembly, path, UncategorizedGroup, count);
+        }
+
         OnAllSamplesLoaded();
       }
@@ -93 +118 @@
       }
     }
-    private void OnSampleLoaded(INamedItem sample, double progress) {
+
+    private void LoadSample(string name, Assembly assembly, string path, ListViewGroup group, int count) {
+      try {
+        using (var stream = assembly.GetManifestResourceStream(name)) {
+          WriteStreamToTempFile(stream, path);
+          var item = XmlParser.Deserialize<INamedItem>(path);
+          OnSampleLoaded(item, group, 1.0 / count);
+        }
+      }
+      catch (Exception) { }
+    }
+
+    private void FillGroupLookup() {
+      var standardProblems = new List<string>(
+        new[] { "ES_Griewank", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
+                "IslandGA_TSP", "LS_Knapsack", "PSO_Schwefel", "RAPGA_JSSP",
+                "SA_Rastrigin", "SGP_SantaFe", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_TSP"
+        });
+      GroupLookup[StandardProblemsGroup] = standardProblems;
+      var dataAnalysisProblems = new List<string>(new[] { "GE_SymbReg", "GPR", "SGP_SymbClass", "SGP_SymbReg" });
+      GroupLookup[DataAnalysisGroup] = dataAnalysisProblems;
+      var scripts = new List<string>(new[] { "GA_QAP_Script", "GUI_Automation_Script", "OSGA_Rastrigin_Script" });
+      GroupLookup[ScriptsGroup] = scripts;
+    }
+
+    private void OnSampleLoaded(INamedItem sample, ListViewGroup group, double progress) {
       if (InvokeRequired)
-        Invoke(new Action<INamedItem, double>(OnSampleLoaded), sample, progress);
+        Invoke(new Action<INamedItem, ListViewGroup, double>(OnSampleLoaded), sample, group, progress);
       else {
-        ListViewItem item = new ListViewItem(new string[] { sample.Name, sample.Description });
+        ListViewItem item = new ListViewItem(new string[] { sample.Name, sample.Description }, group);
         item.ToolTipText = sample.ItemName + ": " + sample.ItemDescription;
         samplesListView.SmallImageList.Images.Add(sample.ItemImage);