Changeset 10068 for branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/GEArtificialAntEvaluator.cs

Timestamp:

10/20/13 18:44:04 (11 years ago)

Author:

sawinkle

Message:

#2109:

• Removed the parameters MaxFunctionDefinitions and MaxFunctionArguments from GEArtificialAntProblem.cs, because automatically defined functions (adf) won't be supported by the Grammatical Evolution implementation of the Artificial Ant problem.
• Switched from SharpDevelop to Visual Studio 2012 and installed 'Productivity Power Tools 2012'. This extension includes the options 'Format Document on save' and 'Remove and Sort Usings on save', so that some usings were deleted, sorted and the formating changed slightly. Furthermore 'Visual Studio 2010 text editor settings.vssettings' were included.
• Added new folders ArtificialAnt and Symbolic to separate the files for the ArtificialAnt problem and the Symbolic Regression problem (single objective).

File:

• branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/GEArtificialAntEvaluator.cs (modified) (4 diffs)

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/GEArtificialAntEvaluator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Problems.ArtificialAnt;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Encodings.IntegerVectorEncoding;
+using HeuristicLab.Problems.ArtificialAnt;
 using HeuristicLab.Problems.GrammaticalEvolution.Mappers;
 
@@ -38 +38 @@
     ISingleObjectiveEvaluator, ISymbolicExpressionTreeGrammarBasedOperator {
 
-    #region Parameter Properties
+    #region Parameter Properties
     public ILookupParameter<DoubleValue> QualityParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
-    // genotype:
-    public ILookupParameter<IntegerVector> IntegerVectorParameter {
+    // genotype:
+    public ILookupParameter<IntegerVector> IntegerVectorParameter {
       get { return (ILookupParameter<IntegerVector>)Parameters["IntegerVector"]; }
     }
-    // phenotype:
+    // phenotype:
     public ILookupParameter<SymbolicExpressionTree> SymbolicExpressionTreeParameter {
       get { return (ILookupParameter<SymbolicExpressionTree>)Parameters["SymbolicExpressionTree"]; }
@@ -56 +56 @@
       get { return (ILookupParameter<IntValue>)Parameters["MaxTimeSteps"]; }
     }
-    public IValueLookupParameter<ISymbolicExpressionGrammar> SymbolicExpressionTreeGrammarParameter {
+    public IValueLookupParameter<ISymbolicExpressionGrammar> SymbolicExpressionTreeGrammarParameter {
       get { return (IValueLookupParameter<ISymbolicExpressionGrammar>)Parameters["SymbolicExpressionTreeGrammar"]; }
     }
-    // genotype-to-phenotype-mapper:
-    public ILookupParameter<IGenotypeToPhenotypeMapper> GenotypeToPhenotypeMapperParameter {
+    // genotype-to-phenotype-mapper:
+    public ILookupParameter<IGenotypeToPhenotypeMapper> GenotypeToPhenotypeMapperParameter {
       get { return (ILookupParameter<IGenotypeToPhenotypeMapper>)Parameters["GenotypeToPhenotypeMapper"]; }
     }
-    #endregion
-  
+    #endregion
+
     [StorableConstructor]
     protected GEArtificialAntEvaluator(bool deserializing) : base(deserializing) { }
@@ -81 +81 @@
 
     public sealed override IOperation Apply() {
-      SymbolicExpressionTree expression = GenotypeToPhenotypeMapperParameter.ActualValue.Map (
+      SymbolicExpressionTree expression = GenotypeToPhenotypeMapperParameter.ActualValue.Map(
         SymbolicExpressionTreeGrammarParameter.ActualValue,
-        IntegerVectorParameter.ActualValue        
+        IntegerVectorParameter.ActualValue
       );
       SymbolicExpressionTreeParameter.ActualValue = expression;
       BoolMatrix world = WorldParameter.ActualValue;
       IntValue maxTimeSteps = MaxTimeStepsParameter.ActualValue;
- 
+
       AntInterpreter interpreter = new AntInterpreter();
-      interpreter.MaxTimeSteps   = maxTimeSteps.Value;
-      interpreter.World          = world;
-      interpreter.Expression     = expression;
+      interpreter.MaxTimeSteps = maxTimeSteps.Value;
+      interpreter.World = world;
+      interpreter.Expression = expression;
       interpreter.Run();