Changeset 14029 for branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3

Timestamp:

07/08/16 14:40:02 (8 years ago)

Author:

gkronber

Message:

#2434: merged trunk changes r12934:14026 from trunk to branch

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Interpreter.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Problem.cs (modified) (5 diffs)
• HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Trail.cs (modified) (3 diffs)
• HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression (copied) (copied from trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression)
• HeuristicLab.Problems.GeneticProgramming/3.3/Boolean (copied) (copied from trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean)
• HeuristicLab.Problems.GeneticProgramming/3.3/HeuristicLab.Problems.GeneticProgramming-3.3.csproj (modified) (6 diffs)
• HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Interpreter.cs (modified) (3 diffs)
• HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Problem.cs (modified) (3 diffs)
• HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Solution.cs (modified) (3 diffs)
• HeuristicLab.Problems.GeneticProgramming/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Problems.GeneticProgramming/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.GeneticProgramming/3.3/robocode (copied) (copied from trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/robocode)

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Interpreter.cs

@@ -32 +32 @@
     public int FoodEaten { get; private set; }
     public BoolMatrix World { get; private set; }
-
     public ISymbolicExpressionTree Expression { get; private set; }
 
+    public int ElapsedTime { get; set; }
 
-    public int ElapsedTime { get; set; }
     private int currentDirection;
     private int currentAntLocationRow;

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Problem.cs

@@ -22 +22 @@
 using System;
 using System.Diagnostics.Contracts;
-using System.Drawing.Text;
 using System.Linq;
 using HeuristicLab.Common;
@@ -38 +37 @@
   [StorableClass]
   public sealed class Problem : SymbolicExpressionTreeProblem, IStorableContent {
-    public string Filename { get; set; }
 
     #region constant for default world (Santa Fe)
@@ -104 +102 @@
     }
 
+    #region item cloning and persistence
+    // persistence
+    [StorableConstructor]
+    private Problem(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() { }
+
+    // cloning 
+    private Problem(Problem original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Problem(this, cloner);
+    }
+    #endregion
+
     public Problem()
       : base() {
@@ -114 +126 @@
       g.AddSymbols(new string[] { "IfFoodAhead", "Prog2" }, 2, 2);
       g.AddSymbols(new string[] { "Prog3" }, 3, 3);
-      g.AddTerminalSymbols(new string[] { "Left", "Right", "Move" });
+      g.AddTerminalSymbols(new string[] { "Move", "Left", "Right" });
       base.Encoding = new SymbolicExpressionTreeEncoding(g, 20, 10);
     }
@@ -137 +149 @@
     }
 
-    // persistence
-    [StorableConstructor]
-    private Problem(bool deserializing) : base(deserializing) { }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-    }
-
-    // cloning 
-    private Problem(Problem original, Cloner cloner)
-      : base(original, cloner) {
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Problem(this, cloner);
-    }
-
     #region helpers
     private bool[,] ToBoolMatrix(char[][] ch) {

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Trail.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Drawing;
 using HeuristicLab.Common;
@@ -54 +53 @@
     }
 
+    #region item cloning and persistence
     [StorableConstructor]
     private Solution(bool deserializing) : base(deserializing) { }
@@ -70 +70 @@
       return new Solution(this, cloner);
     }
+    #endregion
   }
 }

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/HeuristicLab.Problems.GeneticProgramming-3.3.csproj

@@ -104 +104 @@
     </Reference>
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
   </ItemGroup>
   <ItemGroup>
@@ -109 +111 @@
     <Compile Include="ArtificialAnt\Problem.cs" />
     <Compile Include="ArtificialAnt\Trail.cs" />
+    <Compile Include="BasicSymbolicRegression\Problem.cs" />
+    <Compile Include="Boolean\MultiplexerProblem.cs" />
+    <Compile Include="Boolean\EvenParityProblem.cs" />
     <Compile Include="LawnMower\Interpreter.cs" />
     <Compile Include="LawnMower\Problem.cs" />
