Changeset 9971

Timestamp:

09/16/13 16:01:05 (11 years ago)

Author:

ascheibe

Message:

#2069 added a view for displaying/reloading enemies

Location:

branches/Robocode.TrunkInt

Files:

• HeuristicLab.Problems.Robocode.Views/3.3/EnemyCollectionView.Designer.cs (added)
• HeuristicLab.Problems.Robocode.Views/3.3/EnemyCollectionView.cs (added)
• HeuristicLab.Problems.Robocode.Views/3.3/HeuristicLab.Problems.Robocode.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.Robocode.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.Robocode/3.3/BestSolutionAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.Robocode/3.3/EnemyCollection.cs (added)
• HeuristicLab.Problems.Robocode/3.3/HeuristicLab.Problems.Robocode-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Robocode/3.3/Interpreter.cs (modified) (1 diff)
• HeuristicLab.Problems.Robocode/3.3/RobocodeEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.Robocode/3.3/RobocodeProblem.cs (modified) (7 diffs)
• HeuristicLab.Problems.Robocode/3.3/Solution.cs (modified) (3 diffs)

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode.Views/3.3/HeuristicLab.Problems.Robocode.Views-3.3.csproj

@@ -46 +46 @@
     <Reference Include="HeuristicLab.Common-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -103 +108 @@
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
+    <Compile Include="EnemyCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EnemyCollectionView.Designer.cs">
+      <DependentUpon>EnemyCollectionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="SolutionCodeView.cs">
       <SubType>UserControl</SubType>

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode.Views/3.3/Plugin.cs.frame

@@ -37 +37 @@
     [PluginDependency("HeuristicLab.Operators", "3.3")]
     [PluginDependency("HeuristicLab.Common", "3.3")]
