#2526: Merged r14203, r14204, r14206, r14207, r14209 into stable

git-svn-id: https://src.heuristiclab.com/svn/core/stable@14211 2abd9481-f8db-48e9-bd25-06bc13291c1b
heal-research · Jul 23, 2016 · 7ed52e9 · 7ed52e9
1 parent 14a7ac6
commit 7ed52e9
Show file tree

Hide file tree

Showing 42 changed files with 29 additions and 9 deletions.
diff --git a/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj b/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj
@@ -169,7 +169,9 @@
     <Compile Include="SlaveStatusInfo.cs" />
     <Compile Include="StatusCommons.cs" />
     <Compile Include="WcfService.cs" />
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Plugin.cs.frame" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -188,9 +190,9 @@
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
 set Outdir=$(Outdir)
+set TargetDir=$(TargetDir)
 set Platform=$(PlatformName)
 set Configuration=$(ConfigurationName)
-set TargetDir=$(ProjectDir)
 
 call "$(SolutionDir)MergeConfigs.cmd"</PostBuildEvent>
   </PropertyGroup>

diff --git a/HeuristicLab.Optimizer/3.3/Documents/ALPSGA_TSP.hl b/HeuristicLab.Optimizer/3.3/Documents/ALPSGA_TSP.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/ALPSGP_SymReg.hl b/HeuristicLab.Optimizer/3.3/Documents/ALPSGP_SymReg.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/ES_Griewank.hl b/HeuristicLab.Optimizer/3.3/Documents/ES_Griewank.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GA_BPP.hl b/HeuristicLab.Optimizer/3.3/Documents/GA_BPP.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GA_Grouping.hl b/HeuristicLab.Optimizer/3.3/Documents/GA_Grouping.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GA_QAP_Script.hl b/HeuristicLab.Optimizer/3.3/Documents/GA_QAP_Script.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GA_TSP.hl b/HeuristicLab.Optimizer/3.3/Documents/GA_TSP.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GA_VRP.hl b/HeuristicLab.Optimizer/3.3/Documents/GA_VRP.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GE_ArtificialAnt.hl b/HeuristicLab.Optimizer/3.3/Documents/GE_ArtificialAnt.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GE_SymbReg.hl b/HeuristicLab.Optimizer/3.3/Documents/GE_SymbReg.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GPR.hl b/HeuristicLab.Optimizer/3.3/Documents/GPR.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GP_Multiplexer.hl b/HeuristicLab.Optimizer/3.3/Documents/GP_Multiplexer.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GUI_Automation_Script.hl b/HeuristicLab.Optimizer/3.3/Documents/GUI_Automation_Script.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Classification_Script.hl b/HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Classification_Script.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Regression_Script.hl b/HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Regression_Script.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GridSearch_SVM_Classification_Script.hl b/HeuristicLab.Optimizer/3.3/Documents/GridSearch_SVM_Classification_Script.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/GridSearch_SVM_Regression_Script.hl b/HeuristicLab.Optimizer/3.3/Documents/GridSearch_SVM_Regression_Script.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/IslandGA_TSP.hl b/HeuristicLab.Optimizer/3.3/Documents/IslandGA_TSP.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/LS_Knapsack.hl b/HeuristicLab.Optimizer/3.3/Documents/LS_Knapsack.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/OSES_Griewank.hl b/HeuristicLab.Optimizer/3.3/Documents/OSES_Griewank.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/OSGA_Rastrigin_Script.hl b/HeuristicLab.Optimizer/3.3/Documents/OSGA_Rastrigin_Script.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/OSGP_TimeSeries.hl b/HeuristicLab.Optimizer/3.3/Documents/OSGP_TimeSeries.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/PSO_Schwefel.hl b/HeuristicLab.Optimizer/3.3/Documents/PSO_Schwefel.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/RAPGA_JSSP.hl b/HeuristicLab.Optimizer/3.3/Documents/RAPGA_JSSP.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/SA_Rastrigin.hl b/HeuristicLab.Optimizer/3.3/Documents/SA_Rastrigin.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/SGP_Robocode.hl b/HeuristicLab.Optimizer/3.3/Documents/SGP_Robocode.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/SGP_SantaFe.hl b/HeuristicLab.Optimizer/3.3/Documents/SGP_SantaFe.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/SGP_SymbClass.hl b/HeuristicLab.Optimizer/3.3/Documents/SGP_SymbClass.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/SGP_SymbReg.hl b/HeuristicLab.Optimizer/3.3/Documents/SGP_SymbReg.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/SS_VRP.hl b/HeuristicLab.Optimizer/3.3/Documents/SS_VRP.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/TS_TSP.hl b/HeuristicLab.Optimizer/3.3/Documents/TS_TSP.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/TS_VRP.hl b/HeuristicLab.Optimizer/3.3/Documents/TS_VRP.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/VNS_OP.hl b/HeuristicLab.Optimizer/3.3/Documents/VNS_OP.hl
diff --git a/HeuristicLab.Optimizer/3.3/Documents/VNS_TSP.hl b/HeuristicLab.Optimizer/3.3/Documents/VNS_TSP.hl
diff --git a/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj b/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj
@@ -149,6 +149,8 @@
     <EmbeddedResource Include="Documents\ALPSGP_SymReg.hl" />
     <EmbeddedResource Include="Documents\ALPSGA_TSP.hl" />
     <EmbeddedResource Include="Documents\GA_BPP.hl" />
