More registers added

Author: Rúben André Barreiro

src/main/java/org/quisl/framework/java/registers/Register.java

@@ -6,32 +6,84 @@ public abstract class Register {
 
     private Long id;
 
+    private Character prefix;
+
     private String registerName;
 
-    public Register(Long id, String registerName) {
+    private Integer registerSize;
+
+
+    public Register(Long id, Character prefix, String registerName, Integer registerSize) {
+
         this.id = id;
+
+        this.prefix = prefix;
+
         this.registerName = registerName;
+
+        this.registerSize = registerSize;
+
     }
 
+
     public Long getId() {
+
         return this.id;
+
     }
 
     public void setId(Long id) {
         this.id = id;
     }
 
+    public Character getPrefix() {
+        return this.prefix;
+    }
+
+    public void setPrefix(Character prefix) {
+        this.prefix = prefix;
+    }
+
+    public String getRegisterName() {
+
+        return this.registerName;
+
+    }
+
+    public void setRegisterName(String registerName) {
+
+        this.registerName = registerName;
+
+    }
+
+    public Integer getRegisterSize() {
+
+        return this.registerSize;
+
+    }
+
+    public void setRegisterSize(Integer registerSize) {
+
+        this.registerSize = registerSize;
+
+    }
+
     @Override
     public boolean equals(Object o) {
 
         if (this == o) {
+
             return true;
+
         }
 
         if (o == null || getClass() != o.getClass()) {
+
             return false;
+
         }
 
+
         Register register = (Register) o;
 
         return Objects.equals(this.id, register.id);

src/main/java/org/quisl/framework/java/registers/classical/ClassicalRegister.java

@@ -1,137 +1,96 @@
 package org.quisl.framework.java.registers.classical;
 
-import org.quisl.framework.java.math.complex.ComplexNumber;
 import org.quisl.framework.java.registers.Register;
+import org.quisl.framework.java.registers.common.RegisterUnitPrefixes;
 import org.quisl.framework.java.units.computing.classical.binary.deterministic.bits.Bit;
-import org.quisl.framework.java.units.computing.quantum.binary.qubits.Qubit;
 
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 public class ClassicalRegister extends Register {
 
-    private Bit[] bits;
+    private List<Bit> bits;
 
-    private float[] bitsProbabilities;
 
+    public ClassicalRegister(Long id, Integer numBits) {
 
-    public ClassicalRegister(Long id) {
+        super( id, RegisterUnitPrefixes.CLASSICAL_REGISTER_UNIT.getRegisterUnitCharacter(),
+             ( "cl-reg-" + id ), numBits );
 
-        super(id, "cl_reg" + id);
+        this.bits = new ArrayList<>(numBits);
 
-        this.setup("|0⟩", "|1⟩");
+        this.addBits(numBits);
 
     }
 
-    public ClassicalRegister(Long id, String stateNameBitNum1, String stateNameBitNum2) {
+    public ClassicalRegister(Long id, String classicalRegisterName, Integer numBits) {
 
-        super(id, "cl_reg" + id);
+        super( id, RegisterUnitPrefixes.CLASSICAL_REGISTER_UNIT.getRegisterUnitCharacter(),
+               classicalRegisterName, numBits );
 
-        this.setup(stateNameBitNum1, stateNameBitNum2);
+        this.bits = new ArrayList<>(numBits);
 
-    }
-
-    public ClassicalRegister(Long id, String classicalRegisterName, String stateNameBitNum1, String stateNameBitNum2) {
-
-        super(id, classicalRegisterName);
-
-        this.setup(stateNameBitNum1, stateNameBitNum2);
+        this.addBits(numBits);
 
     }
 
-    private void setup(String stateNameBitNum1, String stateNameBitNum2) {
+    public void addBits(Integer numBits) {
 
-        this.setupBits(stateNameBitNum1, stateNameBitNum2);
-        this.setupBitsProbabilities();
+        for(Long currentBit = 0L; currentBit < numBits; currentBit++) {
 
-    }
+            Bit bit = new Bit(currentBit);
 
-    private void setupBits(String stateNameBitNum1, String stateNameBitNum2) {
+            this.bits.add(bit);
 
-        this.bits = new Bit[2];
-
-        this.bits[0] = new Bit(1L, Bit.ZERO_STATE, stateNameBitNum1);
-        this.bits[1] = new Bit(2L, Bit.ONE_STATE, stateNameBitNum2);
+        }
 
     }
 
-    private void setupBitsProbabilities() {
-
-        this.bitsProbabilities = new float[2];
-
-        this.bitsProbabilities[Bit.ZERO_STATE] = 1.0f;
-        this.bitsProbabilities[Bit.ONE_STATE] = 0.0f;
+    public List<Bit> getBits() {
 
-    }
-
-    public Bit[] getBits() {
         return this.bits;
-    }
-
-    public void setBits(Bit[] bits) {
-        this.bits = bits;
-    }
-
-    public float[] getBitsProbabilities() {
-        return this.bitsProbabilities;
-    }
 
-    public void setBitsProbabilities(float[] bitsProbabilities) {
-        this.bitsProbabilities = bitsProbabilities;
     }
 
-    public void retrieveMeasurement(Qubit qubit) {
+    public void setBits(List<Bit> bits) {
 
-        if ( qubit.isMeasurementPerformed() ) {
-
-            ComplexNumber[] qubitAmplitudes = qubit.getAmplitudes();
-
-            this.bitsProbabilities[0] = (float) Math.pow(qubitAmplitudes[0].modulus(), 2.0);
-            this.bitsProbabilities[1] = (float) Math.pow(qubitAmplitudes[1].modulus(), 2.0);
-
-        }
+        this.bits = bits;
 
     }
 
     @Override
     public boolean equals(Object o) {
 
         if (this == o) {
+
             return true;
+
         }
 
         if (o == null || getClass() != o.getClass()) {
+
             return false;
+
         }
 
         if (!super.equals(o)) {
+
             return false;
+
         }
 
         ClassicalRegister that = (ClassicalRegister) o;
 
-        return Arrays.equals(bits, that.bits) &&
-               Arrays.equals(bitsProbabilities, that.bitsProbabilities);
+        return Objects.equals(this.bits, that.bits);
 
     }
 
     @Override
     public int hashCode() {
 
-        int result = super.hashCode();
-
-        result = 31 * result + Arrays.hashCode(bits);
-
-        result = 31 * result + Arrays.hashCode(bitsProbabilities);
-
-        return result;
+        return Objects.hash(super.hashCode(), this.bits);
 
     }
 
-    @Override
-    public String toString() {
-        return "ClassicalRegister{" +
-                "bits=" + Arrays.toString(bits) +
-                ", bitsProbabilities=" + Arrays.toString(bitsProbabilities) +
-                '}';
-    }
 }

src/main/java/org/quisl/framework/java/registers/quantum/QuantumRegister.java

@@ -1,6 +1,7 @@
 package org.quisl.framework.java.registers.quantum;
 
 import org.quisl.framework.java.registers.Register;
+import org.quisl.framework.java.registers.common.RegisterUnitPrefixes;
 import org.quisl.framework.java.units.computing.quantum.binary.qubits.Qubit;
 
 import java.util.ArrayList;
@@ -14,19 +15,21 @@ public class QuantumRegister extends Register {
 
     public QuantumRegister(Long id, Integer numQubits) {
 
-        super(id, "qu_reg" + id);
+        super( id, RegisterUnitPrefixes.QUANTUM_REGISTER_UNIT.getRegisterUnitCharacter(),
+             ( "qu-reg-" + id ), numQubits );
 
-        this.qubits = new ArrayList<>();
+        this.qubits = new ArrayList<>(numQubits);
 
         this.addQubits(numQubits);
 
     }
 
     public QuantumRegister(Long id, String quantumRegisterName, Integer numQubits) {
 
-        super(id, quantumRegisterName);
+        super( id, RegisterUnitPrefixes.QUANTUM_REGISTER_UNIT.getRegisterUnitCharacter(),
+               quantumRegisterName, numQubits );
 
-        this.qubits = new ArrayList<>();
+        this.qubits = new ArrayList<>(numQubits);
 
         this.addQubits(numQubits);