Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
4 edited
2 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Optimizer

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

    r12747 r13285  
    147147    <EmbeddedResource Include="Documents\VNS_OP.hl" />
    148148    <EmbeddedResource Include="Documents\GA_Grouping.hl" />
     149    <EmbeddedResource Include="Documents\ALPSGP_SymReg.hl" />
     150    <EmbeddedResource Include="Documents\ALPSGA_TSP.hl" />
    149151    <None Include="Plugin.cs.frame" />
    150152    <Compile Include="OptimizerSingleDocumentMainForm.cs">
  • stable/HeuristicLab.Optimizer/3.3/StartPage.cs

    r12747 r13285  
    133133
    134134    private void FillGroupLookup() {
    135       var standardProblems = new List<string> { "ES_Griewank", "GA_Grouping", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
     135      var standardProblems = new List<string> { "ALPSGA_TSP", "ES_Griewank", "GA_Grouping", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
    136136                "IslandGA_TSP", "LS_Knapsack", "PSO_Schwefel", "RAPGA_JSSP",
    137                 "SA_Rastrigin", "SGP_SantaFe","GP_Multiplexer", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP" ,"VNS_TSP"
     137                "SA_Rastrigin", "SGP_SantaFe","GP_Multiplexer", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP", "VNS_TSP"
    138138        };
    139139      groupLookup[standardProblemsGroup] = standardProblems;
    140       var dataAnalysisProblems = new List<string> { "SGP_SymbClass", "SGP_SymbReg", "OSGP_TimeSeries", "GE_SymbReg", "GPR" };
     140      var dataAnalysisProblems = new List<string> { "ALPSGP_SymReg", "SGP_SymbClass", "SGP_SymbReg", "OSGP_TimeSeries", "GE_SymbReg", "GPR" };
    141141      groupLookup[dataAnalysisGroup] = dataAnalysisProblems;
    142       var scripts = new List<string> { "GA_QAP_Script", "GUI_Automation_Script", "OSGA_Rastrigin_Script", 
     142      var scripts = new List<string> { "GA_QAP_Script", "GUI_Automation_Script", "OSGA_Rastrigin_Script",
    143143                                       "GridSearch_RF_Classification_Script", "GridSearch_RF_Regression_Script",
    144144                                       "GridSearch_SVM_Classification_Script", "GridSearch_SVM_Regression_Script" };
Note: See TracChangeset for help on using the changeset viewer.