Changeset 16779 for trunk/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.1.1/SimSharp-3.1.1/Collections

Timestamp:

04/12/19 13:45:11 (6 years ago)

Author:

abeham

Message:

#2975: Updated Sim# to 3.1.1

Location:

trunk/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.1.1

Files:

• . (moved) (moved from trunk/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.11)
• SimSharp-3.1.1 (copied) (copied from trunk/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.11/SimSharp-3.0.11)
• SimSharp-3.1.1/Collections/EventQueue.cs (modified) (8 diffs)
• SimSharp-3.1.1/Collections/Extensions.cs (added)
• SimSharp-3.1.1/Collections/GenericPriorityQueue.cs (added)
• SimSharp-3.1.1/Collections/GenericPriorityQueueNode.cs (added)
• SimSharp-3.1.1/Collections/ReverseComparer.cs (added)
• SimSharp-3.1.1/Collections/SimplePriorityQueue.cs (added)

trunk/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.1.1/SimSharp-3.1.1/Collections/EventQueue.cs

@@ -6 +6 @@
   /// <summary>
   /// An implementation of a min-Priority Queue using a heap.  Has O(1) .Contains()!
-  /// See https://bitbucket.org/BlueRaja/high-speed-priority-queue-for-c/wiki/Getting%20Started for more information
+  /// See https://github.com/BlueRaja/High-Speed-Priority-Queue-for-C-Sharp/wiki/Getting-Started for more information
   /// </summary>
   /// <remarks>
@@ -48 +48 @@
     /// Removes every node from the queue.  O(n) (So, don't do this often!)
     /// </summary>
-#if AGGRESSIVE_INLINING
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-#endif
+    [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
     public void Clear() {
       Array.Clear(_nodes, 1, _numNodes);
@@ -59 +57 @@
     /// Returns (in O(1)!) whether the given node is in the queue.  O(1)
     /// </summary>
-#if AGGRESSIVE_INLINING
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-#endif
+    [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
     public bool Contains(EventQueueNode node) {
       return (_nodes[node.QueueIndex] == node);
@@ -69 +65 @@
     /// Enqueue a node - .Priority must be set beforehand!  O(log n)
     /// </summary>
-#if AGGRESSIVE_INLINING
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-#endif
+    [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
     public EventQueueNode Enqueue(DateTime primaryPriority, Event @event, int secondaryPriority = 0) {
       var node = new EventQueueNode {
@@ -84 +78 @@
       return node;
     }
-
-#if AGGRESSIVE_INLINING
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-#endif
+    
+    [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
     private void Swap(EventQueueNode node1, EventQueueNode node2) {
       //Swap the nodes
@@ -115 +107 @@
     }
 
-#if AGGRESSIVE_INLINING
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-#endif
+
+    [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
     private void CascadeDown(EventQueueNode node) {
       //aka Heapify-down
@@ -170 +161 @@
     /// Note that calling HasHigherPriority(node, node) (ie. both arguments the same node) will return false
     /// </summary>
-#if AGGRESSIVE_INLINING
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-#endif
+
+    [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
     private bool HasHigherPriority(EventQueueNode higher, EventQueueNode lower) {
       return (higher.PrimaryPriority < lower.PrimaryPriority ||
@@ -204 +194 @@
     /// O(log n)
     /// </summary>
-#if AGGRESSIVE_INLINING
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-#endif
+
+    [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
     public void UpdatePriority(EventQueueNode node, DateTime primaryPriority, int secondaryPriority) {
       node.PrimaryPriority = primaryPriority;