Changeset 12747 for stable/HeuristicLab.Optimizer

Timestamp:

07/12/15 16:00:20 (9 years ago)

Author:

ascheibe

Message:

#2427 merged r12743 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimizer (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/Documents/GA_Grouping.hl (copied) (copied from trunk/sources/HeuristicLab.Optimizer/3.3/Documents/GA_Grouping.hl)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/StartPage.cs (modified) (5 diffs)

stable/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -146 +146 @@
     <EmbeddedResource Include="Documents\GridSearch_SVM_Regression_Script.hl" />
     <EmbeddedResource Include="Documents\VNS_OP.hl" />
+    <EmbeddedResource Include="Documents\GA_Grouping.hl" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="OptimizerSingleDocumentMainForm.cs">

stable/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -65 +65 @@
         using (Stream stream = assembly.GetManifestResourceStream(typeof(StartPage), "Documents.FirstSteps.rtf"))
           firstStepsRichTextBox.LoadFile(stream, RichTextBoxStreamType.RichText);
-      }
-      catch (Exception) { }
+      } catch (Exception) { }
 
       samplesListView.Enabled = false;
@@ -112 +111 @@
 
         OnAllSamplesLoaded();
-      }
-      finally {
+      } finally {
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(samplesListView);
       }
@@ -126 +124 @@
           OnSampleLoaded(item, group, 1.0 / count);
         }
-      }
-      catch (Exception) {
-      }
-      finally {
+      } catch (Exception) {
+      } finally {
         if (File.Exists(path)) {
           File.Delete(path); // make sure we remove the temporary file
@@ -137 +133 @@
 
     private void FillGroupLookup() {
-      var standardProblems = new List<string> { "ES_Griewank", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
+      var standardProblems = new List<string> { "ES_Griewank", "GA_Grouping", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
                 "IslandGA_TSP", "LS_Knapsack", "PSO_Schwefel", "RAPGA_JSSP",
                 "SA_Rastrigin", "SGP_SantaFe","GP_Multiplexer", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP" ,"VNS_TSP"
@@ -185 +181 @@
           mainForm.SetWaitCursor();
           mainForm.ShowContent((IContent)((IItem)samplesListView.SelectedItems[0].Tag).Clone());
-        }
-        finally {
+        } finally {
           mainForm.ResetWaitCursor();
         }