From bc52e3cd2185ff20d2315a496f2d043ae7a02fa7 Mon Sep 17 00:00:00 2001
From: "Mayeul@Zama" <mayeul.debellabre@zama.ai>
Date: Thu, 12 May 2022 09:19:31 +0200
Subject: [PATCH] fix(naming): rename optimise optimize

---
 concrete-optimizer-cpp/src/concrete-optimizer.rs            | 6 +++---
 concrete-optimizer/src/lib.rs                               | 2 +-
 .../src/{optimisation => optimization}/atomic_pattern.rs    | 6 +++---
 .../src/{optimisation => optimization}/mod.rs               | 0
 v0-parameters/src/main.rs                                   | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename concrete-optimizer/src/{optimisation => optimization}/atomic_pattern.rs (99%)
 rename concrete-optimizer/src/{optimisation => optimization}/mod.rs (100%)

diff --git a/concrete-optimizer-cpp/src/concrete-optimizer.rs b/concrete-optimizer-cpp/src/concrete-optimizer.rs
index 4942e4c2c..517a18b1a 100644
--- a/concrete-optimizer-cpp/src/concrete-optimizer.rs
+++ b/concrete-optimizer-cpp/src/concrete-optimizer.rs
@@ -24,7 +24,7 @@ fn optimize_bootstrap(
         .as_vec();
     let glwe_dimensions = DEFAUT_DOMAINS.glwe_pbs_constrained.glwe_dimension.as_vec();
     let internal_lwe_dimensions = DEFAUT_DOMAINS.free_glwe.glwe_dimension.as_vec();
-    let result = concrete_optimizer::optimisation::atomic_pattern::optimise_one::<u64>(
+    let result = concrete_optimizer::optimization::atomic_pattern::optimize_one::<u64>(
         sum_size,
         precision,
         security_level,
@@ -38,8 +38,8 @@ fn optimize_bootstrap(
     result.best_solution.map_or_else(no_solution, |a| a.into())
 }
 
-impl From<concrete_optimizer::optimisation::atomic_pattern::Solution> for ffi::Solution {
-    fn from(a: concrete_optimizer::optimisation::atomic_pattern::Solution) -> Self {
+impl From<concrete_optimizer::optimization::atomic_pattern::Solution> for ffi::Solution {
+    fn from(a: concrete_optimizer::optimization::atomic_pattern::Solution) -> Self {
         Self {
             input_lwe_dimension: a.input_lwe_dimension,
             internal_ks_output_lwe_dimension: a.internal_ks_output_lwe_dimension,
diff --git a/concrete-optimizer/src/lib.rs b/concrete-optimizer/src/lib.rs
index d00727b03..d5e82847c 100644
--- a/concrete-optimizer/src/lib.rs
+++ b/concrete-optimizer/src/lib.rs
@@ -20,7 +20,7 @@ pub mod computing_cost;
 pub mod global_parameters;
 pub mod graph;
 pub mod noise_estimator;
-pub mod optimisation;
+pub mod optimization;
 pub mod parameters;
 pub mod pareto;
 pub mod security;
diff --git a/concrete-optimizer/src/optimisation/atomic_pattern.rs b/concrete-optimizer/src/optimization/atomic_pattern.rs
similarity index 99%
rename from concrete-optimizer/src/optimisation/atomic_pattern.rs
rename to concrete-optimizer/src/optimization/atomic_pattern.rs
index ac7b38c84..ab054c67d 100644
--- a/concrete-optimizer/src/optimisation/atomic_pattern.rs
+++ b/concrete-optimizer/src/optimization/atomic_pattern.rs
@@ -42,7 +42,7 @@ pub struct Solution {
     pub p_error: f64, // error probability
 }
 
-// Constants during optimisation of decompositions
+// Constants during optimization of decompositions
 struct OptimizationDecompositionsConsts {
     kappa: f64,
     sum_size: u64,
@@ -351,7 +351,7 @@ fn update_state_with_best_decompositions<W: UnsignedInteger>(
     } // br ks
 }
 
-// This function provides reference values with unoptimised code, until we have non regeression tests
+// This function provides reference values with unoptimized code, until we have non regeression tests
 #[allow(clippy::float_cmp)]
 #[allow(clippy::too_many_lines)]
 fn assert_checks<W: UnsignedInteger>(
@@ -457,7 +457,7 @@ const BITS_PADDING_WITHOUT_NOISE: u64 = 1;
 const REL_EPSILON_PROBA: f64 = 1.0 + 1e-8;
 
 #[allow(clippy::too_many_lines)]
-pub fn optimise_one<W: UnsignedInteger>(
+pub fn optimize_one<W: UnsignedInteger>(
     sum_size: u64,
     precision: u64,
     security_level: u64,
diff --git a/concrete-optimizer/src/optimisation/mod.rs b/concrete-optimizer/src/optimization/mod.rs
similarity index 100%
rename from concrete-optimizer/src/optimisation/mod.rs
rename to concrete-optimizer/src/optimization/mod.rs
diff --git a/v0-parameters/src/main.rs b/v0-parameters/src/main.rs
index 9ba1c037c..cbdfd64cf 100644
--- a/v0-parameters/src/main.rs
+++ b/v0-parameters/src/main.rs
@@ -7,7 +7,7 @@
 
 use clap::Parser;
 use concrete_optimizer::global_parameters::DEFAUT_DOMAINS;
-use concrete_optimizer::optimisation::atomic_pattern as optimize_atomic_pattern;
+use concrete_optimizer::optimization::atomic_pattern as optimize_atomic_pattern;
 use rayon_cond::CondIterator;
 
 const _4_SIGMA: f64 = 1.0 - 0.999_936_657_516;
@@ -90,7 +90,7 @@ fn main() {
         let mut last_solution = None;
         manps.clone().map(|manp| {
             let noise_scale = 2_f64.powi(manp);
-            let result = optimize_atomic_pattern::optimise_one::<u64>(
+            let result = optimize_atomic_pattern::optimize_one::<u64>(
                 sum_size,
                 precision,
                 security_level,