Version 1 Rollout

Author: mayank0403

Aono.i

@@ -20,24 +20,58 @@ typedef long *GEN;
 %extend pari_GEN{
     pari_GEN(PyObject *int_list){
         pari_GEN* result = new pari_GEN();
-        int *array = NULL;
-        int nInts;
-        if (PyList_Check( int_list ))
-        {
-            nInts = PyList_Size( int_list );
-            array = (int*) malloc( nInts * sizeof(int) );
-            for ( int ii = 0; ii < nInts; ii++ ){
-                PyObject *oo = PyList_GetItem( int_list, ii);
-                if ( PyInt_Check( oo ) )
-                    array[ ii ] = ( int ) PyInt_AsLong( oo );
+        if(PyList_Size(PyList_GetItem( int_list, 0)) == -1){
+            int *array = NULL;
+            int nInts;
+            if (PyList_Check( int_list ))
+            {
+                nInts = PyList_Size( int_list );
+                array = (int*) malloc( nInts * sizeof(int) );
+                for ( int ii = 0; ii < nInts; ii++ ){
+                    PyObject *oo = PyList_GetItem( int_list, ii);
+                    if ( PyInt_Check( oo ) )
+                        array[ ii ] = ( int ) PyInt_AsLong( oo );
+                }
             }
+            GEN x;
+            x = cgetg(nInts + 1, t_VEC);
+            for(int i = 0; i < nInts; i++)
+                gel(x, i + 1) = stoi(array[i]);
+            result->initialize(x);
+            return result;
         }
-        GEN x;
-        x = cgetg(nInts + 1, t_VEC);
-        for(int i = 0; i < nInts; i++)
-            gel(x, i + 1) = stoi(array[i]);
-        result->initialize(x);
-        return result;
+        else{
+            int *array = NULL;
+            int **arrofarray = NULL;
+            int nInts;
+            int nOutInts;
+            if (PyList_Check( int_list ))
+            {
+                nOutInts = PyList_Size( int_list );
+                arrofarray = (int**) malloc( nOutInts * sizeof(int*) );
+                for ( int jj = 0; jj < nOutInts; jj++ ){
+                    nInts = PyList_Size(PyList_GetItem( int_list, jj) );
+                    array = (int*) malloc( nInts * sizeof(int) );
+                    for ( int ii = 0; ii < nInts; ii++ ){
+                        PyObject *oo = PyList_GetItem(PyList_GetItem( int_list, jj), ii);
+                        if ( PyInt_Check( oo ) ){
+                            array[ ii ] = ( int ) PyInt_AsLong( oo );
+                        }
+            
+                    }
+                    arrofarray[jj] = array;
+                }
+            }
+            GEN x;
+            x = zeromatcopy(nOutInts, nInts);
+            for(int j = 0; j < nOutInts; j++){
+                for(int i = 0; i < nInts; i++)
+                gel(gel(x, i + 1), j + 1) = stoi(arrofarray[j][i]);
+            }
+            result->initialize(x);
+            return result;
+        }
+        
     }
 
     char* __str__(){
@@ -53,8 +87,20 @@ typedef long *GEN;
     pari_GEN sub_mat_array(int key_1, int key_2){
         pari_GEN result;
         result.value = cgetg(key_2 - key_1 + 1, t_VEC);
+        int cnt = 0;
         for(int i = key_1; i < key_2; i++)
-        gel(result.value, i + 1) = gel(gel(self->value, i + 1), 1);
+            gel(result.value, 1+cnt++) = gel(gel(self->value, i + 1), 1);
+        return result;
+    }
+    
+    pari_GEN sub_mat_array(int row_1, int row_2, int col_1, int col_2){
+        pari_GEN result;
+        result.value = zeromatcopy(row_2 - row_1, col_2 - col_1);
+        for(int j = col_1; j < col_2; j++){
+            for(int i = row_1; i < row_2; i++){
+                gel(gel(result.value, 1+(j-col_1)), 1+(i-row_1)) = gel(gel(self->value, j + 1), i + 1);
+            }
+        }
         return result;
     }
 
@@ -68,7 +114,7 @@ typedef long *GEN;
 };
 
 %extend ciphertext{
-    ciphertext(PyObject *int_list, public_key* pk, parameters* params){
+    ciphertext(PyObject *int_list, public_key* pk){
         ciphertext* result = new ciphertext();
         int *array = NULL;
         int nInts;
@@ -86,21 +132,26 @@ typedef long *GEN;
         pt.value = cgetg(nInts + 1, t_VEC);
         for(int i = 0; i < nInts; i++)
             gel(pt.value, i + 1) = stoi(array[i]);
-        result->packing_method(pt, pk, params);
+        result->packing_method(pt, pk);
         return result;
     }
+
 
     ciphertext __mul__(const int pt){
         ciphertext result;
         pari_GEN pt_GEN(pt);
         result.value = plaintext_multiplication(self->value, pt_GEN);
+        result.params = self->params;
+        result.pk = self->pk;
         return result;
     }
 
     ciphertext __rmul__(const int pt){
         ciphertext result;
         pari_GEN pt_GEN(pt);
         result.value = plaintext_multiplication(self->value, pt_GEN);
+        result.params = self->params;
+        result.pk = self->pk;
         return result;
     }
 };

Aono.py

@@ -128,8 +128,8 @@ class ciphertext(_object):
     __swig_destroy__ = _Aono.delete_ciphertext
     __del__ = lambda self: None
 
-    def packing_method(self, m, pk, params):
-        return _Aono.ciphertext_packing_method(self, m, pk, params)
+    def packing_method(self, m, pk):
+        return _Aono.ciphertext_packing_method(self, m, pk)
 
     def initialize(self, *args):
         return _Aono.ciphertext_initialize(self, *args)
@@ -381,8 +381,8 @@ def __str__(self):
     def __getitem__(self, key):
         return _Aono.pari_GEN___getitem__(self, key)
 
-    def sub_mat_array(self, key_1, key_2):
-        return _Aono.pari_GEN_sub_mat_array(self, key_1, key_2)
+    def sub_mat_array(self, *args):
+        return _Aono.pari_GEN_sub_mat_array(self, *args)
 
     def sub_array(self, key_1, key_2):
         return _Aono.pari_GEN_sub_array(self, key_1, key_2)