@@ -114 +119 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="robocode\EnemyCollection.cs" />
+    <Compile Include="robocode\Grammar.cs" />
+    <Compile Include="robocode\Interpreter.cs" />
+    <Compile Include="robocode\Problem.cs" />
+    <Compile Include="robocode\Solution.cs" />
+    <Compile Include="robocode\Symbols\BooleanTreeNode.cs" />
+    <Compile Include="robocode\Symbols\BooleanValue.cs" />
+    <Compile Include="robocode\Symbols\CodeSymbol.cs" />
+    <Compile Include="robocode\Symbols\Number.cs" />
+    <Compile Include="robocode\Symbols\NumberTreeNode.cs" />
+    <Compile Include="robocode\Symbols\ShotPower.cs" />
+    <Compile Include="robocode\Symbols\ShotPowerTreeNode.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -119 +136 @@
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
+    <None Include="robocode\BattleObserver.class">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="robocode\BattleRunner.class">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="robocode\robocode.zip">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
@@ -174 +200 @@
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
+      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
+      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
+      <Name>HeuristicLab.Problems.Instances-3.3</Name>
       <Private>False</Private>
     </ProjectReference>
@@ -198 +234 @@
       <Install>true</Install>
     </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="robocode\BattleRunner.java" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Interpreter.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Problems.GeneticProgramming.LawnMower {
-  public class Interpreter {
+  public static class Interpreter {
     private enum Heading {
       South,
@@ -45 +45 @@
     }
 
-
     public static bool[,] EvaluateLawnMowerProgram(int length, int width, ISymbolicExpressionTree tree) {
-
       bool[,] lawn = new bool[length, width];
       var mowerState = new MowerState();
@@ -56 +54 @@
       return lawn;
     }
-
 
     private static Tuple<int, int> EvaluateLawnMowerProgram(ISymbolicExpressionTreeNode node, MowerState mowerState, bool[,] lawn, IEnumerable<ISymbolicExpressionTreeNode> adfs) {

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Problem.cs

@@ -50 +50 @@
     }
 
+    #region item cloning and persistence
     [StorableConstructor]
-    protected Problem(bool deserializing)
-      : base(deserializing) {
+    protected Problem(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() { }
+
+    protected Problem(Problem original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Problem(this, cloner);
     }
-    protected Problem(Problem original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    #endregion
+
     public Problem()
       : base() {
@@ -87 +92 @@
     }
 
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() { }
-
     public override double Evaluate(ISymbolicExpressionTree tree, IRandom random) {
       var length = LawnLengthParameter.Value.Value;
@@ -105 +106 @@
       return numberOfMowedCells;
     }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Problem(this, cloner);
-    }
   }
 }

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Solution.cs

@@ -37 +37 @@
     public double Quality { get; private set; }
 
+    #region item cloning and persistence
     [StorableConstructor]
     private Solution(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() { }
+
     private Solution(Solution original, Cloner cloner)
       : base(original, cloner) {
@@ -46 +50 @@
       this.Quality = original.Quality;
     }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Solution(this, cloner);
+    }
+    #endregion
 
     public Solution(ISymbolicExpressionTree tree, int length, int width, double quality)
@@ -54 +62 @@
       this.Quality = quality;
     }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Solution(this, cloner);
-    }
   }
 }

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/Plugin.cs.frame

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
 using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.GeneticProgramming {
-  [Plugin("HeuristicLab.Problems.GeneticProgramming","Provides implementations for genetic programming problems such as the artificial ant problem.", "3.3.0.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.GeneticProgramming","Provides implementations for genetic programming problems such as the artificial ant problem.", "3.3.13.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.GeneticProgramming-3.3.dll", PluginFileType.Assembly)]
+  [PluginFile("Robocode/robocode.zip", PluginFileType.Data)]
+  [PluginFile("Robocode/BattleRunner.class", PluginFileType.Data)]
+  [PluginFile("Robocode/BattleObserver.class", PluginFileType.Data)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
@@ -37 +41 @@
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
+  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   [PluginDependency("HeuristicLab.Random", "3.3")]
   public class HeuristicLabProblemsGeneticProgrammingPlugin : PluginBase {
+    public override void OnLoad() {
+        base.OnLoad();
+        if (!Directory.EnumerateDirectories(AppDomain.CurrentDomain.BaseDirectory, Path.Combine("Robocode", "libs"), SearchOption.TopDirectoryOnly).Any()) {
+          ZipFile.ExtractToDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Path.Combine("Robocode", "robocode.zip")), AppDomain.CurrentDomain.BaseDirectory);
+        }
+      }
   }
 }

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/Properties/AssemblyInfo.cs.frame

@@ -53 +53 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.0.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]