Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/14/08 21:51:15 (16 years ago)
Author:
gkronber
Message:

created a branch that uses XmlTextReader instead of XMLDocument to load documents. Investigating ticket #103. (...work in progress!)

Location:
branches/XmlTextReaderBranch
Files:
10 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/XmlTextReaderBranch/HeuristicLab.Constraints/AllSubOperatorsTypeConstraint.cs

    r2 r121  
    9292    }
    9393
    94     public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
    95       base.Populate(node, restoredObjects);
    96       groupConstraint = (SubOperatorTypeConstraint)PersistenceManager.Restore(node.SelectSingleNode("SubOperatorsGroupConstraint"), restoredObjects);
     94    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
     95    //  base.Populate(node, restoredObjects);
     96    //  groupConstraint = (SubOperatorTypeConstraint)PersistenceManager.Restore(node.SelectSingleNode("SubOperatorsGroupConstraint"), restoredObjects);
     97    //}
     98    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
     99      base.Populate(reader, restoredObjects);
     100      groupConstraint = (SubOperatorTypeConstraint)PersistenceManager.Restore(reader, "SubOperatorsGroupConstraint", restoredObjects);
    97101    }
    98102    #endregion persistence

  • branches/XmlTextReaderBranch/HeuristicLab.Constraints/AndConstraint.cs

    r40 r121  
    8181    }
    8282
    83     public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
    84       base.Populate(node, restoredObjects);
    85       clauses = (ItemList<IConstraint>)PersistenceManager.Restore(node.SelectSingleNode("Clauses"), restoredObjects);
     83    //public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
     84    //  base.Populate(node, restoredObjects);
     85    //  clauses = (ItemList<IConstraint>)PersistenceManager.Restore(node.SelectSingleNode("Clauses"), restoredObjects);
     86    //}
     87    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
     88      base.Populate(reader, restoredObjects);
     89      clauses = (ItemList<IConstraint>)PersistenceManager.Restore(reader, "Clauses", restoredObjects);
    8690    }
    8791    #endregion persistence

  • branches/XmlTextReaderBranch/HeuristicLab.Constraints/DoubleBoundedConstraint.cs

    r2 r121  
    155155    }
    156156
    157     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
    158       base.Populate(node, restoredObjects);
    159       lowerBound = double.Parse(node.Attributes["LowerBound"].Value);
    160       if (node.Attributes["LowerBoundIncluded"] != null) {
    161         lowerBoundIncluded = bool.Parse(node.Attributes["LowerBoundIncluded"].Value);
     157    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
     158    //  base.Populate(node, restoredObjects);
     159    //  lowerBound = double.Parse(node.Attributes["LowerBound"].Value);
     160    //  if(node.Attributes["LowerBoundIncluded"] != null) {
     161    //    lowerBoundIncluded = bool.Parse(node.Attributes["LowerBoundIncluded"].Value);
     162    //  } else {
     163    //    lowerBoundIncluded = true;
     164    //  }
     165    //  if(node.Attributes["LowerBoundEnabled"] != null) {
     166    //    lowerBoundEnabled = bool.Parse(node.Attributes["LowerBoundEnabled"].Value);
     167    //  } else {
     168    //    lowerBoundEnabled = true;
     169    //  }
     170
     171    //  upperBound = double.Parse(node.Attributes["UpperBound"].Value);
     172    //  if(node.Attributes["UpperBoundIncluded"] != null) {
     173    //    upperBoundIncluded = bool.Parse(node.Attributes["UpperBoundIncluded"].Value);
     174    //  } else {
     175    //    upperBoundIncluded = true;
     176    //  }
     177    //  if(node.Attributes["UpperBoundEnabled"] != null) {
     178    //    upperBoundEnabled = bool.Parse(node.Attributes["UpperBoundEnabled"].Value);
     179    //  } else {
     180    //    upperBoundEnabled = true;
     181    //  }
     182    //}
     183    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
     184      base.Populate(reader, restoredObjects);
     185      lowerBound = double.Parse(reader["LowerBound"]);
     186      if(reader["LowerBoundIncluded"] != null) {
     187        lowerBoundIncluded = bool.Parse(reader["LowerBoundIncluded"]);
    162188      } else {
    163189        lowerBoundIncluded = true;
    164190      }
    165       if (node.Attributes["LowerBoundEnabled"] != null) {
    166         lowerBoundEnabled = bool.Parse(node.Attributes["LowerBoundEnabled"].Value);
     191      if(reader["LowerBoundEnabled"] != null) {
     192        lowerBoundEnabled = bool.Parse(reader["LowerBoundEnabled"]);
    167193      } else {
    168194        lowerBoundEnabled = true;
    169195      }
    170196
    171       upperBound = double.Parse(node.Attributes["UpperBound"].Value);
    172       if (node.Attributes["UpperBoundIncluded"] != null) {
    173         upperBoundIncluded = bool.Parse(node.Attributes["UpperBoundIncluded"].Value);
     197      upperBound = double.Parse(reader["UpperBound"]);
     198      if(reader["UpperBoundIncluded"] != null) {
     199        upperBoundIncluded = bool.Parse(reader["UpperBoundIncluded"]);
    174200      } else {
    175201        upperBoundIncluded = true;
    176202      }
    177       if (node.Attributes["UpperBoundEnabled"] != null) {
    178         upperBoundEnabled = bool.Parse(node.Attributes["UpperBoundEnabled"].Value);
     203      if(reader["UpperBoundEnabled"] != null) {
     204        upperBoundEnabled = bool.Parse(reader["UpperBoundEnabled"]);
    179205      } else {
    180206        upperBoundEnabled = true;

  • branches/XmlTextReaderBranch/HeuristicLab.Constraints/IntBoundedConstraint.cs

    r2 r121  
    150150    }
    151151
    152     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
    153       base.Populate(node, restoredObjects);
    154       lowerBound = int.Parse(node.Attributes["LowerBound"].Value);
    155       if (node.Attributes["LowerBoundIncluded"] != null) {
    156         lowerBoundIncluded = bool.Parse(node.Attributes["LowerBoundIncluded"].Value);
     152    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
     153    //  base.Populate(node, restoredObjects);
     154    //  lowerBound = int.Parse(node.Attributes["LowerBound"].Value);
     155    //  if (node.Attributes["LowerBoundIncluded"] != null) {
     156    //    lowerBoundIncluded = bool.Parse(node.Attributes["LowerBoundIncluded"].Value);
     157    //  } else {
     158    //    lowerBoundIncluded = true;
     159    //  }
     160    //  if (node.Attributes["LowerBoundEnabled"] != null) {
     161    //    lowerBoundEnabled = bool.Parse(node.Attributes["LowerBoundEnabled"].Value);
     162    //  } else {
     163    //    lowerBoundEnabled = true;
     164    //  }
     165
     166    //  upperBound = int.Parse(node.Attributes["UpperBound"].Value);
     167    //  if (node.Attributes["UpperBoundIncluded"] != null) {
     168    //    upperBoundIncluded = bool.Parse(node.Attributes["UpperBoundIncluded"].Value);
     169    //  } else {
     170    //    upperBoundIncluded = true;
     171    //  }
     172    //  if (node.Attributes["UpperBoundEnabled"] != null) {
     173    //    upperBoundEnabled = bool.Parse(node.Attributes["UpperBoundEnabled"].Value);
     174    //  } else {
     175    //    upperBoundEnabled = true;
     176    //  }
     177    //}
     178    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
     179      base.Populate(reader, restoredObjects);
     180      lowerBound = int.Parse(reader["LowerBound"]);
     181      if(reader["LowerBoundIncluded"] != null) {
     182        lowerBoundIncluded = bool.Parse(reader["LowerBoundIncluded"]);
    157183      } else {
    158184        lowerBoundIncluded = true;
    159185      }
    160       if (node.Attributes["LowerBoundEnabled"] != null) {
    161         lowerBoundEnabled = bool.Parse(node.Attributes["LowerBoundEnabled"].Value);
     186      if(reader["LowerBoundEnabled"] != null) {
     187        lowerBoundEnabled = bool.Parse(reader["LowerBoundEnabled"]);
    162188      } else {
    163189        lowerBoundEnabled = true;
    164190      }
    165191
    166       upperBound = int.Parse(node.Attributes["UpperBound"].Value);
    167       if (node.Attributes["UpperBoundIncluded"] != null) {
    168         upperBoundIncluded = bool.Parse(node.Attributes["UpperBoundIncluded"].Value);
     192      upperBound = int.Parse(reader["UpperBound"]);
     193      if(reader["UpperBoundIncluded"] != null) {
     194        upperBoundIncluded = bool.Parse(reader["UpperBoundIncluded"]);
    169195      } else {
    170196        upperBoundIncluded = true;
    171197      }
    172       if (node.Attributes["UpperBoundEnabled"] != null) {
    173         upperBoundEnabled = bool.Parse(node.Attributes["UpperBoundEnabled"].Value);
     198      if(reader["UpperBoundEnabled"] != null) {
     199        upperBoundEnabled = bool.Parse(reader["UpperBoundEnabled"]);
    174200      } else {
    175201        upperBoundEnabled = true;
    176202      }
    177203    }
     204
    178205    #endregion
    179206  }

  • branches/XmlTextReaderBranch/HeuristicLab.Constraints/ItemTypeConstraint.cs

    r40 r121  
    8686    }
    8787
    88     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
    89       base.Populate(node, restoredObjects);
    90       XmlAttribute itemTypeAttribute = node.Attributes["ItemType"];
    91       type = Type.GetType(itemTypeAttribute.Value);
     88    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
     89    //  base.Populate(node, restoredObjects);
     90    //  XmlAttribute itemTypeAttribute = node.Attributes["ItemType"];
     91    //  type = Type.GetType(itemTypeAttribute.Value);
     92    //}
     93    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
     94      base.Populate(reader, restoredObjects);
     95      type = Type.GetType(reader["ItemType"]);
    9296    }
    9397    #endregion

  • branches/XmlTextReaderBranch/HeuristicLab.Constraints/NotConstraint.cs

    r2 r121  
    7575    }
    7676
    77     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
    78       base.Populate(node, restoredObjects);
    79       subConstraint = (ConstraintBase)PersistenceManager.Restore(node.SelectSingleNode("SubConstraint"), restoredObjects);
     77    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
     78    //  base.Populate(node, restoredObjects);
     79    //  subConstraint = (ConstraintBase)PersistenceManager.Restore(node.SelectSingleNode("SubConstraint"), restoredObjects);
     80    //}
     81    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
     82      base.Populate(reader, restoredObjects);
     83      subConstraint = (ConstraintBase)PersistenceManager.Restore(reader, "SubConstraint", restoredObjects);
    8084    }
    8185    #endregion

  • branches/XmlTextReaderBranch/HeuristicLab.Constraints/NumberOfSubOperatorsConstraint.cs

    r2 r121  
    8888    }
    8989
    90     public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
    91       base.Populate(node, restoredObjects);
    92       minOperators = (IntData)PersistenceManager.Restore(node.SelectSingleNode("min"), restoredObjects);
    93       maxOperators = (IntData)PersistenceManager.Restore(node.SelectSingleNode("max"), restoredObjects);
     90    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
     91    //  base.Populate(node, restoredObjects);
     92    //  minOperators = (IntData)PersistenceManager.Restore(node.SelectSingleNode("min"), restoredObjects);
     93    //  maxOperators = (IntData)PersistenceManager.Restore(node.SelectSingleNode("max"), restoredObjects);
     94    //}
     95    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
     96      base.Populate(reader, restoredObjects);
     97      minOperators = (IntData)PersistenceManager.Restore(reader, "min", restoredObjects);
     98      maxOperators = (IntData)PersistenceManager.Restore(reader, "max", restoredObjects);
    9499    }
    95100    #endregion persistence

  • branches/XmlTextReaderBranch/HeuristicLab.Constraints/OrConstraint.cs

    r40 r121  
    8282    }
    8383
    84     public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
    85       base.Populate(node, restoredObjects);
    86       clauses = (ItemList<IConstraint>)PersistenceManager.Restore(node.SelectSingleNode("Clauses"), restoredObjects);
     84    //public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
     85    //  base.Populate(node, restoredObjects);
     86    //  clauses = (ItemList<IConstraint>)PersistenceManager.Restore(node.SelectSingleNode("Clauses"), restoredObjects);
     87    //}
     88    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
     89      base.Populate(reader, restoredObjects);
     90      clauses = (ItemList<IConstraint>)PersistenceManager.Restore(reader, "Clauses", restoredObjects);
    8791    }
    8892    #endregion persistence

  • branches/XmlTextReaderBranch/HeuristicLab.Constraints/SubOperatorsTypeConstraint.cs

    r2 r121  
    121121    }
    122122
    123     public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
    124       base.Populate(node, restoredObjects);
    125       subOperatorIndex = (IntData)PersistenceManager.Restore(node.SelectSingleNode("SubOperatorIndex"), restoredObjects);
     123    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
     124    //  base.Populate(node, restoredObjects);
     125    //  subOperatorIndex = (IntData)PersistenceManager.Restore(node.SelectSingleNode("SubOperatorIndex"), restoredObjects);
     126    //  subOperators = new List<IOperator>();
     127    //  foreach(XmlNode childNode in node.SelectSingleNode("AllowedSubOperators").ChildNodes) {
     128    //    subOperators.Add((IOperator)PersistenceManager.Restore(childNode, restoredObjects));
     129    //  }
     130    //}
     131    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
     132      base.Populate(reader, restoredObjects);
     133      subOperatorIndex = (IntData)PersistenceManager.Restore(reader, "SubOperatorIndex", restoredObjects);
    126134      subOperators = new List<IOperator>();
    127       foreach(XmlNode childNode in node.SelectSingleNode("AllowedSubOperators").ChildNodes) {
    128         subOperators.Add((IOperator)PersistenceManager.Restore(childNode, restoredObjects));
    129       }
     135      reader.ReadStartElement("AllowedSubOperators");
     136      while(reader.IsStartElement())
     137        subOperators.Add((IOperator)PersistenceManager.Restore(reader, restoredObjects));
     138      reader.ReadEndElement();
    130139    }
    131140    #endregion persistence

  • branches/XmlTextReaderBranch/HeuristicLab.Constraints/VariableComparisonConstraint.cs

    r2 r121  
    117117    }
    118118
    119     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
    120       base.Populate(node, restoredObjects);
    121       leftVarName = (StringData)PersistenceManager.Restore(node.SelectSingleNode("LeftVarName"), restoredObjects);
    122       rightVarName = (StringData)PersistenceManager.Restore(node.SelectSingleNode("RightVarName"), restoredObjects);
    123       comparer = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Comparer"), restoredObjects);
     119    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
     120    //  base.Populate(node, restoredObjects);
     121    //  leftVarName = (StringData)PersistenceManager.Restore(node.SelectSingleNode("LeftVarName"), restoredObjects);
     122    //  rightVarName = (StringData)PersistenceManager.Restore(node.SelectSingleNode("RightVarName"), restoredObjects);
     123    //  comparer = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Comparer"), restoredObjects);
     124    //}
     125    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
     126      base.Populate(reader, restoredObjects);
     127      leftVarName = (StringData)PersistenceManager.Restore(reader, "LeftVarName", restoredObjects);
     128      rightVarName = (StringData)PersistenceManager.Restore(reader, "RightVarName", restoredObjects);
     129      comparer = (IntData)PersistenceManager.Restore(reader, "Comparer", restoredObjects);
    124130    }
    125131    #endregion
Note: See TracChangeset for help on using the changeset viewer.