Changeset 10538 for branches/DataPreprocessing/HeuristicLab.Collections

Timestamp:

03/05/14 14:48:13 (11 years ago)

Author:

pfleck

Message:

• merged trunk

Location:

branches/DataPreprocessing

Files:

• . (modified) (1 prop)
• HeuristicLab.Collections/3.3/BidirectionalDictionary.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/BidirectionalLookup.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/HeuristicLab.Collections-3.3.csproj (modified) (1 diff)
• HeuristicLab.Collections/3.3/ObservableArray.cs (modified) (7 diffs)
• HeuristicLab.Collections/3.3/ObservableList.cs (modified) (5 diffs)
• HeuristicLab.Collections/3.3/Plugin.cs.frame (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.Collections/3.3/BidirectionalDictionary.cs

@@ -67 +67 @@
     }
 
-    public IEnumerable<TFirst> FirstValues {
+    public IEnumerable<TFirst> FirstKeys {
       get { return firstToSecond.Keys; }
     }
 
-    public IEnumerable<TSecond> SecondValues {
+    public IEnumerable<TSecond> SecondKeys {
       get { return secondToFirst.Keys; }
     }

branches/DataPreprocessing/HeuristicLab.Collections/3.3/BidirectionalLookup.cs

@@ -62 +62 @@
     }
 
-    public IEnumerable<IEnumerable<TSecond>> FirstValues {
-      get { return firstToSecond.Values.AsEnumerable(); }
-    }
-
-    public IEnumerable<IEnumerable<TFirst>> SecondValues {
-      get { return secondToFirst.Values.AsEnumerable(); }
+    public IEnumerable<TFirst> FirstKeys {
+      get { return firstToSecond.Keys.AsEnumerable(); }
+    }
+
+    public IEnumerable<TSecond> SecondKeys {
+      get { return secondToFirst.Keys.AsEnumerable(); }
     }
 

branches/DataPreprocessing/HeuristicLab.Collections/3.3/HeuristicLab.Collections-3.3.csproj

@@ -157 +157 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
+      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
+      <Name>HeuristicLab.Common-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>

branches/DataPreprocessing/HeuristicLab.Collections/3.3/ObservableArray.cs

@@ -25 +25 @@
 using System.ComponentModel;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -168 +169 @@
         Array.Clear(array, index, length);
         OnPropertyChanged("Item[]");
-        OnItemsReplaced(GetIndexedItems(index, length), oldItems); 
+        OnItemsReplaced(GetIndexedItems(index, length), oldItems);
       }
     }
@@ -205 +206 @@
       if (array.Length > 1) {
         IndexedItem<T>[] oldItems = GetIndexedItems();
-        Array.Sort<T>(array);
+        array.StableSort();
         OnPropertyChanged("Item[]");
         OnItemsMoved(GetIndexedItems(), oldItems);
@@ -213 +214 @@
       if (array.Length > 1) {
         IndexedItem<T>[] oldItems = GetIndexedItems();
-        Array.Sort<T>(array, comparison);
+        array.StableSort(comparison);
         OnPropertyChanged("Item[]");
         OnItemsMoved(GetIndexedItems(), oldItems);
@@ -221 +222 @@
       if (array.Length > 1) {
         IndexedItem<T>[] oldItems = GetIndexedItems();
-        Array.Sort<T>(array, comparer);
+        array.StableSort(comparer);
         OnPropertyChanged("Item[]");
         OnItemsMoved(GetIndexedItems(), oldItems);
@@ -229 +230 @@
       if (length > 1) {
         IndexedItem<T>[] oldItems = GetIndexedItems(index, length);
-        Array.Sort<T>(array, index, length);
+        array.StableSort(index, length);
         OnPropertyChanged("Item[]");
         OnItemsMoved(GetIndexedItems(index, length), oldItems);
@@ -237 +238 @@
       if (length > 1) {
         IndexedItem<T>[] oldItems = GetIndexedItems(index, length);
-        Array.Sort<T>(array, index, length, comparer);
+        array.StableSort(index, length, comparer);
         OnPropertyChanged("Item[]");
         OnItemsMoved(GetIndexedItems(index, length), oldItems);

branches/DataPreprocessing/HeuristicLab.Collections/3.3/ObservableList.cs

@@ -25 +25 @@
 using System.ComponentModel;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -320 +321 @@
       if (list.Count > 1) {
         IndexedItem<T>[] oldItems = GetIndexedItems();
-        list.Sort();
+        list.StableSort();
         OnItemsMoved(GetIndexedItems(), oldItems);
         OnPropertyChanged("Item[]");
@@ -328 +329 @@
       if (list.Count > 1) {
         IndexedItem<T>[] oldItems = GetIndexedItems();
-        list.Sort(comparison);
+        list.StableSort(comparison);
         OnItemsMoved(GetIndexedItems(), oldItems);
         OnPropertyChanged("Item[]");
@@ -336 +337 @@
       if (list.Count > 1) {
         IndexedItem<T>[] oldItems = GetIndexedItems();
-        list.Sort(comparer);
+        list.StableSort(comparer);
         OnItemsMoved(GetIndexedItems(), oldItems);
         OnPropertyChanged("Item[]");
@@ -344 +345 @@
       if (count > 1) {
         IndexedItem<T>[] oldItems = GetIndexedItems(index, count);
-        list.Sort(index, count, comparer);
+        list.StableSort(index, count, comparer);
         OnItemsMoved(GetIndexedItems(index, count), oldItems);
         OnPropertyChanged("Item[]");

branches/DataPreprocessing/HeuristicLab.Collections/3.3/Plugin.cs.frame

@@ -29 +29 @@
   [PluginFile("HeuristicLab.Collections-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Common", "3.3")]
   public class HeuristicLabCollectionsPlugin : PluginBase {
   }