refactor: move QuantumModel out of ViewModel

mnm-team · Feb 21, 2024 · 002bc25 · 002bc25
1 parent 986b142
commit 002bc25
Show file tree

Hide file tree

Showing 55 changed files with 67 additions and 66 deletions.
diff --git a/QuIDE/CodeHelpers/CodeGenerator.cs b/QuIDE/CodeHelpers/CodeGenerator.cs
@@ -7,8 +7,8 @@
 using System.Numerics;
 using System.Reflection;
 using System.Text;
-using QuIDE.ViewModels.MainModels.QuantumModel;
-using QuIDE.ViewModels.MainModels.QuantumModel.Gates;
+using QuIDE.QuantumModel;
+using QuIDE.QuantumModel.Gates;
 using QuIDE.ViewModels.MainModels.QuantumParser;
 
 #endregion

diff --git a/QuIDE/QuIDE.csproj b/QuIDE/QuIDE.csproj
@@ -13,6 +13,7 @@
     <ItemGroup>
         <Folder Include="Models"/>
         <AvaloniaResource Include="Assets\**"/>
+        <Folder Include="ViewModels\MainModels\QuantumModel\Gates\" />
         <None Remove="Assets\Images\CopyHS.png"/>
         <AvaloniaResource Include="Assets\Images\CopyHS.png"/>
         <None Remove="Assets\Images\CutHS.png"/>

diff --git a/.../MainModels/QuantumModel/ComputerModel.cs → QuIDE/QuantumModel/ComputerModel.cs b/.../MainModels/QuantumModel/ComputerModel.cs → QuIDE/QuantumModel/ComputerModel.cs
@@ -26,11 +26,11 @@ You should have received a copy of the GNU General Public License
 using System.Linq;
 using System.Numerics;
 using Avalonia.Interactivity;
