Changeset 13347 for branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/Index.cs

Timestamp:

11/23/15 18:47:21 (8 years ago)

Author:

swagner

Message:

#2520: Worked on persistence overhaul

File:

• branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/Index.cs (modified) (4 diffs)

branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/Index.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -33 +33 @@
 
     public Index() {
-      indexes = new Dictionary<T, uint>();
-      values = new Dictionary<uint, T>();
-      nextIndex = 1;
+      this.indexes = new Dictionary<T, uint>();
+      this.values = new Dictionary<uint, T>();
+      nextIndex = 0;
     }
-    public Index(IEnumerable<Tuple<uint, T>> values)
+    public Index(IEnumerable<T> values)
       : this() {
       foreach (var value in values) {
-        this.indexes.Add(value.Item2, value.Item1);
-        this.values.Add(value.Item1, value.Item2);
+        this.indexes.Add(value, nextIndex);
+        this.values.Add(nextIndex, value);
         nextIndex++;
       }
@@ -47 +47 @@
 
     public uint GetIndex(T value) {
-      uint index = 0;
-      indexes.TryGetValue(value, out index);
-      if (index == 0) {
+      uint index;
+      if (!indexes.TryGetValue(value, out index)) {
         index = nextIndex;
         nextIndex++;
@@ -60 +59 @@
       return values[index];
     }
-    public IEnumerable<Tuple<uint, T>> GetValues() {
-      return values.Select(x => new Tuple<uint, T>(x.Key, x.Value));
+    public IEnumerable<T> GetValues() {
+      return values.Values;
     }
   }