Changeset 12895 for trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.5/AntTrail.cs

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/3.5

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.4)
• AntTrail.cs (modified) (2 diffs)

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

@@ -39 +39 @@
     }
     [Storable]
-    private SymbolicExpressionTree expression;
-    public SymbolicExpressionTree SymbolicExpressionTree {
-      get { return expression; }
-      set {
-        if (expression != value) {
-          //if (expression != null) DeregisterSymbolicExpressionTreeEvents();
-          expression = value;
-          //if (expression != null) RegisterSymbolicExpressionTreeEvents();
-          OnSymbolicExpressionTreeChanged();
-        }
-      }
-    }
+    public ISymbolicExpressionTree SymbolicExpressionTree { get; private set; }
+    [Storable]
+    public BoolMatrix World { get; private set; }
+    [Storable]
+    public int MaxTimeSteps { get; private set; }
+    [Storable]
+    public double Quality { get; private set; }
 
-    [Storable]
-    private BoolMatrix world;
-    public BoolMatrix World {
-      get { return world; }
-      set {
-        if (world != value) {
-          if (world != null) DeregisterWorldEvents();
-          world = value;
-          if (world != null) RegisterWorldEvents();
-          OnWorldChanged();
-        }
-      }
-    }
-    [Storable]
-    private IntValue maxTimeSteps;
-    public IntValue MaxTimeSteps {
-      get { return maxTimeSteps; }
-      set {
-        if (maxTimeSteps != value) {
-          if (maxTimeSteps != value) {
-            if (maxTimeSteps != null) DeregisterMaxTimeStepsEvents();
-            maxTimeSteps = value;
-            if (maxTimeSteps != null) RegisterMaxTimeStepsEvents();
-            OnWorldChanged();
-          }
-        }
-      }
-    }
-
-    public AntTrail() : base() { }
-    public AntTrail(BoolMatrix world, SymbolicExpressionTree expression, IntValue maxTimeSteps)
-      : this() {
-      this.world = world;
-      this.expression = expression;
-      this.maxTimeSteps = maxTimeSteps;
-      Initialize();
+    public AntTrail(BoolMatrix world, ISymbolicExpressionTree expression, int maxTimeSteps, double quality) {
+      this.World = world;
+      this.SymbolicExpressionTree = expression;
+      this.MaxTimeSteps = maxTimeSteps;
+      this.Quality = quality;
     }
 
@@ -93 +57 @@
     private AntTrail(bool deserializing) : base(deserializing) { }
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      Initialize();
-    }
+    private void AfterDeserialization() { }
+
     private AntTrail(AntTrail original, Cloner cloner)
       : base(original, cloner) {
-      expression = cloner.Clone(original.expression);
-      world = cloner.Clone(original.world);
-      maxTimeSteps = cloner.Clone(original.maxTimeSteps);
-      Initialize();
+      SymbolicExpressionTree = cloner.Clone(original.SymbolicExpressionTree);
+      World = cloner.Clone(original.World);
+      MaxTimeSteps = original.MaxTimeSteps;
+      Quality = original.Quality;
     }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new AntTrail(this, cloner);
     }
-
-    private void Initialize() {
-      //if (expression != null) RegisterSymbolicExpressionTreeEvents();
-      if (world != null) RegisterWorldEvents();
-      if (maxTimeSteps != null) RegisterMaxTimeStepsEvents();
-    }
-
-    #region Events
-    public event EventHandler SymbolicExpressionTreeChanged;
-    private void OnSymbolicExpressionTreeChanged() {
-      var changed = SymbolicExpressionTreeChanged;
-      if (changed != null) changed(this, EventArgs.Empty);
-    }
-    public event EventHandler WorldChanged;
-    private void OnWorldChanged() {
-      var changed = WorldChanged;
-      if (changed != null) changed(this, EventArgs.Empty);
-    }
-    public event EventHandler MaxTimeStepsChanged;
-    private void OnMaxTimeStepsChanged() {
-      var changed = MaxTimeStepsChanged;
-      if (changed != null) changed(this, EventArgs.Empty);
-    }
-
-    //private void RegisterSymbolicExpressionTreeEvents() {
-    //  SymbolicExpressionTree.ItemChanged += new EventHandler<EventArgs<int>>(SymbolicExpressionTree_ItemChanged);
-    //  SymbolicExpressionTree.Reset += new EventHandler(SymbolicExpressionTree_Reset);
-    //}
-    //private void DeregisterSymbolicExpressionTreeEvents() {
-    //  SymbolicExpressionTree.ItemChanged -= new EventHandler<EventArgs<int>>(SymbolicExpressionTree_ItemChanged);
-    //  SymbolicExpressionTree.Reset -= new EventHandler(SymbolicExpressionTree_Reset);
-    //}
-
-    private void RegisterWorldEvents() {
-      World.ItemChanged += new EventHandler<EventArgs<int, int>>(World_ItemChanged);
-      World.Reset += new EventHandler(World_Reset);
-    }
-    private void DeregisterWorldEvents() {
-      World.ItemChanged -= new EventHandler<EventArgs<int, int>>(World_ItemChanged);
-      World.Reset -= new EventHandler(World_Reset);
-    }
-    private void RegisterMaxTimeStepsEvents() {
-      MaxTimeSteps.ValueChanged += new EventHandler(MaxTimeSteps_ValueChanged);
-    }
-    private void DeregisterMaxTimeStepsEvents() {
-      MaxTimeSteps.ValueChanged -= new EventHandler(MaxTimeSteps_ValueChanged);
-    }
-
-    void MaxTimeSteps_ValueChanged(object sender, EventArgs e) {
-      OnMaxTimeStepsChanged();
-    }
-    private void World_ItemChanged(object sender, EventArgs<int, int> e) {
-      OnWorldChanged();
-    }
-    private void World_Reset(object sender, EventArgs e) {
-      OnWorldChanged();
-    }
-    #endregion
   }
 }