+    <EmbeddedResource Include="Documents\OSES_Griewank.hl" />
+    <EmbeddedResource Include="Documents\SGP_Robocode.hl" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="OptimizerSingleDocumentMainForm.cs">
       <SubType>Form</SubType>

diff --git a/HeuristicLab.Optimizer/3.3/StartPage.cs b/HeuristicLab.Optimizer/3.3/StartPage.cs
@@ -132,9 +132,9 @@ private void LoadSample(string name, Assembly assembly, ListViewGroup group, int
     }
 
     private void FillGroupLookup() {
-      var standardProblems = new List<string> { "ALPSGA_TSP", "ES_Griewank", "GA_Grouping", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
+      var standardProblems = new List<string> { "ALPSGA_TSP", "ES_Griewank", "OSES_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", "GA_BPP"
+                "SA_Rastrigin", "SGP_SantaFe", "GP_Multiplexer", "SGP_Robocode", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP", "VNS_TSP", "GA_BPP"
         };
       groupLookup[standardProblemsGroup] = standardProblems;
       var dataAnalysisProblems = new List<string> { "ALPSGP_SymReg", "SGP_SymbClass", "SGP_SymbReg", "OSGP_TimeSeries", "GE_SymbReg", "GPR" };

diff --git a/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs b/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs
@@ -52,6 +52,8 @@ public DeepCloneableCloningTest() {
 
       foreach (var symbolType in ApplicationManager.Manager.GetTypes(typeof(HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbol)))
         excludedTypes.Add(symbolType);
+      // SimpleSymbol is a non-discoverable type and thus needs to be added manually
+      excludedTypes.Add(typeof(HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.SimpleSymbol));
       foreach (var grammarType in ApplicationManager.Manager.GetTypes(typeof(HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.SymbolicExpressionGrammarBase)))
         excludedTypes.Add(grammarType);
     }

diff --git a/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPRobocodeSampleTest.cs b/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPRobocodeSampleTest.cs
@@ -22,6 +22,7 @@
 using System.IO;
 using System.Linq;
 using HeuristicLab.Algorithms.GeneticAlgorithm;
+using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.Problems.GeneticProgramming.Robocode;
@@ -48,12 +49,14 @@ public GeneticAlgorithm CreateGpRobocodeSample() {
       GeneticAlgorithm ga = new GeneticAlgorithm();
 
       #region Problem Configuration
-      Problem antProblem = new Problem();
+      Problem robocodeProblem = new Problem();
+      if (!robocodeProblem.Enemies.CheckedItems.Any())
+        robocodeProblem.Enemies.Add(new StringValue("sample.Crazy"));
       #endregion
       #region Algorithm Configuration
       ga.Name = "Genetic Programming - Robocode Java Source";
       ga.Description = "A standard genetic programming algorithm to evolve the java source code for a robocode bot (see http://robocode.sourceforge.net/). An installation of Java SE Developmen Kit (JDK) >= 1.6 is necessary to run this sample.";
-      ga.Problem = antProblem;
+      ga.Problem = robocodeProblem;
       SamplesUtils.ConfigureGeneticAlgorithmParameters<TournamentSelector, SubtreeCrossover, MultiSymbolicExpressionTreeArchitectureManipulator>(
         ga, 50, 1, 50, 0.15, 2);
 

diff --git a/HeuristicLab/3.3/HeuristicLab-3.3.csproj b/HeuristicLab/3.3/HeuristicLab-3.3.csproj
@@ -224,5 +224,16 @@ export TargetDir=$(TargetDir)
 
 $SolutionDir/MergeConfigs.sh
 </PostBuildEvent>
-  </PropertyGroup> 
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set OutDir=$(OutDir)
+set TargetDir=$(TargetDir)
+set Platform=$(PlatformName)
+set Configuration=$(ConfigurationName)
+
+call "$(SolutionDir)MergeConfigs.cmd"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/MergeConfigs.cmd b/MergeConfigs.cmd
@@ -6,7 +6,7 @@ IF "%TargetDir%"=="" (
 )
 
 echo Recreating HeuristicLab 3.3.exe.config...
-copy /Y "%TargetDir%app.config" "%TargetDir%HeuristicLab 3.3.exe.config"
+copy /Y "%SolutionDir%\HeuristicLab\3.3\app.config" "%TargetDir%HeuristicLab 3.3.exe.config"
 
 echo Merging...
 FOR /F "tokens=*" %%A IN ('dir /B "%TargetDir%*.dll.config"') DO (

diff --git a/MergeConfigs.sh b/MergeConfigs.sh
@@ -3,7 +3,7 @@ if [ "${TargetDir}" == "" ]; then
 fi
 
 echo Recreating HeuristicLab 3.3.exe.config...
-cp $TargetDir/app.config "$TargetDir/HeuristicLab 3.3.exe.config"
+cp $SolutionDir/HeuristicLab/3.3/app.config "$TargetDir/HeuristicLab 3.3.exe.config"
 
 echo Merging...
 for f in $(ls $TargetDir/*.dll.config); do