Merge pull request #78 from ederc/input-overflow-fix

Input overflow fix

Makefile.am

@@ -32,7 +32,9 @@ checkdiff               = test/diff/diff_cp_d_3_n_4_p_2.sh \
 			  test/diff/diff_bug_2nd_prime_bad.sh \
 			  test/diff/diff_bug_68.sh \
 			  test/diff/diff_mq_2_1.sh \
-			  test/diff/diff_xy-qq.sh 
+			  test/diff/diff_xy-qq.sh \
+			  test/diff/diff_input-overflow-8.sh \
+			  test/diff/diff_input-overflow-16.sh
 
 # dist_check_DATA         = test/input_files
 neogb_io_SOURCES 	= test/neogb/io/validate_input_data.c

configure.ac

@@ -148,5 +148,11 @@ AC_CONFIG_LINKS([
  input_files/mq_2_1.ms:input_files/mq_2_1.ms
  output_files/mq_2_1.res:output_files/mq_2_1.res
  test/diff/diff_mq_2_1.sh:test/diff/diff_mq_2_1.sh
+ input_files/input-overflow-8.ms:input_files/input-overflow-8.ms
+ output_files/input-overflow-8.res:output_files/input-overflow-8.res
+ test/diff/diff_input-overflow-8.sh:test/diff/diff_input-overflow-8.sh
+ input_files/input-overflow-16.ms:input_files/input-overflow-16.ms
+ output_files/input-overflow-16.res:output_files/input-overflow-16.res
+ test/diff/diff_input-overflow-16.sh:test/diff/diff_input-overflow-16.sh
 ])
 AC_OUTPUT

input_files/input-overflow-16.ms

@@ -0,0 +1,4 @@
+y,x
+65519
+x^2+128333*x*y-12*y,
+y^2-x

input_files/input-overflow-8.ms

@@ -0,0 +1,4 @@
+y,x
+31
+x^2+128333*x*y-12*y,
+y^2-x

output_files/input-overflow-16.res

@@ -0,0 +1,14 @@
+[0, [65519, 
+2, 
+4, 
+['y', 'x'],
+[0, 1],
+[1,
+[[4,
+[0, 65375, 599, 21103, 1]],
+[0,
+[1]],
+[
+[[3,
+[0, 39978, 62904, 51433]]]
+]]]]]:

output_files/input-overflow-8.res

@@ -0,0 +1,14 @@
+[0, [31, 
+2, 
+4, 
+['y', 'x'],
+[0, 1],
+[1,
+[[4,
+[0, 11, 18, 13, 1]],
+[0,
+[1]],
+[
+[[3,
+[0, 14, 21, 5]]]
+]]]]]:

src/neogb/basis.c

@@ -254,7 +254,7 @@ static inline void normalize_initial_basis_ff_8(
     for (i = 0; i < ld; ++i) {
         cf8_t *row  = cf[hm[i][COEFFS]];
 
-        const uint8_t inv = mod_p_inverse_8(row[0], fc8);
+        const uint8_t inv = mod_p_inverse_8((int16_t)row[0], (int16_t)fc8);
         const len_t os    = hm[i][PRELOOP];
         const len_t len   = hm[i][LENGTH];
 
@@ -297,7 +297,7 @@ static inline void normalize_initial_basis_ff_16(
     for (i = 0; i < ld; ++i) {
         cf16_t *row = cf[hm[i][COEFFS]];
 
-        const uint16_t inv  = mod_p_inverse_16(row[0], fc16);
+        const uint16_t inv  = mod_p_inverse_16((int32_t)row[0], (int32_t)fc16);
         const len_t os      = hm[i][PRELOOP];
         const len_t len     = hm[i][LENGTH];
 
@@ -362,6 +362,10 @@ static inline void normalize_initial_basis_ff_32(
             row[j+2]  =   (cf32_t)tmp3;
             row[j+3]  =   (cf32_t)tmp4;
         }
+        for (j = 0; j < len; ++j) {
+            printf("%u\n", row[j]);
+        }
+        printf("\n");
     }
 }
 

src/neogb/io.c

@@ -318,7 +318,7 @@ void import_input_data(
                     for (j = off; j < off+lens[i]; ++j) {
                         /* make coefficient positive */
                         cfs_ff[j]   +=  (cfs_ff[j] >> 31) & fc;
-                        cf8[j-off]  =   (cf8_t)cfs_ff[j];
+                        cf8[j-off]  =   (cf8_t)(cfs_ff[j] % fc);
                     }
                     sort_terms_ff_8(&(bs->cf_8[ctr]), &(bs->hm[ctr]), ht);
                     ctr++;
@@ -336,7 +336,7 @@ void import_input_data(
                     for (j = off; j < off+lens[i]; ++j) {
                         /* make coefficient positive */
                         cfs_ff[j]   +=  (cfs_ff[j] >> 31) & fc;
-                        cf16[j-off] =   (cf16_t)cfs_ff[j];
+                        cf16[j-off] =   (cf16_t)(cfs_ff[j] % fc);
                     }
                     sort_terms_ff_16(&(bs->cf_16[ctr]), &(bs->hm[ctr]), ht);
                     ctr++;
@@ -354,7 +354,7 @@ void import_input_data(
                     for (j = off; j < off+lens[i]; ++j) {
                         /* make coefficient positive */
                         cfs_ff[j]   +=  (cfs_ff[j] >> 31) & fc;
-                        cf32[j-off] =   (cf32_t)cfs_ff[j];
+                        cf32[j-off] =   (cf32_t)(cfs_ff[j] % fc);
                     }
                     sort_terms_ff_32(&(bs->cf_32[ctr]), &(bs->hm[ctr]), ht);
                     ctr++;

test/diff/diff_input-overflow-16.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+file=input-overflow-16
+
+
+$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res -l 2
+if [ $? -gt 0 ]; then
+    exit 1
+fi
+
+diff test/diff/$file.res output_files/$file.res
+if [ $? -gt 0 ]; then
+    exit 2
+fi
+
+$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res -l 44
+if [ $? -gt 0 ]; then
+    exit 3
+fi
+
+diff test/diff/$file.res output_files/$file.res
+if [ $? -gt 0 ]; then
+    exit 4
+fi
+
+rm test/diff/$file.res

test/diff/diff_input-overflow-8.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+file=input-overflow-8
+
+
+$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res -l 2
+if [ $? -gt 0 ]; then
+    exit 1
+fi
+
+diff test/diff/$file.res output_files/$file.res
+if [ $? -gt 0 ]; then
+    exit 2
+fi
+
+$(pwd)/msolve -f input_files/$file.ms -o test/diff/$file.res -l 44
+if [ $? -gt 0 ]; then
+    exit 3
+fi
+
+diff test/diff/$file.res output_files/$file.res
+if [ $? -gt 0 ]; then
+    exit 4
+fi
+
+rm test/diff/$file.res