Align idle-noise vocabulary across DEM, engines and neo, and emit the requested Pauli channel

crates/benchmarks/benches/modules/noise_models.rs

@@ -97,10 +97,10 @@ fn bench_depolarizing_noise<M: Measurement>(c: &mut Criterion<M>) {
         // Benchmark mixed gate set (more realistic)
         group.bench_with_input(BenchmarkId::new("mixed", num_gates), &num_gates, |b, &n| {
             let mut noise = DepolarizingNoiseModel::builder()
-                .with_prep_probability(0.001)
-                .with_meas_probability(0.001)
-                .with_single_qubit_probability(0.0005)
-                .with_two_qubit_probability(0.002)
+                .with_p_prep(0.001)
+                .with_p_meas(0.001)
+                .with_p1(0.0005)
+                .with_p2(0.002)
                 .with_seed(42)
                 .build();
 
@@ -130,10 +130,10 @@ fn bench_depolarizing_noise<M: Measurement>(c: &mut Criterion<M>) {
             b.iter(|| {
                 // Recreate with seed for reproducibility
                 noise = DepolarizingNoiseModel::builder()
-                    .with_prep_probability(0.001)
-                    .with_meas_probability(0.001)
-                    .with_single_qubit_probability(0.0005)
-                    .with_two_qubit_probability(0.002)
+                    .with_p_prep(0.001)
+                    .with_p_meas(0.001)
+                    .with_p1(0.0005)
+                    .with_p2(0.002)
                     .with_seed(42)
                     .build();
                 let result = noise.start(input.clone()).unwrap();

crates/pecos-cli/src/main.rs

@@ -569,11 +569,11 @@ fn run_program(args: &RunArgs) -> Result<(), PecosError> {
                 parse_general_noise_probabilities(args.noise_probability.as_ref());
             builder = builder.noise(
                 GeneralNoiseModelBuilder::new()
-                    .with_prep_probability(prep)
-                    .with_meas_0_probability(meas_0)
-                    .with_meas_1_probability(meas_1)
-                    .with_p1_probability(single_qubit)
-                    .with_p2_probability(two_qubit),
+                    .with_p_prep(prep)
+                    .with_p_meas_0(meas_0)
+                    .with_p_meas_1(meas_1)
+                    .with_p1(single_qubit)
+                    .with_p2(two_qubit),
             );
         }
     }

crates/pecos-engines/examples/biased_depolarizing_example.rs

@@ -51,11 +51,11 @@ fn example1_different_bias_levels(circ: &ByteMessage, quantum: &StateVecEngine)
     for (p_flip_0, p_flip_1, desc) in configs {
         // Create the biased depolarizing noise model
         let noise = BiasedDepolarizingNoiseModel::builder()
-            .with_prep_probability(0.0)
-            .with_meas_0_probability(p_flip_0) // Probability of flipping 0 to 1
-            .with_meas_1_probability(p_flip_1) // Probability of flipping 1 to 0
-            .with_p1_probability(0.0)
-            .with_p2_probability(0.0)
+            .with_p_prep(0.0)
+            .with_p_meas_0(p_flip_0) // Probability of flipping 0 to 1
+            .with_p_meas_1(p_flip_1) // Probability of flipping 1 to 0
+            .with_p1(0.0)
+            .with_p2(0.0)
             .build();
         let mut system = QuantumSystem::new(Box::new(noise), Box::new(quantum.clone()));
 
@@ -110,11 +110,11 @@ fn example2_with_seed(circ: &ByteMessage) {
     println!("Example 2: Using direct constructor with seed");
 
     let noise = BiasedDepolarizingNoiseModel::builder()
-        .with_prep_probability(0.0)
-        .with_meas_0_probability(0.4) // Probability of flipping 0 to 1
-        .with_meas_1_probability(0.1) // Probability of flipping 1 to 0
-        .with_p1_probability(0.0)
-        .with_p2_probability(0.0)
+        .with_p_prep(0.0)
+        .with_p_meas_0(0.4) // Probability of flipping 0 to 1
+        .with_p_meas_1(0.1) // Probability of flipping 1 to 0
+        .with_p1(0.0)
+        .with_p2(0.0)
         .with_seed(123)
         .build();
     let quantum = Box::new(StateVecEngine::new(1));
@@ -170,11 +170,11 @@ fn example3_bell_state() {
     // Create a new quantum system with 2 qubits
     let quantum2 = Box::new(StateVecEngine::new(2));
     let noise2 = BiasedDepolarizingNoiseModel::builder()
-        .with_prep_probability(0.0)
-        .with_meas_0_probability(0.2) // Probability of flipping 0 to 1
-        .with_meas_1_probability(0.3) // Probability of flipping 1 to 0
-        .with_p1_probability(0.0)
-        .with_p2_probability(0.0)
+        .with_p_prep(0.0)
+        .with_p_meas_0(0.2) // Probability of flipping 0 to 1
+        .with_p_meas_1(0.3) // Probability of flipping 1 to 0
+        .with_p1(0.0)
+        .with_p2(0.0)
         .build();
     let mut system2 = QuantumSystem::new(Box::new(noise2), quantum2);
 

crates/pecos-engines/examples/compare_noise_models.rs

@@ -41,11 +41,11 @@ fn compare_depolarizing_with_general(circ: &ByteMessage) {
 
     // Create equivalent general noise model
     let general_noise = GeneralNoiseModel::builder()
-        .with_prep_probability(p_noise)
-        .with_meas_0_probability(p_noise)
-        .with_meas_1_probability(p_noise)
-        .with_p1_probability(p_noise)
-        .with_p2_probability(p_noise)
+        .with_p_prep(p_noise)
+        .with_p_meas_0(p_noise)
+        .with_p_meas_1(p_noise)
+        .with_p1(p_noise)
+        .with_p2(p_noise)
         .with_seed(seed)
         .build();
     let mut general_system = QuantumSystem::new(Box::new(general_noise), Box::new(quantum.clone()));
@@ -183,22 +183,22 @@ fn test_asymmetric_measurements() {
     let p1 = 0.05;
 
     let general_noise = GeneralNoiseModel::builder()
-        .with_prep_probability(p_prep)
-        .with_meas_0_probability(p_meas_0)
-        .with_meas_1_probability(p_meas_1)
-        .with_p1_probability(p1)
-        .with_p2_probability(0.0) // Not used in this circuit
+        .with_p_prep(p_prep)
+        .with_p_meas_0(p_meas_0)
+        .with_p_meas_1(p_meas_1)
+        .with_p1(p1)
+        .with_p2(0.0) // Not used in this circuit
         .with_seed(seed)
         .build();
     let mut general_system = QuantumSystem::new(Box::new(general_noise), Box::new(quantum.clone()));
 
     // For comparison, a depolarizing model with symmetric errors
     let p_depolarizing = f64::midpoint(p_meas_0, p_meas_1); // Average of the asymmetric errors
     let depolarizing_noise = DepolarizingNoiseModel::builder()
-        .with_prep_probability(p_prep)
-        .with_meas_probability(p_depolarizing)
-        .with_single_qubit_probability(p1)
-        .with_two_qubit_probability(0.0)
+        .with_p_prep(p_prep)
+        .with_p_meas(p_depolarizing)
+        .with_p1(p1)
+        .with_p2(0.0)
         .with_seed(seed)
         .build();
     let mut depolarizing_system =

crates/pecos-engines/examples/general_noise_test.rs

@@ -49,23 +49,23 @@ fn compare_biased_and_general(circ: &ByteMessage, quantum: &StateVecEngine) {
     for (p_flip_0, p_flip_1, desc) in configs {
         // Create biased depolarizing noise model with custom settings
         let biased_noise = BiasedDepolarizingNoiseModel::builder()
-            .with_prep_probability(0.0)
-            .with_meas_0_probability(p_flip_0) // Probability of flipping 0 to 1
-            .with_meas_1_probability(p_flip_1) // Probability of flipping 1 to 0
-            .with_p1_probability(0.0)
-            .with_p2_probability(0.0)
+            .with_p_prep(0.0)
+            .with_p_meas_0(p_flip_0) // Probability of flipping 0 to 1
+            .with_p_meas_1(p_flip_1) // Probability of flipping 1 to 0
+            .with_p1(0.0)
+            .with_p2(0.0)
             .with_seed(seed)
             .build();
         let mut biased_system =
             QuantumSystem::new(Box::new(biased_noise), Box::new(quantum.clone()));
 
         // Create equivalent general noise model (with gate noise set to 0)
         let general_noise = GeneralNoiseModel::builder()
-            .with_prep_probability(0.0)
-            .with_meas_0_probability(p_flip_0)
-            .with_meas_1_probability(p_flip_1)
-            .with_p1_probability(0.0)
-            .with_p2_probability(0.0)
+            .with_p_prep(0.0)
+            .with_p_meas_0(p_flip_0)
+            .with_p_meas_1(p_flip_1)
+            .with_p1(0.0)
+            .with_p2(0.0)
             .with_seed(seed)
             .build();
         let mut general_system =
@@ -155,22 +155,22 @@ fn bell_state_comparison() {
 
     // Create biased depolarizing noise model with custom settings
     let biased_noise = BiasedDepolarizingNoiseModel::builder()
-        .with_prep_probability(0.0)
-        .with_meas_0_probability(p_flip_0) // Probability of flipping 0 to 1
-        .with_meas_1_probability(p_flip_1) // Probability of flipping 1 to 0
-        .with_p1_probability(0.0)
-        .with_p2_probability(0.0)
+        .with_p_prep(0.0)
+        .with_p_meas_0(p_flip_0) // Probability of flipping 0 to 1
+        .with_p_meas_1(p_flip_1) // Probability of flipping 1 to 0
+        .with_p1(0.0)
+        .with_p2(0.0)
         .with_seed(seed)
         .build();
     let mut biased_system = QuantumSystem::new(Box::new(biased_noise), Box::new(quantum.clone()));
 
     // Create equivalent general noise model
     let general_noise = GeneralNoiseModel::builder()
-        .with_prep_probability(0.0)
-        .with_meas_0_probability(p_flip_0)
-        .with_meas_1_probability(p_flip_1)
-        .with_p1_probability(0.0)
-        .with_p2_probability(0.0)
+        .with_p_prep(0.0)
+        .with_p_meas_0(p_flip_0)
+        .with_p_meas_1(p_flip_1)
+        .with_p1(0.0)
+        .with_p2(0.0)
         .with_seed(seed)
         .build();
     let mut general_system = QuantumSystem::new(Box::new(general_noise), Box::new(quantum.clone()));

crates/pecos-engines/examples/run_noisy_circ_with_general.rs

@@ -30,11 +30,11 @@ fn main() {
 
     // Create GeneralNoise with uniform probability for all error types
     let mut noise_builder = GeneralNoiseModel::builder()
-        .with_prep_probability(0.1)
-        .with_meas_0_probability(0.1)
-        .with_meas_1_probability(0.1)
-        .with_p1_probability(0.1)
-        .with_p2_probability(0.1);
+        .with_p_prep(0.1)
+        .with_p_meas_0(0.1)
+        .with_p_meas_1(0.1)
+        .with_p1(0.1)
+        .with_p2(0.1);
 
     // Set seed if provided
     if let Some(seed) = seed_option {

crates/pecos-engines/src/noise/biased_depolarizing.rs

@@ -41,11 +41,11 @@ use std::any::Any;
 ///
 /// // Or use the builder pattern
 /// let noise_model = BiasedDepolarizingNoiseModel::builder()
-///     .with_prep_probability(0.01)
-///     .with_meas_0_probability(0.02)
-///     .with_meas_1_probability(0.03)
-///     .with_single_qubit_probability(0.04)
-///     .with_two_qubit_probability(0.05)
+///     .with_p_prep(0.01)
+///     .with_p_meas_0(0.02)
+///     .with_p_meas_1(0.03)
+///     .with_p1(0.04)
+///     .with_p2(0.05)
 ///     .with_seed(42)
 ///     .build();
 ///
@@ -512,7 +512,19 @@ impl RngManageable for BiasedDepolarizingNoiseModel {
     }
 }
 
-/// Builder for creating biased depolarizing noise models
+/// Builder for creating biased depolarizing noise models.
+///
+/// The retired descriptive probability setters are intentionally unavailable:
+///
+/// ```compile_fail
+/// use pecos_engines::noise::BiasedDepolarizingNoiseModel;
+/// let _ = BiasedDepolarizingNoiseModel::builder().with_single_qubit_probability(0.01);
+/// ```
+///
+/// ```compile_fail
+/// use pecos_engines::noise::BiasedDepolarizingNoiseModel;
+/// let _ = BiasedDepolarizingNoiseModel::builder().with_two_qubit_probability(0.01);
+/// ```
 #[derive(Debug, Clone)]
 pub struct BiasedDepolarizingNoiseModelBuilder {
     p_prep: Option<f64>,
@@ -561,55 +573,39 @@ impl BiasedDepolarizingNoiseModelBuilder {
 
     /// Set the probability of error during preparation
     #[must_use]
-    pub fn with_prep_probability(mut self, probability: f64) -> Self {
+    pub fn with_p_prep(mut self, probability: f64) -> Self {
         self.p_prep = Some(probability);
         self
     }
 
     /// Set the probability of flipping 0 to 1 during measurement
     #[must_use]
-    pub fn with_meas_0_probability(mut self, probability: f64) -> Self {
+    pub fn with_p_meas_0(mut self, probability: f64) -> Self {
         self.p_meas_0 = Some(probability);
         self
     }
 
     /// Set the probability of flipping 1 to 0 during measurement
     #[must_use]
-    pub fn with_meas_1_probability(mut self, probability: f64) -> Self {
+    pub fn with_p_meas_1(mut self, probability: f64) -> Self {
         self.p_meas_1 = Some(probability);
         self
     }
 
     /// Set the probability of error after single-qubit gates
     #[must_use]
-    pub fn with_p1_probability(mut self, probability: f64) -> Self {
+    pub fn with_p1(mut self, probability: f64) -> Self {
         self.p1 = Some(probability);
         self
     }
 
-    /// Set the probability of error after single-qubit gates
-    ///
-    /// This is an alias for `with_p1_probability` for API consistency.
-    #[must_use]
-    pub fn with_single_qubit_probability(self, probability: f64) -> Self {
-        self.with_p1_probability(probability)
-    }
-
     /// Set the probability of error after two-qubit gates
     #[must_use]
-    pub fn with_p2_probability(mut self, probability: f64) -> Self {
+    pub fn with_p2(mut self, probability: f64) -> Self {
         self.p2 = Some(probability);
         self
     }
 
-    /// Set the probability of error after two-qubit gates
-    ///
-    /// This is an alias for `with_p2_probability` for API consistency.
-    #[must_use]
-    pub fn with_two_qubit_probability(self, probability: f64) -> Self {
-        self.with_p2_probability(probability)
-    }
-
     /// Set the seed for the random number generator
     #[must_use]
     pub fn with_seed(mut self, seed: u64) -> Self {
@@ -715,11 +711,11 @@ mod tests {
     fn test_builder() {
         // Create a noise model with the builder
         let noise = BiasedDepolarizingNoiseModel::builder()
-            .with_prep_probability(0.1)
-            .with_meas_0_probability(0.2)
-            .with_meas_1_probability(0.3)
-            .with_p1_probability(0.4)
-            .with_p2_probability(0.5)
+            .with_p_prep(0.1)
+            .with_p_meas_0(0.2)
+            .with_p_meas_1(0.3)
+            .with_p1(0.4)
+            .with_p2(0.5)
             .build();
 
         // Get the boxed noise model's probabilities using any_ref downcast