Changeset 12898

Timestamp:

08/25/15 12:30:13 (9 years ago)

Author:

gkronber

Message:

#2421: derived ArtificialAntProblem from SymbolicExpressionTreeProblem (see #2469)

Location:

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.5

Files:

• ArtificialAntProblem.cs (modified) (4 diffs)
• HeuristicLab.Problems.ArtificialAnt-3.5.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.5/ArtificialAntProblem.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
@@ -28 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.ArtificialAnt.Analyzers;
 
@@ -38 +35 @@
   [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 170)]
   [StorableClass]
-  public sealed class ArtificialAntProblem : SingleObjectiveBasicProblem<SymbolicExpressionTreeEncoding>, IStorableContent {
+  public sealed class ArtificialAntProblem : SymbolicExpressionTreeProblem, IStorableContent {
     public string Filename { get; set; }
 
@@ -123 +120 @@
 
 
-    public override double Evaluate(Individual individual, IRandom random) {
-      var interpreter = new AntInterpreter(individual.SymbolicExpressionTree(), World, MaxTimeSteps.Value);
+    public override double Evaluate(ISymbolicExpressionTree tree, IRandom random) {
+      var interpreter = new AntInterpreter(tree, World, MaxTimeSteps.Value);
       interpreter.Run();
       return interpreter.FoodEaten;

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.5/HeuristicLab.Problems.ArtificialAnt-3.5.csproj

@@ -104 +104 @@
     </Reference>
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>