Cpp library improvements

tenseal/cpp/tensors/BUILD

@@ -8,16 +8,16 @@ cc_library(
     name = "tenseal_tensors_cc",
     srcs = [
         "bfvvector.cpp",
-        "ckksvector.cpp",
         "ckkstensor.cpp",
+        "ckksvector.cpp",
         "utils/utils.cpp",
         "utils/utils.h",
     ],
     hdrs = [
         "api.h",
         "bfvvector.h",
-        "ckksvector.h",
         "ckkstensor.h",
+        "ckksvector.h",
         "encrypted_tensor.h",
         "encrypted_vector.h",
         "plain_tensor.h",

tenseal/cpp/tensors/bfvvector.cpp

@@ -62,16 +62,6 @@ Ciphertext BFVVector::encrypt(shared_ptr<TenSEALContext> context,
     return ciphertext;
 }
 
-BFVVector::plain_t BFVVector::decrypt() const {
-    if (this->tenseal_context()->decryptor == NULL) {
-        // this->context was loaded with public keys only
-        throw invalid_argument(
-            "the current context of the vector doesn't hold a secret_key, "
-            "please provide one as argument");
-    }
-
-    return this->decrypt(this->tenseal_context()->secret_key());
-}
 BFVVector::plain_t BFVVector::decrypt(const shared_ptr<SecretKey>& sk) const {
     Plaintext plaintext;
     Decryptor decryptor =

tenseal/cpp/tensors/bfvvector.h

@@ -20,6 +20,8 @@ class BFVVector
    public:
     using encrypted_t = shared_ptr<BFVVector>;
     using plain_t = PlainTensor<int64_t>;
+    using EncryptedVector<int64_t, shared_ptr<BFVVector>,
+                          BatchEncoder>::decrypt;
 
     template <typename... Args>
     static encrypted_t Create(Args&&... args) {
@@ -31,7 +33,6 @@ class BFVVector
      * Decrypts and returns the plaintext representation of the encrypted vector
      *of integers using the secret-key.
      **/
-    plain_t decrypt() const override;
     plain_t decrypt(const shared_ptr<SecretKey>& sk) const override;
     /**
      * Compute the power of the BFVVector with minimal multiplication depth.

tenseal/cpp/tensors/ckkstensor.cpp

@@ -16,10 +16,9 @@ CKKSTensor::CKKSTensor(const shared_ptr<TenSEALContext>& ctx,
         this->_init_scale = ctx->global_scale();
     }
 
-    vector<double> plain_data = tensor.data();
-    for (int i = 0; i < plain_data.size(); i++)
-        _data.push_back(CKKSTensor::encrypt(ctx, this->_init_scale,
-                                            vector<double>({plain_data[i]})));
+    for (auto it = tensor.cbegin(); it != tensor.cend(); it++)
+        _data.push_back(
+            CKKSTensor::encrypt(ctx, this->_init_scale, vector<double>({*it})));
 }
 
 Ciphertext CKKSTensor::encrypt(const shared_ptr<TenSEALContext>& ctx,
@@ -42,17 +41,6 @@ Ciphertext CKKSTensor::encrypt(const shared_ptr<TenSEALContext>& ctx,
     return ciphertext;
 }
 
-PlainTensor<double> CKKSTensor::decrypt() const {
-    if (this->tenseal_context()->decryptor == NULL) {
-        // this->context was loaded with public keys only
-        throw invalid_argument(
-            "the current context of the tensor doesn't hold a secret_key, "
-            "please provide one as argument");
-    }
-
-    return this->decrypt(this->tenseal_context()->secret_key());
-}
-
 PlainTensor<double> CKKSTensor::decrypt(const shared_ptr<SecretKey>& sk) const {
     Plaintext plaintext;
     Decryptor decryptor =

tenseal/cpp/tensors/ckkstensor.h

@@ -12,6 +12,7 @@ using namespace std;
 class CKKSTensor : public EncryptedTensor<double, shared_ptr<CKKSTensor>>,
                    public enable_shared_from_this<CKKSTensor> {
    public:
+    using EncryptedTensor<double, shared_ptr<CKKSTensor>>::decrypt;
     /**
      * Create a new CKKSTensor from an 1D vector.
      * @param[in] input vector.
@@ -24,7 +25,6 @@ class CKKSTensor : public EncryptedTensor<double, shared_ptr<CKKSTensor>>,
             new CKKSTensor(std::forward<Args>(args)...));
     }
 
-    PlainTensor<double> decrypt() const override;
     PlainTensor<double> decrypt(const shared_ptr<SecretKey>& sk) const override;
 
     shared_ptr<CKKSTensor> negate_inplace() override;

tenseal/cpp/tensors/ckksvector.cpp

@@ -65,16 +65,7 @@ Ciphertext CKKSVector::encrypt(shared_ptr<TenSEALContext> context, double scale,
 
     return ciphertext;
 }
-CKKSVector::plain_t CKKSVector::decrypt() const {
-    if (this->tenseal_context()->decryptor == NULL) {
-        // this->context was loaded with public keys only
-        throw invalid_argument(
-            "the current context of the vector doesn't hold a secret_key, "
-            "please provide one as argument");
-    }
 
-    return this->decrypt(this->tenseal_context()->secret_key());
-}
 CKKSVector::plain_t CKKSVector::decrypt(const shared_ptr<SecretKey>& sk) const {
     Plaintext plaintext;
     Decryptor decryptor =

tenseal/cpp/tensors/ckksvector.h

@@ -19,6 +19,7 @@ class CKKSVector
    public:
     using encrypted_t = shared_ptr<CKKSVector>;
     using plain_t = PlainTensor<double>;
+    using EncryptedVector<double, shared_ptr<CKKSVector>, CKKSEncoder>::decrypt;
 
     template <typename... Args>
     static encrypted_t Create(Args&&... args) {
@@ -28,7 +29,6 @@ class CKKSVector
      * Decrypts and returns the plaintext representation of the encrypted vector
      *of real numbers using the secret-key.
      **/
-    plain_t decrypt() const override;
     plain_t decrypt(const shared_ptr<SecretKey>& sk) const override;
 
     /**

tenseal/cpp/tensors/encrypted_tensor.h

@@ -27,7 +27,15 @@ class EncryptedTensor {
      * Decrypts and returns the plaintext representation of the encrypted tensor
      *of real numbers using the secret-key.
      **/
-    virtual PlainTensor<plain_data_t> decrypt() const = 0;
+    PlainTensor<plain_data_t> decrypt() const {
+        if (this->tenseal_context()->decryptor == nullptr) {
+            // this->context was loaded with public keys only
+            throw invalid_argument(
+                "the current context of the tensor doesn't hold a secret_key, "
+                "please provide one as argument");
+        }
+        return this->decrypt(this->tenseal_context()->secret_key());
+    };
     virtual PlainTensor<plain_data_t> decrypt(
         const shared_ptr<SecretKey>& sk) const = 0;
 

tenseal/cpp/tensors/encrypted_vector.h

@@ -18,8 +18,8 @@ using namespace std;
  *
  * The integrator must override the following inherited methods, along with the
  *EncryptedVector pure methods:
- * * vector<plain_t> EncryptedTensor::decrypt() const = 0;
- * * vector<plain_t> EncryptedTensor::decrypt() = 0;
+ * * vector<plain_t> EncryptedTensor::decrypt(const shared_ptr<SecretKey>&)
+ *const = 0;
  * * encrypted_t negate_inplace();
  * * encrypted_t square_inplace();
  * * encrypted_t add_inplace(encrypted_t to_add);

tenseal/cpp/tensors/plain_tensor.h

@@ -15,6 +15,8 @@ template <typename plain_t>
 class PlainTensor {
    public:
     using dtype = plain_t;
+    using iterator = typename vector<plain_t>::iterator;
+    using const_iterator = typename vector<plain_t>::const_iterator;
     /**
      * Create a new PlainTensor from an 1D vector.
      * @param[in] input vector.
@@ -188,6 +190,13 @@ class PlainTensor {
      * Casts the tensor to an 1D vector.
      */
     operator vector<plain_t>() const { return _data; }
+    /**
+     * Iterator utils
+     **/
+    inline iterator begin() noexcept { return _data.begin(); }
+    inline const_iterator cbegin() const noexcept { return _data.cbegin(); }
+    inline iterator end() noexcept { return _data.end(); }
+    inline const_iterator cend() const noexcept { return _data.cend(); }
     /**
      * Replicates the internal representation for <times> elements.
      */