Changeset 9880 for branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/RobocodeEvaluator.cs

Timestamp:

08/13/13 12:11:18 (11 years ago)

Author:

ascheibe

Message:

#2069 removed dead code

File:

• branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/RobocodeEvaluator.cs (modified) (3 diffs)

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

@@ -20 +20 @@
 #endregion
 
-
-using System;
 using System.Threading;
-using System.Xml;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -36 +33 @@
   [StorableClass]
   [Item("Robocode Evaluator", "Evaluator for the Robocode GP problem.")]
-  public class RobocodeEvaluator : SingleSuccessorOperator,
-    ISingleObjectiveEvaluator {
-    #region parameter names
+  public class RobocodeEvaluator : SingleSuccessorOperator, ISingleObjectiveEvaluator {
     private const string QualityParameterName = "Quality";
     private const string TankProgramParameterName = "TankProgram";
     private const string RobocodePathParamaterName = "Path";
-    private const string CoevolutionParameterName = "Coevolution";
 
+    //TODO: this should be removed
+    public static SemaphoreSlim semaphore = new SemaphoreSlim(10);
 
-    private static string solutionTemplatePath = "";
-    public static string SolutionTemplate {
-      get { return solutionTemplatePath; }
-      set {
-        solutionTemplatePath = value;
-      }
-    }
-
-    public static SemaphoreSlim semaphore = new SemaphoreSlim(10);
-    #endregion
-
-
-    #region parameters
+    #region Parameters
     public ILookupParameter<DoubleValue> QualityParameter {
-      get {
-        return (ILookupParameter<DoubleValue>)
-                 Parameters[QualityParameterName];
-      }
+      get { return (ILookupParameter<DoubleValue>)Parameters[QualityParameterName]; }
     }
     public ILookupParameter<ISymbolicExpressionTree> TankProgramParameter {
-      get {
-        return (ILookupParameter<ISymbolicExpressionTree>)
-                 Parameters[TankProgramParameterName];
-      }
+      get { return (ILookupParameter<ISymbolicExpressionTree>)Parameters[TankProgramParameterName]; }
     }
     public ILookupParameter<StringValue> RobocodePathParameter {
-      get {
-        return (ILookupParameter<StringValue>)
-            Parameters[RobocodePathParamaterName];
-      }
-    }
-    public ILookupParameter<BoolValue> CoevolutionParameter {
-      get {
-        return (ILookupParameter<BoolValue>)
-            Parameters[CoevolutionParameterName];
-      }
+      get { return (ILookupParameter<StringValue>)Parameters[RobocodePathParamaterName]; }
     }
     #endregion
-
 
     [StorableConstructor]
     protected RobocodeEvaluator(bool deserializing) : base(deserializing) { }
     protected RobocodeEvaluator(RobocodeEvaluator original, Cloner cloner)
-      : base(original, cloner) {
+      : base(original, cloner) { }
+
+    public RobocodeEvaluator() {
+      Parameters.Add(new LookupParameter<DoubleValue>(QualityParameterName, "The solution quality of the Robocode tank program."));
+      Parameters.Add(new LookupParameter<ISymbolicExpressionTree>(TankProgramParameterName, "The Robocode tank program to evaluate represented as a symbolic expression tree."));
+      Parameters.Add(new LookupParameter<StringValue>(RobocodePathParamaterName, "Path of the Robocode installation."));
     }
 
-    // default constructor for the evaluator
-    public RobocodeEvaluator() {
-      Parameters.Add(
-        new LookupParameter<DoubleValue>(
-          QualityParameterName,
-          "The solution quality of the Robocode tank program."));
-      Parameters.Add(
-        new LookupParameter<ISymbolicExpressionTree>(
-          TankProgramParameterName,
-          "The Robocode tank program to evaluate represented as a " +
-          "symbolic expression tree."));
-      Parameters.Add(
-        new LookupParameter<StringValue>(
-          RobocodePathParamaterName,
-          "Path of the Robocode installation."));
-      Parameters.Add(
-          new LookupParameter<BoolValue>(
-              CoevolutionParameterName,
-              "Use Coevolution"));
-
-      SolutionTemplate = "../tank.xml";
-    }
-
-    // override the apply method to change the behaviour of the operator
-    // here we take trees as inputs and calculate qualities 
-    // (fitness evaluation)
     public override IOperation Apply() {
       semaphore.Wait();
 
       ISymbolicExpressionTree tree = TankProgramParameter.ActualValue;
-      //XmlDocument doc = new XmlDocument();
-      //doc.Load("../tank.xml");
-      XmlNode node = null;
       string path = RobocodePathParameter.ActualValue.Value;
-
-      if (CoevolutionParameter.ActualValue.Value) {
-        var trees = ExecutionContext.Parent.Scope.SubScopes;//SymbolicExpressionTreeParameter.ActualValue;
-        if (trees.Count == 2) {
-          trees = trees[0].SubScopes;
-          //treeCount = trees[0].SubScopes.Count;
-          //int selTreeCount = trees[1].SubScopes.Count;
-        }
-
-        Random random = new Random();
-        ScopeList chosenScopes = new ScopeList(5);
-        for (int i = 0; i < 5; i++) {
-          var newScope = trees.ToArray()[random.Next(0, trees.Count - 1)];
-          chosenScopes.Add(newScope);
-        }
-
-        //if (evaluations % 99 == 0)
-        //    evaluations = evaluations;
-
-        QualityParameter.ActualValue = new DoubleValue(Interpreter.EvaluateTankProgram(tree, chosenScopes, node, path));
-      } else
-        QualityParameter.ActualValue = new DoubleValue(Interpreter.EvaluateTankProgram(tree, node, path));
+      QualityParameter.ActualValue = new DoubleValue(Interpreter.EvaluateTankProgram(tree, path));
 
       semaphore.Release();
 
-      // important: return base.Apply() to make sure that the
-      // next operator is queued for execution
       return base.Apply();
     }
@@ -158 +79 @@
       return new RobocodeEvaluator(this, cloner);
     }
-
-    public bool EnabledByDefault {
-      get { return true; }
-    }
   }
 }