Changeset 1699 for trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPTour.cs

Timestamp:

04/28/09 16:05:09 (15 years ago)

Author:

epitzer

Message:

Migrate HL.Routing.TSP to new persistence library. (#603)

File:

• trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPTour.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Routing.TSP/3.3/TSPTour.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Permutation;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Routing.TSP {
@@ -33 +34 @@
   /// </summary>
   public class TSPTour : ItemBase, IVisualizationItem {
+
+    [Storable]
     private DoubleMatrixData myCoordinates;
     /// <summary>
@@ -41 +44 @@
       set { myCoordinates = value; }
     }
+
+    [Storable]
     private Permutation.Permutation myTour;
     /// <summary>
@@ -109 +114 @@
       if (TourChanged != null)
         TourChanged(this, new EventArgs());
-    }
-
-    #region Persistence Methods
-    /// <summary>
-    /// Saves the current instance as <see cref="XmlNode"/> in the specified <paramref name="document"/>.
-    /// </summary>
-    /// <remarks>Calls <see cref="StorableBase.GetXmlNode"/> of base class <see cref="ItemBase"/>. <br/>
-    /// The coordinates and the tour are saved as a child node with the tag names <c>Coordinates</c> and 
-    /// <c>Tour</c>.</remarks>
-    /// <param name="name">The (tag)name of the <see cref="XmlNode"/>.</param>
-    /// <param name="document">The <see cref="XmlDocument"/> where to save the data.</param>
-    /// <param name="persistedObjects">The dictionary of all already persisted objects. 
-    /// (Needed to avoid cycles.)</param>
-    /// <returns>The saved <see cref="XmlNode"/>.</returns>
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      node.AppendChild(PersistenceManager.Persist("Coordinates", Coordinates, document, persistedObjects));
-      node.AppendChild(PersistenceManager.Persist("Tour", Tour, document, persistedObjects));
-      return node;
-    }
-    /// <summary>
-    /// Loads the persisted TSP tour from the specified <paramref name="node"/>.
-    /// </summary>
-    /// <remarks>Calls <see cref="StorableBase.Populate"/> of base class 
-    /// <see cref="ItemBase"/>.<br/>
-    /// The coordinates and the tour must be saved as child nodes with the tag names <c>Coordinates</c>
-    /// and <c>Tour</c> (see <see cref="GetXmlNode"/>).</remarks>
-    /// <param name="node">The <see cref="XmlNode"/> where the TSP tour is saved.</param>
-    /// <param name="restoredObjects">A dictionary of all already restored objects. (Needed to avoid cycles.)</param>
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      myCoordinates = (DoubleMatrixData)PersistenceManager.Restore(node.SelectSingleNode("Coordinates"), restoredObjects);
-      myTour = (Permutation.Permutation)PersistenceManager.Restore(node.SelectSingleNode("Tour"), restoredObjects);
-    }
-    #endregion
+    }    
   }
 }