Changeset 14180 for stable/HeuristicLab.Optimizer

Timestamp:

07/22/16 14:25:28 (8 years ago)

Author:

gkronber

Message:

#2642: merged r14174,r14177,r14178,r14179 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimizer (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/Documents/GA_BPP.hl (copied) (copied from trunk/sources/HeuristicLab.Optimizer/3.3/Documents/GA_BPP.hl)
• HeuristicLab.Optimizer/3.3/Documents/TS_BPP.hl (deleted)
• 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

@@ -149 +149 @@
     <EmbeddedResource Include="Documents\ALPSGP_SymReg.hl" />
     <EmbeddedResource Include="Documents\ALPSGA_TSP.hl" />
-    <EmbeddedResource Include="Documents\TS_BPP.hl" />
+    <EmbeddedResource Include="Documents\GA_BPP.hl" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="OptimizerSingleDocumentMainForm.cs">

stable/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -135 +135 @@
       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", "TS_BPP"
+                "SA_Rastrigin", "SGP_SantaFe","GP_Multiplexer", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP", "VNS_TSP", "GA_BPP"
         };
       groupLookup[standardProblemsGroup] = standardProblems;