+    [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
     [PluginDependency("HeuristicLab.Collections", "3.3")]
     [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/BestSolutionAnalyzer.cs

@@ -65 +65 @@
       get { return (ILookupParameter<IntValue>)Parameters[NrOfRoundsParameterName]; }
     }
-    public ILookupParameter<ICheckedItemList<StringValue>> EnemiesParameter {
-      get { return (ILookupParameter<ICheckedItemList<StringValue>>)Parameters[EnemiesParameterName]; }
+    public ILookupParameter<EnemyCollection> EnemiesParameter {
+      get { return (ILookupParameter<EnemyCollection>)Parameters[EnemiesParameterName]; }
     }
     #endregion
@@ -82 +82 @@
       Parameters.Add(new LookupParameter<DirectoryValue>(RobocodePathParamaterName, "Path of the Robocode installation."));
       Parameters.Add(new LookupParameter<IntValue>(NrOfRoundsParameterName, "Nr. of Rounds a Robot has to fight against each opponent."));
-      Parameters.Add(new LookupParameter<ICheckedItemList<StringValue>>(EnemiesParameterName, "The enemies that should be battled."));
+      Parameters.Add(new LookupParameter<EnemyCollection>(EnemiesParameterName, "The enemies that should be battled."));
     }
 

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/HeuristicLab.Problems.Robocode-3.3.csproj

@@ -101 +101 @@
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />
+    <Compile Include="EnemyCollection.cs" />
     <Compile Include="RobocodeEvaluator.cs" />
     <Compile Include="Grammar.cs" />

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Interpreter.cs

@@ -32 +32 @@
 namespace HeuristicLab.Problems.Robocode {
   public static class Interpreter {
-    public static double EvaluateTankProgram(ISymbolicExpressionTree tree, string path, ICheckedItemList<StringValue> enemies, string robotName = null, bool showUI = false, int nrOfRounds = 3) {
+    public static double EvaluateTankProgram(ISymbolicExpressionTree tree, string path, EnemyCollection enemies, string robotName = null, bool showUI = false, int nrOfRounds = 3) {
       if (robotName == null)
         robotName = GenerateRobotName();

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/RobocodeEvaluator.cs

@@ -52 +52 @@
       get { return (ILookupParameter<IntValue>)Parameters[NrOfRoundsParameterName]; }
     }
-    public ILookupParameter<ICheckedItemList<StringValue>> EnemiesParameter {
-      get { return (ILookupParameter<ICheckedItemList<StringValue>>)Parameters[EnemiesParameterName]; }
+    public ILookupParameter<EnemyCollection> EnemiesParameter {
+      get { return (ILookupParameter<EnemyCollection>)Parameters[EnemiesParameterName]; }
     }
     #endregion
@@ -67 +67 @@
       Parameters.Add(new LookupParameter<DirectoryValue>(RobocodePathParamaterName, "Path of the Robocode installation."));
       Parameters.Add(new LookupParameter<IntValue>(NrOfRoundsParameterName, "Nr. of Rounds a Robot has to fight against each opponent."));
-      Parameters.Add(new LookupParameter<ICheckedItemList<StringValue>>(EnemiesParameterName, "The enemies that should be battled."));
+      Parameters.Add(new LookupParameter<EnemyCollection>(EnemiesParameterName, "The enemies that should be battled."));
     }
 

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/RobocodeProblem.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using HeuristicLab.Common;
@@ -66 +63 @@
       get { return (IFixedValueParameter<IntValue>)Parameters[NrOfRoundsParameterName]; }
     }
-    public IValueParameter<ICheckedItemList<StringValue>> EnemiesParameter {
-      get { return (IValueParameter<ICheckedItemList<StringValue>>)Parameters[EnemiesParameterName]; }
+    public IValueParameter<EnemyCollection> EnemiesParameter {
+      get { return (IValueParameter<EnemyCollection>)Parameters[EnemiesParameterName]; }
     }
     #endregion
@@ -74 +71 @@
     protected RobocodeProblem(bool deserializing)
       : base(deserializing) {
+      if (deserializing) {
+        RegisterRobocodePathEvent();
+      }
     }
     protected RobocodeProblem(RobocodeProblem original, Cloner cloner)
       : base(original, cloner) {
+      RegisterRobocodePathEvent();
     }
 
@@ -84 +85 @@
       robocodeDir.Value = @"C:\robocode";
 
-      var robotList = ReloadEnemies(robocodeDir.Value);
+      var robotList = EnemyCollection.ReloadEnemies(robocodeDir.Value);
+      robotList.RobocodePath = robocodeDir.Value;
 
       Parameters.Add(new FixedValueParameter<IntValue>(MaxTankProgramDepthParameterName, "Maximal depth of the Robocode tank program.", new IntValue(6)));
@@ -91 +93 @@
       Parameters.Add(new FixedValueParameter<DirectoryValue>(RobocodePathParamaterName, "Path of the Robocode installation.", robocodeDir));
       Parameters.Add(new FixedValueParameter<IntValue>(NrOfRoundsParameterName, "Nr. of Rounds a Robot has to fight against each opponent.", new IntValue(3)));
-      Parameters.Add(new ValueParameter<ICheckedItemList<StringValue>>(EnemiesParameterName, "The enemies that should be battled.", robotList));
+      Parameters.Add(new ValueParameter<EnemyCollection>(EnemiesParameterName, "The enemies that should be battled.", robotList));
 
       Maximization.Value = true;
@@ -99 +101 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new RobocodeProblem(this, cloner);
-    }
-
-    private ICheckedItemList<StringValue> ReloadEnemies(string robocodeDir) {
-      var robotsDir = new DirectoryInfo(Path.Combine(robocodeDir, "robots"));
-      var robotFiles = robotsDir.GetFiles("*", SearchOption.AllDirectories)
-                                .Where(x => x.Extension == ".class" || x.Extension == ".jar");
-      var robotSet = new Dictionary<string, StringValue>();
-      foreach (var robot in robotFiles) {
-        string robotName = Path.Combine(robot.DirectoryName, Path.GetFileNameWithoutExtension(robot.FullName));
-        robotName = robotName.Remove(0, robotsDir.FullName.Length);
-        string[] nameParts = robotName.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries);
-        robotName = string.Join(".", nameParts);
-        robotSet[robot.FullName] = new StringValue(robotName);
-      }
-      var robotList = new CheckedItemList<StringValue>(robotSet.Values);
-      foreach (var robot in robotList) {
-        robotList.SetItemCheckedState(robot, false);
-      }
-
-      return robotList;
     }
 
@@ -129 +111 @@
       ParameterizeOperators();
       ParameterizeAnalyzers();
+      RegisterRobocodePathEvent();
+    }
+
+    private void RegisterRobocodePathEvent() {
+      RobocodePathParameter.Value.StringValue.ValueChanged += RobocodePathParameter_ValueChanged;
+    }
+
+    void RobocodePathParameter_ValueChanged(object sender, System.EventArgs e) {
+      EnemiesParameter.Value.RobocodePath = RobocodePathParameter.Value.Value;
     }
 

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Solution.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -40 +39 @@
 
     [Storable]
-    public ICheckedItemList<StringValue> Enemies { get; set; }
+    public EnemyCollection Enemies { get; set; }
 
     [StorableConstructor]
@@ -52 +51 @@
     }
 
-    public Solution(ISymbolicExpressionTree tree, string path, int nrOfRounds, ICheckedItemList<StringValue> enemies)
+    public Solution(ISymbolicExpressionTree tree, string path, int nrOfRounds, EnemyCollection enemies)
       : base() {
       this.Tree = tree;