Changeset 14657 for branches/PersistentDataStructures/HeuristicLab.Data/3.3/ValueTypeArray.cs

Timestamp:

02/10/17 15:13:29 (7 years ago)

Author:

epitzer

Message:

#2727 add generic MetaInfo to AMT e.g. for tracking Count in facades

File:

• branches/PersistentDataStructures/HeuristicLab.Data/3.3/ValueTypeArray.cs (modified) (8 diffs)

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

@@ -44 +44 @@
     protected T[] oldArrayValuePersistence { set { historyArray = new HistoryArray<T>(value); } }
 
+    [Storable(AllowOneWay = true, Name = "elementNames")]
+    protected List<string> oldElementNamesValuePersistence { set { historyElementNames = new HistoryList<string>(value); } }
+
     [Storable]
     protected HistoryArray<T> historyArray;
 
     [Storable]
-    protected List<string> elementNames;
+    protected HistoryList<string> historyElementNames;
+
     public virtual IEnumerable<string> ElementNames {
-      get { return this.elementNames; }
+      get { return this.historyElementNames; }
       set {
         if (ReadOnly) throw new NotSupportedException("ElementNames cannot be set. ValueTypeArray is read-only.");
         if (value == null || !value.Any())
-          elementNames = new List<string>();
+          historyElementNames = new HistoryList<string>();
         else if (value.Count() > Length)
           throw new ArgumentException("The number of element names must not exceed the array length.");
-        else
-          elementNames = new List<string>(value);
+        else 
+          historyElementNames = new HistoryList<string>(value);
         OnElementNamesChanged();
       }
@@ -71 +75 @@
         if (value != Length) {
           historyArray.Resize(value);
-          while (elementNames.Count > value)
-            elementNames.RemoveAt(elementNames.Count - 1);
+          while (historyElementNames.Count > value)
+            historyElementNames.RemoveAt(historyElementNames.Count - 1);
           OnElementNamesChanged();
           OnReset();
@@ -112 +116 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      if (elementNames == null) { elementNames = new List<string>(); }
+      if (historyElementNames == null) { historyElementNames = new HistoryList<string>(); }
     }
 
@@ -122 +126 @@
       this.readOnly = original.readOnly;
       this.resizable = original.resizable;
-      this.elementNames = new List<string>(original.elementNames);
+      this.historyElementNames = (HistoryList<string>)original.historyElementNames.Clone();
     }
     protected ValueTypeArray() {
@@ -128 +132 @@
       readOnly = false;
       resizable = true;
-      elementNames = new List<string>();
+      historyElementNames = new HistoryList<string>();
     }
     protected ValueTypeArray(int length) {
@@ -134 +138 @@
       readOnly = false;
       resizable = true;
-      elementNames = new List<string>();
+      historyElementNames = new HistoryList<string>();
     }
     protected ValueTypeArray(T[] elements) {
@@ -141 +145 @@
       readOnly = false;
       resizable = true;
-      elementNames = new List<string>();
+      historyElementNames = new HistoryList<string>();
+    }
+    private ValueTypeArray(HistoryArray<T> values, HistoryList<string> historyElementNames) {
+      this.historyArray = values;
+      this.historyElementNames = historyElementNames;
     }
 
@@ -205 +213 @@
       OnToStringChanged();
     }
+
+    public void CreateSnapshot() {
+      historyArray.CreateSnapshot();
+      historyElementNames.CreateSnapshot();
+    }
+
+    public IEnumerable<ValueTypeArray<T>> GetHistory() {
+      foreach (var vta in historyArray.GetHistory().Zip(historyElementNames.GetHistory(), (v, n) => new {v, n})) {
+        var clone = (ValueTypeArray<T>)Clone();
+        clone.historyArray = vta.v;
+        clone.historyElementNames = vta.n;
+        yield return clone;
+      }
+    }
   }
 }