Changeset 122 for branches/XmlTextReaderBranch/HeuristicLab.Core/ConstrainedItemBase.cs

Timestamp:

04/15/08 14:17:26 (16 years ago)

Author:

gkronber

Message:

bug fixes to make loading of OSGA-TSP work. Some non-working code remains

File:

• branches/XmlTextReaderBranch/HeuristicLab.Core/ConstrainedItemBase.cs (modified) (6 diffs)

branches/XmlTextReaderBranch/HeuristicLab.Core/ConstrainedItemBase.cs

@@ -39 +39 @@
       ConstrainedItemBase clone = (ConstrainedItemBase)base.Clone(clonedObjects);
       clone.myConstraints.Clear();
-      foreach (IConstraint constraint in Constraints)
+      foreach(IConstraint constraint in Constraints)
         clone.AddConstraint((IConstraint)Auxiliary.Clone(constraint, clonedObjects));
       return clone;
@@ -49 +49 @@
     }
     public virtual void RemoveConstraint(IConstraint constraint) {
-      if (myConstraints.Remove(constraint))
+      if(myConstraints.Remove(constraint))
         OnConstraintRemoved(constraint);
     }
@@ -55 +55 @@
     public bool IsValid() {
       bool result = true;
-      foreach (IConstraint constraint in Constraints)
+      foreach(IConstraint constraint in Constraints)
         result = result && constraint.Check(this);
       return result;
@@ -62 +62 @@
       bool result = true;
       violatedConstraints = new List<IConstraint>();
-      foreach (IConstraint constraint in Constraints) {
-        if (!constraint.Check(this)) {
+      foreach(IConstraint constraint in Constraints) {
+        if(!constraint.Check(this)) {
           result = false;
           violatedConstraints.Add(constraint);
@@ -77 +77 @@
     public event EventHandler<ConstraintEventArgs> ConstraintAdded;
     protected virtual void OnConstraintAdded(IConstraint constraint) {
-      if (ConstraintAdded != null)
+      if(ConstraintAdded != null)
         ConstraintAdded(this, new ConstraintEventArgs(constraint));
     }
     public event EventHandler<ConstraintEventArgs> ConstraintRemoved;
     protected virtual void OnConstraintRemoved(IConstraint constraint) {
-      if (ConstraintRemoved != null)
+      if(ConstraintRemoved != null)
         ConstraintRemoved(this, new ConstraintEventArgs(constraint));
     }
 
     #region Persistence Methods
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid,IStorable> persistedObjects) {
+    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      if (Constraints.Count > 0) {
+      if(Constraints.Count > 0) {
         XmlNode constraintsNode = document.CreateNode(XmlNodeType.Element, "Constraints", null);
-        foreach (IConstraint constraint in Constraints)
+        foreach(IConstraint constraint in Constraints)
           constraintsNode.AppendChild(PersistenceManager.Persist(constraint, document, persistedObjects));
         node.AppendChild(constraintsNode);
@@ -108 +108 @@
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(reader, restoredObjects);
-      if(reader.IsStartElement()) {
-        reader.ReadToDescendant("Constraints");
+      reader.Read();
+      if(reader.Name == "Constraints") {
         myConstraints.Clear();
         while(reader.IsStartElement())