wip

poulpy-core/src/layouts/gglwe_atk.rs

@@ -4,15 +4,15 @@ use poulpy_hal::{
 };
 
 use crate::layouts::{
-    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GGLWESwitchingKey, GGLWESwitchingKeyToMut, GLWECiphertext, GLWEInfos, LWEInfos,
-    Rank, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWECiphertext, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeyToMut,
+    GLWESwitchingKeyToRef, LWEInfos, Rank, TorusPrecision,
 };
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 
 use std::fmt;
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
-pub struct GGLWEAutomorphismKeyLayout {
+pub struct AutomorphismKeyLayout {
     pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
@@ -22,18 +22,18 @@ pub struct GGLWEAutomorphismKeyLayout {
 }
 
 #[derive(PartialEq, Eq, Clone)]
-pub struct GGLWEAutomorphismKey<D: Data> {
-    pub(crate) key: GGLWESwitchingKey<D>,
+pub struct AutomorphismKey<D: Data> {
+    pub(crate) key: GLWESwitchingKey<D>,
     pub(crate) p: i64,
 }
 
-impl<D: Data> GGLWEAutomorphismKey<D> {
+impl<D: Data> AutomorphismKey<D> {
     pub fn p(&self) -> i64 {
         self.p
     }
 }
 
-impl<D: Data> LWEInfos for GGLWEAutomorphismKey<D> {
+impl<D: Data> LWEInfos for AutomorphismKey<D> {
     fn n(&self) -> Degree {
         self.key.n()
     }
@@ -51,13 +51,13 @@ impl<D: Data> LWEInfos for GGLWEAutomorphismKey<D> {
     }
 }
 
-impl<D: Data> GLWEInfos for GGLWEAutomorphismKey<D> {
+impl<D: Data> GLWEInfos for AutomorphismKey<D> {
     fn rank(&self) -> Rank {
         self.rank_out()
     }
 }
 
-impl<D: Data> GGLWEInfos for GGLWEAutomorphismKey<D> {
+impl<D: Data> GGLWEInfos for AutomorphismKey<D> {
     fn rank_in(&self) -> Rank {
         self.key.rank_in()
     }
@@ -75,7 +75,7 @@ impl<D: Data> GGLWEInfos for GGLWEAutomorphismKey<D> {
     }
 }
 
-impl LWEInfos for GGLWEAutomorphismKeyLayout {
+impl LWEInfos for AutomorphismKeyLayout {
     fn base2k(&self) -> Base2K {
         self.base2k
     }
@@ -89,13 +89,13 @@ impl LWEInfos for GGLWEAutomorphismKeyLayout {
     }
 }
 
-impl GLWEInfos for GGLWEAutomorphismKeyLayout {
+impl GLWEInfos for AutomorphismKeyLayout {
     fn rank(&self) -> Rank {
         self.rank
     }
 }
 
-impl GGLWEInfos for GGLWEAutomorphismKeyLayout {
+impl GGLWEInfos for AutomorphismKeyLayout {
     fn rank_in(&self) -> Rank {
         self.rank
     }
@@ -113,25 +113,25 @@ impl GGLWEInfos for GGLWEAutomorphismKeyLayout {
     }
 }
 
-impl<D: DataRef> fmt::Debug for GGLWEAutomorphismKey<D> {
+impl<D: DataRef> fmt::Debug for AutomorphismKey<D> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{self}")
     }
 }
 
-impl<D: DataMut> FillUniform for GGLWEAutomorphismKey<D> {
+impl<D: DataMut> FillUniform for AutomorphismKey<D> {
     fn fill_uniform(&mut self, log_bound: usize, source: &mut Source) {
         self.key.fill_uniform(log_bound, source);
     }
 }
 
-impl<D: DataRef> fmt::Display for GGLWEAutomorphismKey<D> {
+impl<D: DataRef> fmt::Display for AutomorphismKey<D> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "(AutomorphismKey: p={}) {}", self.p, self.key)
     }
 }
 
-impl GGLWEAutomorphismKey<Vec<u8>> {
+impl AutomorphismKey<Vec<u8>> {
     pub fn alloc<A>(infos: &A) -> Self
     where
         A: GGLWEInfos,
@@ -141,15 +141,15 @@ impl GGLWEAutomorphismKey<Vec<u8>> {
             infos.rank_out(),
             "rank_in != rank_out is not supported for GGLWEAutomorphismKey"
         );
-        GGLWEAutomorphismKey {
-            key: GGLWESwitchingKey::alloc(infos),
+        AutomorphismKey {
+            key: GLWESwitchingKey::alloc(infos),
             p: 0,
         }
     }
 
     pub fn alloc_with(n: Degree, base2k: Base2K, k: TorusPrecision, rank: Rank, dnum: Dnum, dsize: Dsize) -> Self {
-        GGLWEAutomorphismKey {
-            key: GGLWESwitchingKey::alloc_with(n, base2k, k, rank, rank, dnum, dsize),
+        AutomorphismKey {
+            key: GLWESwitchingKey::alloc_with(n, base2k, k, rank, rank, dnum, dsize),
             p: 0,
         }
     }
@@ -163,54 +163,66 @@ impl GGLWEAutomorphismKey<Vec<u8>> {
             infos.rank_out(),
             "rank_in != rank_out is not supported for GGLWEAutomorphismKey"
         );
-        GGLWESwitchingKey::alloc_bytes(infos)
+        GLWESwitchingKey::alloc_bytes(infos)
     }
 
     pub fn bytes_of(n: Degree, base2k: Base2K, k: TorusPrecision, rank: Rank, dnum: Dnum, dsize: Dsize) -> usize {
-        GGLWESwitchingKey::alloc_bytes_with(n, base2k, k, rank, rank, dnum, dsize)
+        GLWESwitchingKey::alloc_bytes_with(n, base2k, k, rank, rank, dnum, dsize)
     }
 }
 
-pub trait GGLWEAutomorphismKeyToMut {
-    fn to_mut(&mut self) -> GGLWEAutomorphismKey<&mut [u8]>;
+pub trait AutomorphismKeyToMut {
+    fn to_mut(&mut self) -> AutomorphismKey<&mut [u8]>;
 }
 
-impl<D: DataMut> GGLWEAutomorphismKeyToMut for GGLWEAutomorphismKey<D>
+impl<D: DataMut> AutomorphismKeyToMut for AutomorphismKey<D>
 where
-    GGLWESwitchingKey<D>: GGLWESwitchingKeyToMut,
+    GLWESwitchingKey<D>: GLWESwitchingKeyToMut,
 {
-    fn to_mut(&mut self) -> GGLWEAutomorphismKey<&mut [u8]> {
-        GGLWEAutomorphismKey {
+    fn to_mut(&mut self) -> AutomorphismKey<&mut [u8]> {
+        AutomorphismKey {
             key: self.key.to_mut(),
             p: self.p,
         }
     }
 }
 
-pub trait GGLWEAutomorphismKeyToRef {
-    fn to_ref(&self) -> GGLWEAutomorphismKey<&[u8]>;
+pub trait AutomorphismKeyToRef {
+    fn to_ref(&self) -> AutomorphismKey<&[u8]>;
 }
 
-impl<D: DataRef> GGLWEAutomorphismKey<D> {
+impl<D: DataRef> AutomorphismKeyToRef for AutomorphismKey<D>
+where
+    GLWESwitchingKey<D>: GLWESwitchingKeyToRef,
+{
+    fn to_ref(&self) -> AutomorphismKey<&[u8]> {
+        AutomorphismKey {
+            p: self.p,
+            key: self.key.to_ref(),
+        }
+    }
+}
+
+impl<D: DataRef> AutomorphismKey<D> {
     pub fn at(&self, row: usize, col: usize) -> GLWECiphertext<&[u8]> {
         self.key.at(row, col)
     }
 }
 
-impl<D: DataMut> GGLWEAutomorphismKey<D> {
+impl<D: DataMut> AutomorphismKey<D> {
     pub fn at_mut(&mut self, row: usize, col: usize) -> GLWECiphertext<&mut [u8]> {
         self.key.at_mut(row, col)
     }
 }
 
-impl<D: DataMut> ReaderFrom for GGLWEAutomorphismKey<D> {
+impl<D: DataMut> ReaderFrom for AutomorphismKey<D> {
     fn read_from<R: std::io::Read>(&mut self, reader: &mut R) -> std::io::Result<()> {
         self.p = reader.read_u64::<LittleEndian>()? as i64;
         self.key.read_from(reader)
     }
 }
 
-impl<D: DataRef> WriterTo for GGLWEAutomorphismKey<D> {
+impl<D: DataRef> WriterTo for AutomorphismKey<D> {
     fn write_to<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
         writer.write_u64::<LittleEndian>(self.p as u64)?;
         self.key.write_to(writer)