Merge pull request #14 from merschformann/merschformann/fix-fixed-pod-storage

Fixes issue with fixed pod storage manager in combination with method management

Author: merschformann

RAWSimO.Core/Control/Defaults/MethodManagement/ScheduleMethodManager.cs

@@ -90,6 +90,8 @@ public override void Update(double lastTime, double currentTime)
                     case PodStorageMethodType.Fixed: throw new ArgumentException("Cannot switch to fixed mechanism, because the system is already running!");
                     default: throw new ArgumentException("Unknown pod storage manager: " + nextPodManagerType);
                 }
+                // Make sure that any forbidden locations are cleared (in case the previous manager was the fixed one)
+                Instance.ResourceManager.ClearForbiddenLocations();
                 // Change it
                 Instance.Controller.ExchangePodStorageManager(newPodStorageManager);
             }

RAWSimO.Core/Management/ResourceManager.cs

@@ -218,11 +218,18 @@ public IEnumerable<Waypoint> UnusedRestingLocations
         /// <param name="waypoint">The waypoint to mark as not usable for resting.</param>
         public void ForbidRestLocation(Waypoint waypoint) { _forbiddenRestingLocations.Add(waypoint); }
         /// <summary>
+        /// Clears all forbidden location. This is useful when deactivating the fixed location pod storage manager.
+        /// </summary>
+        public void ClearForbiddenLocations()
+        {
+            _forbiddenRestingLocations.Clear();
+        }
+        /// <summary>
         /// Indicates whether the given resting location is available.
         /// </summary>
         /// <param name="waypoint">The resting location to check for availability.</param>
         /// <returns><code>true</code> if the location is unoccupied, <code>false</code> otherwise.</returns>
-        public bool IsRestingLocationAvailable(Waypoint waypoint) { return _unusedPodStorageLocations.Contains(waypoint); }
+        public bool IsRestingLocationAvailable(Waypoint waypoint) { return _unusedPodStorageLocations.Contains(waypoint) && !_forbiddenRestingLocations.Contains(waypoint); }
         /// <summary>
         /// Reserves the resting location.
         /// </summary>