-using QuIDE.ViewModels.MainModels.QuantumModel.Gates;
+using QuIDE.QuantumModel.Gates;
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel
+namespace QuIDE.QuantumModel
 {
     public class ComputerModel
     {

diff --git a/...ainModels/QuantumModel/Gates/AngleGate.cs → QuIDE/QuantumModel/Gates/AngleGate.cs b/...ainModels/QuantumModel/Gates/AngleGate.cs → QuIDE/QuantumModel/Gates/AngleGate.cs
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public abstract class AngleGate : SingleGate
     {

diff --git a/...MainModels/QuantumModel/Gates/CNotGate.cs → QuIDE/QuantumModel/Gates/CNotGate.cs b/...MainModels/QuantumModel/Gates/CNotGate.cs → QuIDE/QuantumModel/Gates/CNotGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class CNotGate : Gate
     {

diff --git a/...els/QuantumModel/Gates/CPhaseShiftGate.cs → QuIDE/QuantumModel/Gates/CPhaseShiftGate.cs b/...els/QuantumModel/Gates/CPhaseShiftGate.cs → QuIDE/QuantumModel/Gates/CPhaseShiftGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class CPhaseShiftGate : MultiControlledGate
     {

diff --git a/...odels/QuantumModel/Gates/CompositeGate.cs → QuIDE/QuantumModel/Gates/CompositeGate.cs b/...odels/QuantumModel/Gates/CompositeGate.cs → QuIDE/QuantumModel/Gates/CompositeGate.cs
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class CompositeGate : CustomGate
     {

diff --git a/...inModels/QuantumModel/Gates/CustomGate.cs → QuIDE/QuantumModel/Gates/CustomGate.cs b/...inModels/QuantumModel/Gates/CustomGate.cs → QuIDE/QuantumModel/Gates/CustomGate.cs
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public abstract class CustomGate : Gate
     {

diff --git a/...ainModels/QuantumModel/Gates/EmptyGate.cs → QuIDE/QuantumModel/Gates/EmptyGate.cs b/...ainModels/QuantumModel/Gates/EmptyGate.cs → QuIDE/QuantumModel/Gates/EmptyGate.cs
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class EmptyGate : Gate
     {

diff --git a/...els/MainModels/QuantumModel/Gates/Gate.cs → QuIDE/QuantumModel/Gates/Gate.cs b/...els/MainModels/QuantumModel/Gates/Gate.cs → QuIDE/QuantumModel/Gates/Gate.cs
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public enum GateName
     {

diff --git a/...Models/QuantumModel/Gates/HadamardGate.cs → QuIDE/QuantumModel/Gates/HadamardGate.cs b/...Models/QuantumModel/Gates/HadamardGate.cs → QuIDE/QuantumModel/Gates/HadamardGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class HadamardGate : SingleGate
     {

diff --git a/.../QuantumModel/Gates/InvCPhaseShiftGate.cs → .../QuantumModel/Gates/InvCPhaseShiftGate.cs b/.../QuantumModel/Gates/InvCPhaseShiftGate.cs → .../QuantumModel/Gates/InvCPhaseShiftGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class InvCPhaseShiftGate : MultiControlledGate
     {

diff --git a/...nModels/QuantumModel/Gates/MeasureGate.cs → QuIDE/QuantumModel/Gates/MeasureGate.cs b/...nModels/QuantumModel/Gates/MeasureGate.cs → QuIDE/QuantumModel/Gates/MeasureGate.cs
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class MeasureGate : Gate
     {

diff --git a/...QuantumModel/Gates/MultiControlledGate.cs → ...QuantumModel/Gates/MultiControlledGate.cs b/...QuantumModel/Gates/MultiControlledGate.cs → ...QuantumModel/Gates/MultiControlledGate.cs
@@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public abstract class MultiControlledGate : Gate
     {

diff --git a/...dels/QuantumModel/Gates/ParametricGate.cs → QuIDE/QuantumModel/Gates/ParametricGate.cs b/...dels/QuantumModel/Gates/ParametricGate.cs → QuIDE/QuantumModel/Gates/ParametricGate.cs
@@ -27,7 +27,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class ParametricGate : CustomGate
     {

diff --git a/...odels/QuantumModel/Gates/PhaseKickGate.cs → QuIDE/QuantumModel/Gates/PhaseKickGate.cs b/...odels/QuantumModel/Gates/PhaseKickGate.cs → QuIDE/QuantumModel/Gates/PhaseKickGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class PhaseKickGate : MultiControlledGate
     {

diff --git a/...dels/QuantumModel/Gates/PhaseScaleGate.cs → QuIDE/QuantumModel/Gates/PhaseScaleGate.cs b/...dels/QuantumModel/Gates/PhaseScaleGate.cs → QuIDE/QuantumModel/Gates/PhaseScaleGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class PhaseScaleGate : AngleGate
     {

diff --git a/...nModels/QuantumModel/Gates/RotateXGate.cs → QuIDE/QuantumModel/Gates/RotateXGate.cs b/...nModels/QuantumModel/Gates/RotateXGate.cs → QuIDE/QuantumModel/Gates/RotateXGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class RotateXGate : AngleGate
     {

diff --git a/...nModels/QuantumModel/Gates/RotateYGate.cs → QuIDE/QuantumModel/Gates/RotateYGate.cs b/...nModels/QuantumModel/Gates/RotateYGate.cs → QuIDE/QuantumModel/Gates/RotateYGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class RotateYGate : AngleGate
     {

diff --git a/...nModels/QuantumModel/Gates/RotateZGate.cs → QuIDE/QuantumModel/Gates/RotateZGate.cs b/...nModels/QuantumModel/Gates/RotateZGate.cs → QuIDE/QuantumModel/Gates/RotateZGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class RotateZGate : AngleGate
     {

diff --git a/...inModels/QuantumModel/Gates/SigmaXGate.cs → QuIDE/QuantumModel/Gates/SigmaXGate.cs b/...inModels/QuantumModel/Gates/SigmaXGate.cs → QuIDE/QuantumModel/Gates/SigmaXGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class SigmaXGate : SingleGate
     {

diff --git a/...inModels/QuantumModel/Gates/SigmaYGate.cs → QuIDE/QuantumModel/Gates/SigmaYGate.cs b/...inModels/QuantumModel/Gates/SigmaYGate.cs → QuIDE/QuantumModel/Gates/SigmaYGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class SigmaYGate : SingleGate
     {

diff --git a/...inModels/QuantumModel/Gates/SigmaZGate.cs → QuIDE/QuantumModel/Gates/SigmaZGate.cs b/...inModels/QuantumModel/Gates/SigmaZGate.cs → QuIDE/QuantumModel/Gates/SigmaZGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class SigmaZGate : SingleGate
     {

diff --git a/...inModels/QuantumModel/Gates/SingleGate.cs → QuIDE/QuantumModel/Gates/SingleGate.cs b/...inModels/QuantumModel/Gates/SingleGate.cs → QuIDE/QuantumModel/Gates/SingleGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public abstract class SingleGate : Gate
     {

diff --git a/...ainModels/QuantumModel/Gates/SqrtXGate.cs → QuIDE/QuantumModel/Gates/SqrtXGate.cs b/...ainModels/QuantumModel/Gates/SqrtXGate.cs → QuIDE/QuantumModel/Gates/SqrtXGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class SqrtXGate : SingleGate
     {

diff --git a/...nModels/QuantumModel/Gates/ToffoliGate.cs → QuIDE/QuantumModel/Gates/ToffoliGate.cs b/...nModels/QuantumModel/Gates/ToffoliGate.cs → QuIDE/QuantumModel/Gates/ToffoliGate.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class ToffoliGate : MultiControlledGate
     {

diff --git a/...nModels/QuantumModel/Gates/UnitaryGate.cs → QuIDE/QuantumModel/Gates/UnitaryGate.cs b/...nModels/QuantumModel/Gates/UnitaryGate.cs → QuIDE/QuantumModel/Gates/UnitaryGate.cs
@@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel.Gates
+namespace QuIDE.QuantumModel.Gates
 {
     public class UnitaryGate : SingleGate
     {

diff --git a/...ls/MainModels/QuantumModel/OutputState.cs → QuIDE/QuantumModel/OutputState.cs b/...ls/MainModels/QuantumModel/OutputState.cs → QuIDE/QuantumModel/OutputState.cs
@@ -26,7 +26,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel
+namespace QuIDE.QuantumModel
 {
     public class OutputState
     {

diff --git a/...ainModels/QuantumModel/OutputViewModel.cs → QuIDE/QuantumModel/OutputViewModel.cs b/...ainModels/QuantumModel/OutputViewModel.cs → QuIDE/QuantumModel/OutputViewModel.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 using Avalonia.Interactivity;
 using Quantum;
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel
+namespace QuIDE.QuantumModel
 {
     public class OutputViewModel
     {

diff --git a/...els/MainModels/QuantumModel/QubitModel.cs → QuIDE/QuantumModel/QubitModel.cs b/...els/MainModels/QuantumModel/QubitModel.cs → QuIDE/QuantumModel/QubitModel.cs
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel
+namespace QuIDE.QuantumModel
 {
     public enum QubitModel
     {

diff --git a/.../MainModels/QuantumModel/RegisterModel.cs → QuIDE/QuantumModel/RegisterModel.cs b/.../MainModels/QuantumModel/RegisterModel.cs → QuIDE/QuantumModel/RegisterModel.cs
@@ -28,7 +28,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel
+namespace QuIDE.QuantumModel
 {
     public class RegisterModel
     {

diff --git a/...nModels/QuantumModel/RegisterPartModel.cs → QuIDE/QuantumModel/RegisterPartModel.cs b/...nModels/QuantumModel/RegisterPartModel.cs → QuIDE/QuantumModel/RegisterPartModel.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel
+namespace QuIDE.QuantumModel
 {
     public struct RegisterPartModel : IEquatable<RegisterPartModel>
     {

diff --git a/...inModels/QuantumModel/RegisterRefModel.cs → QuIDE/QuantumModel/RegisterRefModel.cs b/...inModels/QuantumModel/RegisterRefModel.cs → QuIDE/QuantumModel/RegisterRefModel.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel
+namespace QuIDE.QuantumModel
 {
     public struct RegisterRefModel : IEquatable<RegisterRefModel>
     {

diff --git a/...dels/MainModels/QuantumModel/Selection.cs → QuIDE/QuantumModel/Selection.cs b/...dels/MainModels/QuantumModel/Selection.cs → QuIDE/QuantumModel/Selection.cs
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel
+namespace QuIDE.QuantumModel
 {
     public struct Selection : IEquatable<Selection>
     {

diff --git a/...dels/MainModels/QuantumModel/StepModel.cs → QuIDE/QuantumModel/StepModel.cs b/...dels/MainModels/QuantumModel/StepModel.cs → QuIDE/QuantumModel/StepModel.cs
@@ -22,11 +22,11 @@ You should have received a copy of the GNU General Public License
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using QuIDE.ViewModels.MainModels.QuantumModel.Gates;
+using QuIDE.QuantumModel.Gates;
 
 #endregion
 
-namespace QuIDE.ViewModels.MainModels.QuantumModel
+namespace QuIDE.QuantumModel
 {
     public class StepModel
     {

diff --git a/QuIDE/ViewModels/Controls/CircuitGridViewModel.cs b/QuIDE/ViewModels/Controls/CircuitGridViewModel.cs
@@ -7,8 +7,8 @@
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using QuIDE.CodeHelpers;
+using QuIDE.QuantumModel;
 using QuIDE.ViewModels.Helpers;
-using QuIDE.ViewModels.MainModels.QuantumModel;
 
 #endregion
 

diff --git a/QuIDE/ViewModels/Controls/OutputGridViewModel.cs b/QuIDE/ViewModels/Controls/OutputGridViewModel.cs
@@ -6,8 +6,8 @@
 using System.Numerics;
 using Avalonia.Interactivity;
 using QuIDE.CodeHelpers;
+using QuIDE.QuantumModel;
 using QuIDE.ViewModels.Helpers;
-using QuIDE.ViewModels.MainModels.QuantumModel;
 using QuIDE.ViewModels.MainModels.QuantumParser;
 
 #endregion

diff --git a/QuIDE/ViewModels/Controls/PropertiesViewModel.cs b/QuIDE/ViewModels/Controls/PropertiesViewModel.cs
@@ -14,11 +14,11 @@
 using QuIDE.CodeHelpers;
 using QuIDE.Properties;
 using QuIDE.ViewModels.Helpers;
-using QuIDE.ViewModels.MainModels.QuantumModel;
-using QuIDE.ViewModels.MainModels.QuantumModel.Gates;
 using QuIDE.ViewModels.MainModels.QuantumParser;
 using QuIDE.ViewModels.MainModels.QuantumParser.Validation;
 using Quantum.Helpers;
+using QuIDE.QuantumModel;
+using QuIDE.QuantumModel.Gates;
 
 #endregion
 

diff --git a/QuIDE/ViewModels/Dialog/CompositeInputViewModel.cs b/QuIDE/ViewModels/Dialog/CompositeInputViewModel.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using QuIDE.CodeHelpers;
-using QuIDE.ViewModels.MainModels.QuantumModel;
+using QuIDE.QuantumModel;
 
 #endregion
 

diff --git a/QuIDE/ViewModels/Dialog/NewRegisterInputViewModel.cs b/QuIDE/ViewModels/Dialog/NewRegisterInputViewModel.cs
@@ -8,9 +8,9 @@
 using System.Numerics;
 using System.Windows.Input;
 using QuIDE.CodeHelpers;
-using QuIDE.ViewModels.MainModels.QuantumModel;
 using Quantum;
 using Quantum.Helpers;
+using QuIDE.QuantumModel;
 
 #endregion
 

diff --git a/QuIDE/ViewModels/Dialog/ParametricInputViewModel.cs b/QuIDE/ViewModels/Dialog/ParametricInputViewModel.cs
@@ -5,9 +5,9 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using QuIDE.QuantumModel;
+using QuIDE.QuantumModel.Gates;
 using QuIDE.ViewModels.Helpers;
-using QuIDE.ViewModels.MainModels.QuantumModel;
-using QuIDE.ViewModels.MainModels.QuantumModel.Gates;
 using QuIDE.ViewModels.MainModels.QuantumParser;
 
 #endregion