Browse Source

Ordering CryptoContext.cc

Hovsep Papoyan 1 year ago
parent
commit
c553e8f714
3 changed files with 459 additions and 499 deletions
  1. 454 494
      src/CryptoContext.cc
  2. 4 4
      src/CryptoContext.h
  3. 1 1
      src/lib.rs

File diff suppressed because it is too large
+ 454 - 494
src/CryptoContext.cc


+ 4 - 4
src/CryptoContext.h

@@ -62,9 +62,9 @@ class CryptoContextDCRTPoly final
     std::shared_ptr<CryptoContextImpl> m_cryptoContextImplSharedPtr;
 public:
     CryptoContextDCRTPoly() = default;
+    explicit CryptoContextDCRTPoly(const ParamsCKKSRNS& params);
     explicit CryptoContextDCRTPoly(const ParamsBFVRNS& params);
     explicit CryptoContextDCRTPoly(const ParamsBGVRNS& params);
-    explicit CryptoContextDCRTPoly(const ParamsCKKSRNS& params);
     CryptoContextDCRTPoly(const CryptoContextDCRTPoly&) = delete;
     CryptoContextDCRTPoly(CryptoContextDCRTPoly&&) = delete;
     CryptoContextDCRTPoly& operator=(const CryptoContextDCRTPoly&) = delete;
@@ -437,15 +437,15 @@ public:
 };
 
 // cxx currently does not support static class methods
+void DCRTPolyClearEvalAutomorphismKeys();
+void DCRTPolyClearEvalAutomorphismKeysByCryptoContext(const CryptoContextDCRTPoly& cryptoContext);
+void DCRTPolyClearEvalAutomorphismKeysById(const std::string& id);
 void DCRTPolyClearEvalMultKeys();
 void DCRTPolyClearEvalMultKeysByCryptoContext(const CryptoContextDCRTPoly& cryptoContext);
 void DCRTPolyClearEvalMultKeysById(const std::string& id);
 void DCRTPolyClearEvalSumKeys();
 void DCRTPolyClearEvalSumKeysByCryptoContext(const CryptoContextDCRTPoly& cryptoContext);
 void DCRTPolyClearEvalSumKeysById(const std::string& id);
-void DCRTPolyClearEvalAutomorphismKeys();
-void DCRTPolyClearEvalAutomorphismKeysByCryptoContext(const CryptoContextDCRTPoly& cryptoContext);
-void DCRTPolyClearEvalAutomorphismKeysById(const std::string& id);
 [[nodiscard]] std::unique_ptr<MapFromStringToMapFromIndexToEvalKey>
     DCRTPolyGetCopyOfAllEvalAutomorphismKeys();
 [[nodiscard]] std::unique_ptr<MapFromStringToVectorOfEvalKeys> DCRTPolyGetCopyOfAllEvalMultKeys();

+ 1 - 1
src/lib.rs

@@ -517,7 +517,7 @@ pub mod ffi
                                                   -> UniquePtr<CiphertextDCRTPoly>;
         fn EvalSubMutableInPlace(self: &CryptoContextDCRTPoly,
                                  ciphertext1: Pin<&mut CiphertextDCRTPoly>,
-                                 ciphertext2: Pin<&mut CiphertextDCRTPoly>);   
+                                 ciphertext2: Pin<&mut CiphertextDCRTPoly>);
         fn EvalSum(self: &CryptoContextDCRTPoly, ciphertext: &CiphertextDCRTPoly, batchSize: u32)
                    -> UniquePtr<CiphertextDCRTPoly>;
         fn EvalSumCols(self: &CryptoContextDCRTPoly, ciphertext: &CiphertextDCRTPoly, rowSize: u32,

Some files were not shown because too many files changed in this diff