Changeset 1625 for trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact

Timestamp:

04/23/09 14:22:29 (16 years ago)

Author:

epitzer

Message:

Added PersistenceException used consistently for all error conditions in the persistence framework (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact

Files:

• DoubleArray2XmlFormatters.cs (modified) (1 diff)
• IntArray2XmlFormatters.cs (modified) (1 diff)
• NumberArray2XmlFormatterBase.cs (modified) (2 diffs)
• NumberEnumeration2XmlFormatterBase.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/DoubleArray2XmlFormatters.cs

@@ -2 +2 @@
 using HeuristicLab.Persistence.Core;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/IntArray2XmlFormatters.cs

@@ -1 +1 @@
 using System;
 using HeuristicLab.Persistence.Core;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberArray2XmlFormatterBase.cs

@@ -3 +3 @@
 using HeuristicLab.Persistence.Interfaces;
 using System;
+using HeuristicLab.Persistence.Core;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
@@ -46 +47 @@
 
     public override T Parse(XmlString x) {
-      IEnumerator values =
-        x.Data.Split(new[] { Separator },
-        StringSplitOptions.RemoveEmptyEntries).GetEnumerator();
-      values.MoveNext();
-      int rank = int.Parse((string)values.Current);
-      int[] lengths = new int[rank];
-      for (int i = 0; i < rank; i++) {
+      try {
+        IEnumerator values =
+          x.Data.Split(new[] { Separator },
+          StringSplitOptions.RemoveEmptyEntries).GetEnumerator();
         values.MoveNext();
-        lengths[i] = int.Parse((string)values.Current);
-      }
-      int[] lowerBounds = new int[rank];
-      for (int i = 0; i < rank; i++) {
-        values.MoveNext();
-        lowerBounds[i] = int.Parse((string)values.Current);
-      }
-      Array a = Array.CreateInstance(this.SourceType.GetElementType(), lengths, lowerBounds);
-      int[] positions = new int[rank];
-      while (values.MoveNext()) {
-        a.SetValue(ParseValue((string)values.Current), positions);
-        positions[0] += 1;
-        for (int i = 0; i < rank - 1; i++) {
-          if (positions[i] >= lengths[i]) {
-            positions[i] = 0;
-            positions[i + 1] += 1;
-          } else {
-            break;
+        int rank = int.Parse((string)values.Current);
+        int[] lengths = new int[rank];
+        for (int i = 0; i < rank; i++) {
+          values.MoveNext();
+          lengths[i] = int.Parse((string)values.Current);
+        }
+        int[] lowerBounds = new int[rank];
+        for (int i = 0; i < rank; i++) {
+          values.MoveNext();
+          lowerBounds[i] = int.Parse((string)values.Current);
+        }
+        Array a = Array.CreateInstance(this.SourceType.GetElementType(), lengths, lowerBounds);
+        int[] positions = (int[])lowerBounds.Clone();
+        while (values.MoveNext()) {
+          a.SetValue(ParseValue((string)values.Current), positions);
+          positions[0] += 1;
+          for (int i = 0; i < rank - 1; i++) {
+            if (positions[i] >= lengths[i]) {
+              positions[i] = 0;
+              positions[i + 1] += 1;
+            } else {
+              break;
+            }
           }
         }
-      }      
-      return (T)(object)a;
+        if (positions[rank - 1] != lowerBounds[rank - 1] + lengths[rank - 1])
+          throw new PersistenceException("Insufficient number of elements while trying to fill number array.");
+        return (T)(object)a;
+      } catch (InvalidOperationException e) {
+        throw new PersistenceException("Insufficient information to rebuild number array.", e);
+      } catch (InvalidCastException e) {
+        throw new PersistenceException("Invalid element data or meta data to reconstruct number array.", e);
+      } catch (OverflowException e) {
+        throw new PersistenceException("Overflow during element parsing while trying to reconstruct number array.", e);
+      } 
     }
   }

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberEnumeration2XmlFormatterBase.cs

@@ -3 +3 @@
 using HeuristicLab.Persistence.Interfaces;
 using System;
+using HeuristicLab.Persistence.Core;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
@@ -24 +25 @@
 
     public override T Parse(XmlString x) {
-      IEnumerable enumeration = Instantiate();
-      string[] values = x.Data.Split(new[] { Separator }, StringSplitOptions.RemoveEmptyEntries);
-      foreach (var value in values) {
-        Add(enumeration, ParseValue(value));
-      }
-      return (T)enumeration;
+      try {
+        IEnumerable enumeration = Instantiate();
+        string[] values = x.Data.Split(new[] { Separator }, StringSplitOptions.RemoveEmptyEntries);
+        foreach (var value in values) {
+          Add(enumeration, ParseValue(value));
+        }
+        return (T)enumeration;
+      } catch (InvalidCastException e) {
+        throw new PersistenceException("Invalid element data during reconstruction of number enumerable.", e);
+      } catch (OverflowException e) {
+        throw new PersistenceException("Overflow during element parsing while trying to reconstruct number enumerable.", e);
+      }       
     }
   }