From ff390a95ec31b32ecdc22c04cbfe2f8cbc859b97 Mon Sep 17 00:00:00 2001
From: yangqingyou <yangqingyou@baidu.com>
Date: Thu, 27 Aug 2020 09:22:32 +0000
Subject: [PATCH] limit r by rshift

---
 core/privc3/fixedpoint_tensor_imp.h   | 6 +-----
 core/privc3/fixedpoint_tensor_test.cc | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/core/privc3/fixedpoint_tensor_imp.h b/core/privc3/fixedpoint_tensor_imp.h
index 404694e..e4bf60c 100644
--- a/core/privc3/fixedpoint_tensor_imp.h
+++ b/core/privc3/fixedpoint_tensor_imp.h
@@ -247,11 +247,7 @@ void FixedPointTensor<T, N>::truncate(const FixedPointTensor<T, N>* op,
         }
         // r'
         aby3_ctx()->template gen_random_private(*temp[0]);
-        std::for_each(temp[0]->data(), temp[0]->data() + temp[0]->numel(),
-                      [] (T& a) {
-                          a = (T) (a * std::pow(2, sizeof(T) * 8 - 2)
-                                   / std::numeric_limits<T>::max());
-                      });
+        temp[0]->rshift(1, temp[0].get());
 
         //r'_0, r'_1
         aby3_ctx()->template gen_random_private(*temp[1]);
diff --git a/core/privc3/fixedpoint_tensor_test.cc b/core/privc3/fixedpoint_tensor_test.cc
index 11feb42..c2f8318 100644
--- a/core/privc3/fixedpoint_tensor_test.cc
+++ b/core/privc3/fixedpoint_tensor_test.cc
@@ -3438,7 +3438,7 @@ TEST_F(FixedTensorTest, inv_sqrt_test) {
 }
 
 #ifdef USE_ABY3_TRUNC1 //use aby3 trunc1
-TEST_F(FixedTensorTest, truncate1_msb_failed) {
+TEST_F(FixedTensorTest, truncate1_msb_incorrect) {
     std::vector<size_t> shape = { 1 };
     std::shared_ptr<TensorAdapter<int64_t>> sl[3] = { gen(shape), gen(shape), gen(shape) };
     std::shared_ptr<TensorAdapter<int64_t>> sout[6] = { gen(shape), gen(shape), gen(shape),
@@ -3498,7 +3498,7 @@ TEST_F(FixedTensorTest, truncate1_msb_failed) {
 }
 
 #else
-TEST_F(FixedTensorTest, truncate3_msb_not_failed) {
+TEST_F(FixedTensorTest, truncate3_msb_correct) {
     std::vector<size_t> shape = { 1 };
     std::shared_ptr<TensorAdapter<int64_t>> sl[3] = { gen(shape), gen(shape), gen(shape) };
     std::shared_ptr<TensorAdapter<int64_t>> sout[6] = { gen(shape), gen(shape), gen(shape),
-- 
GitLab