Changeset 13285 for stable/HeuristicLab.Optimizer

Timestamp:

11/19/15 11:56:45 (9 years ago)

Author:

ascheibe

Message:

#2269 merged r13214, r13217, r13223, r13224, r13226, r13228, r13231, r13232, r13260 into stable

Location:

stable

Files:

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

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

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

stable/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -133 +133 @@
 
     private void FillGroupLookup() {
-      var standardProblems = new List<string> { "ES_Griewank", "GA_Grouping", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
+      var standardProblems = new List<string> { "ALPSGA_TSP", "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"
+                "SA_Rastrigin", "SGP_SantaFe","GP_Multiplexer", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP", "VNS_TSP"
         };
       groupLookup[standardProblemsGroup] = standardProblems;
-      var dataAnalysisProblems = new List<string> { "SGP_SymbClass", "SGP_SymbReg", "OSGP_TimeSeries", "GE_SymbReg", "GPR" };
+      var dataAnalysisProblems = new List<string> { "ALPSGP_SymReg", "SGP_SymbClass", "SGP_SymbReg", "OSGP_TimeSeries", "GE_SymbReg", "GPR" };
       groupLookup[dataAnalysisGroup] = dataAnalysisProblems;
-      var scripts = new List<string> { "GA_QAP_Script", "GUI_Automation_Script", "OSGA_Rastrigin_Script", 
+      var scripts = new List<string> { "GA_QAP_Script", "GUI_Automation_Script", "OSGA_Rastrigin_Script",
                                        "GridSearch_RF_Classification_Script", "GridSearch_RF_Regression_Script",
                                        "GridSearch_SVM_Classification_Script", "GridSearch_SVM_Regression_Script" };