Changeset 4108

Timestamp:

07/27/10 00:07:36 (14 years ago)

Author:

abeham

Message:

#1033

• Changed collection to list
• Rebuilding dispatcher after every change to the list

#1110

• Added clone method

Location:

trunk/sources

Files:

• HeuristicLab.Problems.ExternalEvaluation.GP/3.3/Interpretation/ITreeInterpreter.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation.GP/3.3/Interpretation/TreeInterpreter.cs (modified) (3 diffs)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/SolutionMessageBuilderView.cs (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/SolutionMessageBuilder.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/Interpretation/ITreeInterpreter.cs

@@ -26 +26 @@
 namespace HeuristicLab.Problems.ExternalEvaluation.GP {
   public interface ISymbolicExpressionTreeInterpreter : IItem {
-    double InterpretTree(SymbolicExpressionTree tree, Dictionary<string, double> variables);
+    void Prepare(SymbolicExpressionTree tree);
+    double InterpretTree(Dictionary<string, double> variables);
   }
 }

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/Interpretation/TreeInterpreter.cs

@@ -92 +92 @@
     private Instruction[] code;
     private int pc;
-
+    
     public override bool CanChangeName {
       get { return false; }
@@ -104 +104 @@
     }
 
-    public double InterpretTree(SymbolicExpressionTree tree, Dictionary<string, double> variables) {
-      this.variables = variables;
+    public void Prepare(SymbolicExpressionTree tree) {
       var compiler = new SymbolicExpressionTreeCompiler();
       code = compiler.Compile(tree, MapSymbolToOpCode);
+    }
+
+    public double InterpretTree(Dictionary<string, double> variables) {
+      this.variables = variables;
       pc = 0;
       argStackPointer = 0;
@@ -123 +126 @@
     private int argStackPointer;
 
-    public double Evaluate() {
+    private double Evaluate() {
       var currentInstr = code[pc++];
       switch (currentInstr.opCode) {

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/SolutionMessageBuilderView.cs

@@ -28 +28 @@
   [Content(typeof(SolutionMessageBuilder), IsDefaultView = true)]
   public sealed partial class SolutionMessageBuilderView : NamedItemView {
-    CheckedItemCollectionView<IItemToSolutionMessageConverter> converterView;
+    CheckedItemListView<IItemToSolutionMessageConverter> converterView;
 
     public new SolutionMessageBuilder Content {
@@ -37 +37 @@
     public SolutionMessageBuilderView() {
       InitializeComponent();
-      converterView = new CheckedItemCollectionView<IItemToSolutionMessageConverter>();
+      converterView = new CheckedItemListView<IItemToSolutionMessageConverter>();
       converterView.Dock = DockStyle.Fill;
       convertersGroupBox.Controls.Add(converterView);

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/SolutionMessageBuilder.cs

@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -35 +36 @@
     private Dictionary<Type, Action<IItem, string, SolutionMessage.Builder>> dispatcher;
 
+    // BackwardsCompatibility3.3
+    #region Backwards compatible code, remove with 3.4
     [Storable]
+    [Obsolete]
     private CheckedItemCollection<IItemToSolutionMessageConverter> converters;
-    public CheckedItemCollection<IItemToSolutionMessageConverter> Converters {
-      get { return converters; }
+    #endregion
+    [Storable]
+    private CheckedItemList<IItemToSolutionMessageConverter> convertersList;
+    public CheckedItemList<IItemToSolutionMessageConverter> Converters {
+      get { return convertersList; }
     }
 
@@ -47 +54 @@
       name = ItemName;
       description = ItemDescription;
-      converters = new CheckedItemCollection<IItemToSolutionMessageConverter>();
+      convertersList = new CheckedItemList<IItemToSolutionMessageConverter>();
+      convertersList.Add(new BoolConverter());
+      convertersList.Add(new DateTimeValueConverter());
+      convertersList.Add(new DoubleConverter());
+      convertersList.Add(new IntegerConverter());
+      convertersList.Add(new StringConverter());
+      convertersList.Add(new TimeSpanValueConverter());
+
       AttachEventHandlers();
+    }
 
-      converters.Add(new BoolConverter());
-      converters.Add(new DateTimeValueConverter());
-      converters.Add(new DoubleConverter());
-      converters.Add(new IntegerConverter());
-      converters.Add(new StringConverter());
-      converters.Add(new TimeSpanValueConverter());
+    public override IDeepCloneable Clone(Cloner cloner) {
+      SolutionMessageBuilder clone = (SolutionMessageBuilder)base.Clone(cloner);
+      clone.convertersList = (CheckedItemList<IItemToSolutionMessageConverter>)cloner.Clone(convertersList);
+      clone.AttachEventHandlers();
+      return clone;
     }
 
     public void AddToMessage(IItem item, string name, SolutionMessage.Builder builder) {
-      if (dispatcher == null) FillDispatcher();
+      if (dispatcher == null) BuildDispatcher();
       Type itemType = item.GetType();
       while (!dispatcher.ContainsKey(itemType)) {
@@ -75 +89 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AttachEventHandlers() {
-      converters.ItemsAdded += new CollectionItemsChangedEventHandler<IItemToSolutionMessageConverter>(converters_ItemsAdded);
-      converters.ItemsRemoved += new CollectionItemsChangedEventHandler<IItemToSolutionMessageConverter>(converters_ItemsRemoved);
-      converters.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IItemToSolutionMessageConverter>(converters_CheckedItemsChanged);
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with 3.4
+      #pragma warning disable 0612
+      if (converters != null) {
+        if (convertersList == null) convertersList = new CheckedItemList<IItemToSolutionMessageConverter>();
+        foreach (IItemToSolutionMessageConverter c in converters)
+          convertersList.Add(c);
+        converters.Clear();
+        converters = null;
+      }
+      #pragma warning restore 0612
+      #endregion
+      convertersList.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IItemToSolutionMessageConverter>>(convertersList_Changed);
+      convertersList.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IItemToSolutionMessageConverter>>(convertersList_Changed);
+      convertersList.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IndexedItem<IItemToSolutionMessageConverter>>(convertersList_Changed);
+      convertersList.ItemsMoved += new CollectionItemsChangedEventHandler<IndexedItem<IItemToSolutionMessageConverter>>(convertersList_Changed);
+      convertersList.ItemsReplaced += new CollectionItemsChangedEventHandler<IndexedItem<IItemToSolutionMessageConverter>>(convertersList_Changed);
     }
 
-    private void converters_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IItemToSolutionMessageConverter> e) {
-      AddToDispatcher(e.Items);
+    private void convertersList_Changed(object sender, CollectionItemsChangedEventArgs<IndexedItem<IItemToSolutionMessageConverter>> e) {
+      BuildDispatcher();
     }
 
-    private void converters_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IItemToSolutionMessageConverter> e) {
-      RemoveFromDispatcher(e.Items);
-    }
-
-    private void converters_CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IItemToSolutionMessageConverter> e) {
-      FillDispatcher();
-    }
-
-    private void FillDispatcher() {
+    private void BuildDispatcher() {
       dispatcher = new Dictionary<Type, Action<IItem, string, SolutionMessage.Builder>>();
-      foreach (IItemToSolutionMessageConverter c in converters.CheckedItems) {
+      foreach (IItemToSolutionMessageConverter c in convertersList.CheckedItems.OrderBy(x => x.Index).Select(x => x.Value)) {
         Type[] types = c.ItemTypes;
         foreach (Type t in types) {
-          if (dispatcher.ContainsKey(t)) dispatcher.Remove(t);
-          dispatcher.Add(t, new Action<IItem, string, SolutionMessage.Builder>(c.AddItemToBuilder));
-        }
-      }
-    }
-
-    private void AddToDispatcher(IEnumerable<IItemToSolutionMessageConverter> items) {
-      if (dispatcher == null) FillDispatcher();
-      foreach (IItemToSolutionMessageConverter c in items) {
-        Type[] types = c.ItemTypes;
-        foreach (Type t in types) {
-          if (dispatcher.ContainsKey(t)) dispatcher.Remove(t);
-          dispatcher.Add(t, new Action<IItem, string, SolutionMessage.Builder>(c.AddItemToBuilder));
-        }
-      }
-    }
-
-    private void RemoveFromDispatcher(IEnumerable<IItemToSolutionMessageConverter> items) {
-      if (dispatcher == null) FillDispatcher();
-      foreach (IItemToSolutionMessageConverter c in items) {
-        Type[] types = c.ItemTypes;
-        foreach (Type t in types) {
-          if (dispatcher.ContainsKey(t)) dispatcher.Remove(t);
+          if (!dispatcher.ContainsKey(t))
+            dispatcher.Add(t, new Action<IItem, string, SolutionMessage.Builder>(c.AddItemToBuilder));
         }
       }