Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/25/15 10:38:20 (9 years ago)
Author:
gkronber
Message:

#2421 new version of artificial ant problem that uses SymbolicExpressionTreeEncoding

Location:
trunk/sources/HeuristicLab.Problems.ArtificialAnt.Views/3.5
Files:
1 added
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.ArtificialAnt.Views/3.5/AntTrailSymbolicExpressionTreeView.Designer.cs

    r12012 r12895  
    4646    private void InitializeComponent() {
    4747      this.components = new System.ComponentModel.Container();
    48       this.animationTimer = new System.Windows.Forms.Timer(this.components);
    4948      this.symExpressionGroupBox = new System.Windows.Forms.GroupBox();
    5049      this.SuspendLayout();
    51       //
    52       // animationTimer
    53       //
    54       this.animationTimer.Interval = 15;
     50
    5551      //
    5652      // symExpressionGroupBox
    … …  
    7975    #endregion
    8076
    81     private System.Windows.Forms.Timer animationTimer;
    8277    private System.Windows.Forms.GroupBox symExpressionGroupBox;
    8378

  • trunk/sources/HeuristicLab.Problems.ArtificialAnt.Views/3.5/AntTrailSymbolicExpressionTreeView.cs

    r12012 r12895  
    3030  [Content(typeof(AntTrail), false)]
    3131  public sealed partial class AntTrailSymbolicExpressionTreeView : ItemView {
    32     private GraphicalSymbolicExpressionTreeView treeView;
     32    private readonly GraphicalSymbolicExpressionTreeView treeView;
    3333
    3434    public new AntTrail Content {
    … …  
    4444    }
    4545
    46     protected override void DeregisterContentEvents() {
    47       Content.SymbolicExpressionTreeChanged -= new EventHandler(Content_SymbolicExpressionTreeChanged);
    48       base.DeregisterContentEvents();
    49     }
    50     protected override void RegisterContentEvents() {
    51       base.RegisterContentEvents();
    52       Content.SymbolicExpressionTreeChanged += new EventHandler(Content_SymbolicExpressionTreeChanged);
    53     }
    54 
    5546    protected override void OnContentChanged() {
    5647      base.OnContentChanged();
    … …  
    6152      }
    6253    }
    63 
    64     void Content_SymbolicExpressionTreeChanged(object sender, EventArgs e) {
    65       if (InvokeRequired)
    66         Invoke(new EventHandler(Content_SymbolicExpressionTreeChanged), sender, e);
    67       else
    68         OnContentChanged();
    69     }
    7054  }
    7155}

  • trunk/sources/HeuristicLab.Problems.ArtificialAnt.Views/3.5/AntTrailView.cs

    r12012 r12895  
    4141    }
    4242
    43     protected override void DeregisterContentEvents() {
    44       Content.SymbolicExpressionTreeChanged -= new EventHandler(Content_SymbolicExpressionTreeChanged);
    45       base.DeregisterContentEvents();
    46     }
    47     protected override void RegisterContentEvents() {
    48       base.RegisterContentEvents();
    49       Content.SymbolicExpressionTreeChanged += new EventHandler(Content_SymbolicExpressionTreeChanged);
    50     }
    51 
    5243    protected override void OnContentChanged() {
    5344      base.OnContentChanged();
    … …  
    6960          int rows = Content.World.Rows;
    7061          int columns = Content.World.Columns;
    71           SymbolicExpressionTree expression = Content.SymbolicExpressionTree;
     62          var expression = Content.SymbolicExpressionTree;
    7263
    7364          DrawWorld();
    … …  
    7667            float cellWidth = pictureBox.Width / (float)columns;
    7768
    78             AntInterpreter interpreter = new AntInterpreter();
    79             interpreter.MaxTimeSteps = Content.MaxTimeSteps.Value;
    80             interpreter.Expression = Content.SymbolicExpressionTree;
    81             interpreter.World = Content.World;
     69            AntInterpreter interpreter = new AntInterpreter(Content.SymbolicExpressionTree, Content.World, Content.MaxTimeSteps);
    8270            int currentAntLocationColumn;
    8371            int currentAntLocationRow;
    … …  
    155143    }
    156144
    157     void Content_SymbolicExpressionTreeChanged(object sender, EventArgs e) {
    158       if (InvokeRequired)
    159         Invoke(new EventHandler(Content_SymbolicExpressionTreeChanged), sender, e);
    160       else
    161         GenerateImage();
    162     }
    163 
    164145    private void pictureBox_SizeChanged(object sender, EventArgs e) {
    165146      GenerateImage();
    … …  
    170151    private void playButton_Click(object sender, EventArgs e) {
    171152      playButton.Enabled = false;
    172       int rows = Content.World.Rows;
    173       int columns = Content.World.Columns;
    174       SymbolicExpressionTree expression = Content.SymbolicExpressionTree;
    175       var nodeStack = new Stack<SymbolicExpressionTreeNode>();
    176153
    177       animationInterpreter = new AntInterpreter();
    178       animationInterpreter.MaxTimeSteps = Content.MaxTimeSteps.Value;
    179       animationInterpreter.Expression = Content.SymbolicExpressionTree;
    180       animationInterpreter.World = Content.World;
     154      animationInterpreter = new AntInterpreter(Content.SymbolicExpressionTree, Content.World, Content.MaxTimeSteps);
    181155
    182156      DrawWorld();

  • trunk/sources/HeuristicLab.Problems.ArtificialAnt.Views/3.5/Plugin.cs.frame

    r12753 r12895  
    2626
    2727namespace HeuristicLab.Problems.ArtificialAnt.Views {
    28   [Plugin("HeuristicLab.Problems.ArtificialAnt.Views","Provides views for the artificial ant problem.", "3.4.8.$WCREV$")]
    29   [PluginFile("HeuristicLab.Problems.ArtificialAnt.Views-3.4.dll", PluginFileType.Assembly)]
     28  [Plugin("HeuristicLab.Problems.ArtificialAnt.Views","Provides views for the artificial ant problem.", "3.5.0.$WCREV$")]
     29  [PluginFile("HeuristicLab.Problems.ArtificialAnt.Views-3.5.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Core", "3.3")]
    3131  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
    … …  
    3535  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3636  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    37   [PluginDependency("HeuristicLab.Problems.ArtificialAnt", "3.4")]
     37  [PluginDependency("HeuristicLab.Problems.ArtificialAnt", "3.5")]
    3838  public class HeuristicLabProblemsArtificialAntViewsPlugin : PluginBase {
    3939  }

  • trunk/sources/HeuristicLab.Problems.ArtificialAnt.Views/3.5/Properties/AssemblyInfo.cs.frame

    r12753 r12895  
    5252// You can specify all the values or you can default the Revision and Build Numbers
    5353// by using the '*' as shown below:
    54 [assembly: AssemblyVersion("3.4.0.0")]
    55 [assembly: AssemblyFileVersion("3.4.8.$WCREV$")]
     54[assembly: AssemblyVersion("3.5.0.0")]
     55[assembly: AssemblyFileVersion("3.5.0.$WCREV$")]
Note: See TracChangeset for help on using the changeset viewer.