rename to i_UV

Author: SheldonHH

out/production/p4p/p4p/util/Util.class

@@ -98,9 +98,9 @@ public UserVector(long[] data_UV_P, long F, int log_2_m_UV_P) {
         long singaporeModF;
         // Convert the numbers into the finite field:
         if (data_UV_P != null) {
-            for (int i_UV = 0; i_UV < dimension; i_UV++) {
-                 singaporeModF = Util.mod(data_UV_P[i_UV], F);
-                 this.data_UV[i_UV] = singaporeModF;
+            for (int i_dim_UV = 0; i_dim_UV < dimension; i_dim_UV++) {
+                 singaporeModF = Util.mod(data_UV_P[i_dim_UV], F);
+                 this.data_UV[i_dim_UV] = singaporeModF;
             }
             // The range should be [-F/2, F/2)
         }

src/java/p4p/user/UserVector.java

@@ -90,17 +90,17 @@ public class UserVector2 extends UserVector {
      * Constructs a (share of) user vector.
      *
      * @param data  the user vector
-     * @param F     the size of the field where all user computations are
+     * @param F_UV     the size of the field where all user computations are
      *              performed
      * @param l     the max allowed number of bits of the L2 norm of user
      *              vector
      * @param g     the first generator used in commitment
      * @param h     the sceond generator used in commitment
      *
      */
-    public UserVector2(long[] data, long F, int l, NativeBigInteger g,
+    public UserVector2(long[] data, long F_UV, int l, NativeBigInteger g,
                        NativeBigInteger h) {
-        super(data, F, l);
+        super(data, F_UV, l);
         this.g_UV2 = g;
         this.h_UV2 = h;
         //sc = new SquareCommitment(g, h);
@@ -690,11 +690,11 @@ public boolean serverVerify(L2NormBoundProof2 l2Proof, BigInteger[] Y) {
 
         // Check the checksums and their commitments:
         Commitment cm = new Commitment(g_UV2, h_UV2);
-        ThreeWayCommitment tc = new ThreeWayCommitment(g_UV2, h_UV2, F);
+        ThreeWayCommitment tc = new ThreeWayCommitment(g_UV2, h_UV2, F_UV);
         for(int i = 0; i < x.length; i++) {
             // First make sure the checksums are computed correctly:
             //if(s[i] != Math.abs(Util.innerProduct(c[i], data))) {
-            if(x[i] != Util.mod(Util.innerProduct(checkCoVector[i], serverUserVector_UV2), F)) {
+            if(x[i] != Util.mod(Util.innerProduct(checkCoVector[i], serverUserVector_UV2), F_UV)) {
                 // We are doing server
                 System.out.println("Checksum " + i
                                    + " not computed correctly!");
@@ -904,7 +904,7 @@ else if(arg.equals("-bench")) {
         F = BigInteger.probablePrime(62, rand).longValue();
 
         System.out.println("l = " + l + ", L = " + L);
-        System.out.println("F = " + F);
+        System.out.println("F = " + F_UV);
         System.out.println("zkpIterations = " + zkpIterations);
 
         // Generate the data and the checksum coefficient vector:
@@ -942,7 +942,7 @@ else if(arg.equals("-bench")) {
             double l2 = (double)L*delta;
             double sqrt_l2 = 0.;
             // Generate data in randVector //
-            data = Util.randVector(m, F, l2);
+            data = Util.randVector(m, F_UV, l2);
             // Generate Data in randVector //
 
 
@@ -982,7 +982,7 @@ else if(arg.equals("-bench")) {
             Util.innerProduct(c[0], data);
             innerProductTime += (System.currentTimeMillis()-t0);
 
-            UserVector2 uv = new UserVector2(data, F, l, two_generators_for_g_h[0], two_generators_for_g_h[1]);
+            UserVector2 uv = new UserVector2(data, F_UV, l, two_generators_for_g_h[0], two_generators_for_g_h[1]);
             data = uv.getUserData();
             uv.generateShares();
             uv.setChecksumCoefficientVectors(c);