Changeset 309

Timestamp:

06/09/08 19:05:43 (16 years ago)

Author:

gkronber

Message:

fixed a bug that threw Exceptions when loading a GP engine with results (trees)

File:

• trunk/sources/HeuristicLab.Functions/SymbolTable.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Functions/SymbolTable.cs

@@ -129 +129 @@
 
     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      table.Clear();
-      reverseTable.Clear();
-      nextFunctionSymbol = int.Parse(node.Attributes["NextFunctionSymbol"].Value);
-      XmlNode symbolTableNode = node.SelectSingleNode("Table");
-      foreach(XmlNode entry in symbolTableNode.ChildNodes) {
-        IFunction function = (IFunction)PersistenceManager.Restore(entry, restoredObjects);
-        int symbol = int.Parse(entry.Attributes["Symbol"].Value);
-        table[symbol] = function;
-        reverseTable[function] = symbol;
+      if(this == symbolTable) {
+        base.Populate(node, restoredObjects);
+        table.Clear();
+        reverseTable.Clear();
+        nextFunctionSymbol = int.Parse(node.Attributes["NextFunctionSymbol"].Value);
+        XmlNode symbolTableNode = node.SelectSingleNode("Table");
+        foreach(XmlNode entry in symbolTableNode.ChildNodes) {
+          IFunction function = (IFunction)PersistenceManager.Restore(entry, restoredObjects);
+          int symbol = int.Parse(entry.Attributes["Symbol"].Value);
+          table[symbol] = function;
+          reverseTable[function] = symbol;
+        }
+      } else {
+        symbolTable.Populate(node, restoredObjects);
       }
     }