Unifying the two qubit managers

src/Simulation/Common/AssemblyInfo.cs

@@ -0,0 +1,7 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.Runtime.CompilerServices;
+
+// Allow the test assembly to use our internal methods
+[assembly: InternalsVisibleTo("Tests.Microsoft.Quantum.Simulators" + SigningConstants.PUBLIC_KEY)]

src/Simulation/Common/Extensions.cs

@@ -30,7 +30,7 @@ public static uint[] GetIds(this IQArray<Qubit> qubits)
         ///  a subclass of T and registers as the override of the BaseType 
         ///  it implements.
         /// </summary>
-        public static void InitBuiltinOperations<T>(this AbstractFactory<T> factory, Type t)
+        public static void InitBuiltinOperations<T>(this Factory<T> factory, Type t)
         {
             if (t == null)
             {

src/Simulation/Common/AbstractFactory.cs → src/Simulation/Common/Factory.cs

@@ -13,7 +13,7 @@ namespace Microsoft.Quantum.Simulation.Common
     ///     It also provides a mechanism to register overrides when a given
     ///     type should be replaced by a subclass.
     /// </summary>
-    public abstract class AbstractFactory<T>
+    public class Factory<T>
     {
         protected Dictionary<Type, Type> opsOverrides = new Dictionary<Type, Type>();
         protected Dictionary<Type, T> opsCache = new Dictionary<Type, T>();

src/Simulation/Common/IQuantumProcessor.cs

@@ -11,7 +11,6 @@ namespace Microsoft.Quantum.Simulation.Common
     /// </summary>
     /// <remarks>
     /// To implement a target machine that executes quantum commands, implement this interface.
-    /// Consider using <see cref="QuantumProcessorBase"/> as a stub for easy impementation of this interface.
     /// Implementors of <see cref="IQuantumProcessor"/> interface do not manage qubits on their own.
     /// All qubit management (allocation, dealocation, etc.) is done by the caller of this interface.
     /// Implementors are notified when qubits are allocated, released, borrowed and returned allowing them to react to these events if necessary.

src/Simulation/Common/IQubitManager.cs

@@ -3,41 +3,37 @@
 
 namespace Microsoft.Quantum.Simulation.Common
 {
-    using Microsoft.Quantum.Simulation.Core;
     using System.Collections.Generic;
+    using Microsoft.Quantum.Simulation.Core;
 
     public interface IQubitManager
     {
+        bool DisableBorrowing { get; }
+
+        bool IsValid(Qubit qubit);
+        bool IsFree(Qubit qubit);
+        bool IsDisabled(Qubit qubit);
+
+        long FreeQubitsCount { get; }
+        long AllocatedQubitsCount { get; }
+        IEnumerable<long> AllocatedIds();
+        long QubitsAvailableToBorrowCount(int stackFrame = 0);
+
+        void Disable(Qubit qubit);
+        void Disable(IQArray<Qubit> qubits);
+
         Qubit Allocate();
         IQArray<Qubit> Allocate(long count);
 
         void Release(Qubit qubit);
         void Release(IQArray<Qubit> qubits);
 
-        void Disable(Qubit qubit);
-        void Disable(IQArray<Qubit> qubits);
-
         Qubit Borrow();
         IQArray<Qubit> Borrow(long count);
 
         void Return(Qubit q);
         void Return(IQArray<Qubit> qubits);
 
-        bool ToBeReleasedAfterReturn(Qubit qubit);
-        long ToBeReleasedAfterReturnCount(IQArray<Qubit> qubitsToReturn);
-
-        bool IsValid(Qubit qubit);
-        bool IsFree(Qubit qubit);
-        bool IsDisabled(Qubit qubit);
-
-        long GetFreeQubitsCount();
-        long GetQubitsAvailableToBorrowCount();
-        long GetParentQubitsAvailableToBorrowCount(); // Required for GetAvailableQubitsToBorrow
-        long GetAllocatedQubitsCount();
-        IEnumerable<long> GetAllocatedIds();
-
-        bool DisableBorrowing { get; }
-
         /// <summary>
         /// Callback to notify QubitManager that an operation execution has started. 
         /// This helps manage qubits scope.