Changeset 14650 for branches/PersistentDataStructures/HeuristicLab.Data/3.3

Timestamp:

02/07/17 14:05:09 (8 years ago)

Author:

epitzer

Message:

#2727 completely replace basic array with array mapped trie in ValueTypeArray and descendants

Location:

branches/PersistentDataStructures/HeuristicLab.Data/3.3

Files:

• HeuristicLab.Data-3.3.csproj (modified) (1 diff)
• PercentArray.cs (modified) (1 diff)
• PersistentDataStructures (added)
• PersistentDataStructures/Adaptations (added)
• PersistentDataStructures/Adaptations/HistoryArray.cs (added)
• PersistentDataStructures/Adaptations/HistoryList.cs (added)
• PersistentDataStructures/Implementations (added)
• PersistentDataStructures/Implementations/ArrayMappedTrie.cs (added)
• ValueTypeArray.cs (modified) (11 diffs)

branches/PersistentDataStructures/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

@@ -146 +146 @@
     <Compile Include="Interfaces\IStringConvertibleMatrix.cs" />
     <Compile Include="Interfaces\IStringConvertibleValue.cs" />
+    <Compile Include="PersistentDataStructures\Adaptations\HistoryArray.cs" />
+    <Compile Include="PersistentDataStructures\Adaptations\HistoryList.cs" />
+    <Compile Include="PersistentDataStructures\Implementations\ArrayMappedTrie.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/PersistentDataStructures/HeuristicLab.Data/3.3/PercentArray.cs

@@ -45 +45 @@
       StringBuilder sb = new StringBuilder();
       sb.Append("[");
-      if (array.Length > 0) {
-        sb.Append(array[0].ToString("#0.#################### %"));  // percent format
-        for (int i = 1; i < array.Length; i++)
-          sb.Append(";").Append(array[i].ToString("#0.#################### %"));  // percent format
+      if (historyArray.Length > 0) {
+        sb.Append(historyArray[0].ToString("#0.#################### %"));  // percent format
+        for (int i = 1; i < historyArray.Length; i++)
+          sb.Append(";").Append(historyArray[i].ToString("#0.#################### %"));  // percent format
       }
       sb.Append("]");

branches/PersistentDataStructures/HeuristicLab.Data/3.3/ValueTypeArray.cs

@@ -28 +28 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data.PersistentDataStructures.Adaptations;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -40 +41 @@
     }
 
-    [Storable]
-    protected T[] array;
+    [Storable(AllowOneWay = true, Name = "array")]
+    protected T[] oldArrayValuePersistence { set { historyArray = new HistoryArray<T>(value); } }
+
+    [Storable]
+    protected HistoryArray<T> historyArray;
 
     [Storable]
@@ -60 +64 @@
 
     public virtual int Length {
-      get { return array.Length; }
+      get { return historyArray.Length; }
       #region Mono Compatibility
       // this setter should be protected, but the Mono compiler couldn't handle it
@@ -66 +70 @@
         if (ReadOnly) throw new NotSupportedException("Length cannot be set. ValueTypeArray is read-only.");
         if (value != Length) {
-          Array.Resize<T>(ref array, value);
+          historyArray.Resize(value);
           while (elementNames.Count > value)
             elementNames.RemoveAt(elementNames.Count - 1);
@@ -90 +94 @@
 
     public virtual T this[int index] {
-      get { return array[index]; }
+      get { return historyArray[index]; }
       set {
         if (ReadOnly) throw new NotSupportedException("Item cannot be set. ValueTypeArray is read-only.");
-        if (!value.Equals(array[index])) {
-          array[index] = value;
+        if (!value.Equals(historyArray[index])) {
+          historyArray[index] = value;
           OnItemChanged(index);
         }
@@ -115 +119 @@
     protected ValueTypeArray(ValueTypeArray<T> original, Cloner cloner)
       : base(original, cloner) {
-      this.array = (T[])original.array.Clone();
+      this.historyArray = (HistoryArray<T>)original.historyArray.Clone();
       this.readOnly = original.readOnly;
       this.resizable = original.resizable;
@@ -121 +125 @@
     }
     protected ValueTypeArray() {
-      array = new T[0];
+      historyArray = new HistoryArray<T>(0);
       readOnly = false;
       resizable = true;
@@ -127 +131 @@
     }
     protected ValueTypeArray(int length) {
-      array = new T[length];
+      historyArray = new HistoryArray<T>(length);
       readOnly = false;
       resizable = true;
@@ -134 +138 @@
     protected ValueTypeArray(T[] elements) {
       if (elements == null) throw new ArgumentNullException();
-      array = (T[])elements.Clone();
+      historyArray = new HistoryArray<T>(elements);
       readOnly = false;
       resizable = true;
@@ -147 +151 @@
 
     public T[] CloneAsArray() {
-      //mkommend: this works because T must be a value type (struct constraint);
-      return (T[])array.Clone();
+      return historyArray.ToArray();
     }
 
     public override string ToString() {
-      if (array.Length == 0) return "[]";
+      if (historyArray.Length == 0) return "[]";
 
       StringBuilder sb = new StringBuilder();
       sb.Append("[");
-      sb.Append(array[0].ToString());
-      for (int i = 1; i < array.Length; i++) {
-        sb.Append(";").Append(array[i].ToString());
+      sb.Append(historyArray[0].ToString());
+      for (int i = 1; i < historyArray.Length; i++) {
+        sb.Append(";").Append(historyArray[i].ToString());
         if (sb.Length > maximumToStringLength) {
           sb.Append("...");
@@ -169 +172 @@
 
     public virtual IEnumerator<T> GetEnumerator() {
-      return array.Cast<T>().GetEnumerator();
+      return historyArray.Cast<T>().GetEnumerator();
     }