Revert PCT scheduler changes.

Author: aoli-al

Src/PChecker/CheckerCore/SystematicTesting/Strategies/Feedback/PCTScheduler.cs

@@ -50,18 +50,13 @@ internal class PCTScheduler : IScheduler
         /// <summary>
         /// List of prioritized operations.
         /// </summary>
-        private readonly List<AsyncOperation> PrioritizedOperations;
-
-        /// <summary>
-        /// Next execution point where the priority should be changed.
-        /// </summary>
-        private int _nextPriorityChangePoint;
+        private readonly List<AsyncOperation> PrioritizedOperations = new();
 
         /// <summary>
-        /// Number of switch points left (leq MaxPrioritySwitchPoints).
+        /// Set of priority change points.
         /// </summary>
-        private int _numSwitchPointsLeft;
-
+        private readonly SortedSet<int> PriorityChangePoints = new();
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="PCTStrategy"/> class.
         /// </summary>
@@ -71,14 +66,11 @@ public PCTScheduler(int maxPrioritySwitchPoints, int scheduleLength, IRandomValu
             ScheduledSteps = 0;
             ScheduleLength = scheduleLength;
             MaxPrioritySwitchPoints = maxPrioritySwitchPoints;
-            PrioritizedOperations = new List<AsyncOperation>();
-            double switchPointProbability = 0.1;
             if (ScheduleLength != 0)
             {
-                switchPointProbability = 1.0 * _numSwitchPointsLeft / (ScheduleLength - ScheduledSteps + 1);
+                PreparePriorityChangePoints(ScheduleLength);
             }
-            _nextPriorityChangePoint = Generator.Mutator.Utils.SampleGeometric(switchPointProbability, random.NextDouble());
-
+            
         }
 
         public virtual bool GetNextOperation(AsyncOperation current, IEnumerable<AsyncOperation> ops,
@@ -89,7 +81,7 @@ public virtual bool GetNextOperation(AsyncOperation current, IEnumerable<AsyncOp
             var enabledOperations = ops.Where(op => op.Status is AsyncOperationStatus.Enabled).ToList();
             if (enabledOperations.Count == 0)
             {
-                if (_nextPriorityChangePoint == ScheduledSteps)
+                if (PriorityChangePoints.Contains(ScheduledSteps))
                 {
                     MovePriorityChangePointForward();
                 }
@@ -98,19 +90,29 @@ public virtual bool GetNextOperation(AsyncOperation current, IEnumerable<AsyncOp
             }
 
             var highestEnabledOp = GetPrioritizedOperation(enabledOperations, current);
-            if (next is null)
-            {
-                next = highestEnabledOp;
-            }
+            next = highestEnabledOp;
 
             return true;
         }
 
+        /// <summary>
+        /// Moves the current priority change point forward. This is a useful
+        /// optimization when a priority change point is assigned in either a
+        /// sequential execution or a nondeterministic choice.
+        /// </summary>
         private void MovePriorityChangePointForward()
         {
-            _nextPriorityChangePoint += 1;
-            Debug.WriteLine("<PCTLog> Moving priority change to '{0}'.", _nextPriorityChangePoint);
+            PriorityChangePoints.Remove(ScheduledSteps);
+            var newPriorityChangePoint = ScheduledSteps + 1;
+            while (PriorityChangePoints.Contains(newPriorityChangePoint))
+            {
+                newPriorityChangePoint++;
+            }
+
+            PriorityChangePoints.Add(newPriorityChangePoint);
+            Debug.WriteLine("<PCTLog> Moving priority change to '{0}'.", newPriorityChangePoint);
         }
+        
 
         private AsyncOperation GetHighestPriorityEnabledOperation(IEnumerable<AsyncOperation> choices)
         {
@@ -146,36 +148,21 @@ private AsyncOperation GetPrioritizedOperation(List<AsyncOperation> ops, AsyncOp
             }
 
 
-            var prioritizedSchedulable = GetHighestPriorityEnabledOperation(ops);
-            if (_nextPriorityChangePoint == ScheduledSteps)
+            if (PriorityChangePoints.Contains(ScheduledSteps))
             {
                 if (ops.Count == 1)
                 {
                     MovePriorityChangePointForward();
                 }
                 else
                 {
-                    PrioritizedOperations.Remove(prioritizedSchedulable);
-                    PrioritizedOperations.Add(prioritizedSchedulable);
-                    Debug.WriteLine("<PCTLog> Operation '{0}' changes to lowest priority.", prioritizedSchedulable);
-
-                    _numSwitchPointsLeft -= 1;
-                    // Update the next priority change point.
-                    if (_numSwitchPointsLeft > 0)
-                    {
-                        double switchPointProbability = 0.1;
-                        if (ScheduleLength != 0)
-                        {
-                            switchPointProbability = 1.0 * _numSwitchPointsLeft / (ScheduleLength - ScheduledSteps + 1);
-                        }
-
-                        _nextPriorityChangePoint =
-                            Generator.Mutator.Utils.SampleGeometric(switchPointProbability,
-                                _randomValueGenerator.NextDouble()) + ScheduledSteps;
-                    }
-
+                    var priority = GetHighestPriorityEnabledOperation(ops);
+                    PrioritizedOperations.Remove(priority);
+                    PrioritizedOperations.Add(priority);
+                    Debug.WriteLine("<PCTLog> Operation '{0}' changes to lowest priority.", priority);
                 }
             }
+            var prioritizedSchedulable = GetHighestPriorityEnabledOperation(ops);
 
             if (Debug.IsEnabled)
             {
@@ -209,18 +196,26 @@ public virtual bool PrepareForNextIteration()
         {
             ScheduleLength = Math.Max(ScheduleLength, ScheduledSteps);
             ScheduledSteps = 0;
-            _numSwitchPointsLeft = MaxPrioritySwitchPoints;
 
             PrioritizedOperations.Clear();
-            double switchPointProbability = 0.1;
-            if (ScheduleLength != 0)
+            PriorityChangePoints.Clear();
+            return true;
+        }
+
+        private void PreparePriorityChangePoints(int step)
+        {
+            List<int> listOfInts = new List<int>();
+            for (int i = 0; i < step; i++)
             {
-                switchPointProbability = 1.0 * _numSwitchPointsLeft / (ScheduleLength - ScheduledSteps + 1);
+                listOfInts.Add(i);
             }
 
-            _nextPriorityChangePoint =
-                Generator.Mutator.Utils.SampleGeometric(switchPointProbability, _randomValueGenerator.NextDouble());
-            return true;
+            for (int i = 0; i < MaxPrioritySwitchPoints; i++)
+            {
+                int index = _randomValueGenerator.Next(listOfInts.Count);
+                PriorityChangePoints.Add(listOfInts[index]);
+                listOfInts.RemoveAt(index);
+            }
         }
 
         public IScheduler Mutate()