Merge branch 'master' into seed_make_check

Author: jerebertho

Makefile.am

@@ -16,7 +16,6 @@ check_PROGRAMS		= neogb_io \
 checkdiff               = test/diff/diff_bug-2nd-prime-bad.sh \
 			  test/diff/diff_bug-68.sh \
 			  test/diff/diff_bug-empty-tracer.sh \
-			  test/diff/diff_choice-linear-form-qq.sh \
 			  test/diff/diff_cp-d3-n4-p2.sh \
 			  test/diff/diff_cyclic5-16.sh \
 			  test/diff/diff_cyclic5-31.sh \
@@ -53,6 +52,7 @@ checkdiff               = test/diff/diff_bug-2nd-prime-bad.sh \
 			  test/diff/diff_nonradical-radicalshape-no-square-31.sh \
 			  test/diff/diff_nonradical-radicalshape-no-square-qq.sh \
 			  test/diff/diff_nonradical-radicalshape-qq.sh \
+			  test/diff/diff_nonradical-shape-31.sh \
 			  test/diff/diff_nonradical-shape-qq.sh \
 			  test/diff/diff_one-16.sh \
 			  test/diff/diff_one-31.sh \
@@ -66,7 +66,8 @@ checkdiff               = test/diff/diff_bug-2nd-prime-bad.sh \
 			  test/diff/diff_reals-dim0.sh \
 			  test/diff/diff_reals-dim0-swapvar.sh \
 			  test/diff/diff_test-lifting2.sh \
-			  test/diff/diff_xy-qq.sh
+			  test/diff/diff_xy-qq.sh \
+			  test/diff/diff_x2y2-qq.sh
 
 # dist_check_DATA         = test/input_files
 neogb_io_SOURCES 	= test/neogb/io/validate_input_data.c

configure.ac

@@ -246,7 +246,8 @@ AC_CONFIG_LINKS([
  output_files/nonradical-radicalshape-qq.P1.d0.p1024.res:output_files/nonradical-radicalshape-qq.P1.d0.p1024.res
  test/diff/diff_nonradical-radicalshape-qq.sh:test/diff/diff_nonradical-radicalshape-qq.sh
  input_files/nonradical-shape-31.ms:input_files/nonradical-shape-31.ms
- output_files/nonradical-shape-31.res:output_files/nonradical-shape-31.res
+ output_files/nonradical-shape-31.P2.d0.res:output_files/nonradical-shape-31.P2.d0.res
+ test/diff/diff_nonradical-shape-31.sh:test/diff/diff_nonradical-shape-31.sh
  input_files/nonradical-shape-qq.ms:input_files/nonradical-shape-qq.ms
  output_files/nonradical-shape-qq.P1.d0.p128.res:output_files/nonradical-shape-qq.P1.d0.p128.res
  output_files/nonradical-shape-qq.P1.d0.p1024.res:output_files/nonradical-shape-qq.P1.d0.p1024.res
@@ -298,5 +299,10 @@ AC_CONFIG_LINKS([
  input_files/xy-qq.ms:input_files/xy-qq.ms
  output_files/xy-qq.P2.d0.res:output_files/xy-qq.P2.d0.res
  test/diff/diff_xy-qq.sh:test/diff/diff_xy-qq.sh
+ input_files/x2y2-qq.ms:input_files/x2y2-qq.ms
+ output_files/x2y2-qq.P2.d0.res:output_files/x2y2-qq.P2.d0.res
+ output_files/x2y2-qq.p128.res:output_files/x2y2-qq.p128.res
+ output_files/x2y2-qq.p1024.res:output_files/x2y2-qq.p1024.res
+ test/diff/diff_x2y2-qq.sh:test/diff/diff_x2y2-qq.sh
 ])
 AC_OUTPUT

input_files/x2y2-qq.ms

@@ -0,0 +1,4 @@
+x,y
+0
+x^2,
+y^2

output_files/nonradical-shape-31.P2.d0.res

@@ -0,0 +1,18 @@
+[0, [1073741831, 
+4, 
+11, 
+['x1', 'x2', 'x3', 'x4'],
+[0, 0, 0, 1],
+[1,
+[[8,
+[51238460, 937779246, 129340733, 464819646, 278485549, 320457435, 34841890, 655651556, 1]],
+[0,
+[1]],
+[
+[[7,
+[889162894, 951876873, 864236218, 955859524, 969102339, 401381748, 870503968, 991566980]]],
+[[7,
+[699435431, 883674317, 421406145, 416439488, 252953512, 713260948, 63471456, 627129243]]],
+[[7,
+[980813817, 367501823, 781266581, 197217171, 59856538, 224726467, 738695696, 265145803]]]
+]]]]]:

output_files/nonradical-shape-31.res

@@ -0,0 +1,14 @@
+[0, [0, 
+3, 
+4, 
+['x', 'y', 'A'],
+[1,2,1],
+[1,
+[[1, [0, 1]],
+[0, [1]],
+[
+[[0, [0]],
+1],
+[[0, [0]],
+1]
+]]]]]:

output_files/x2y2-qq.P2.d0.res

@@ -0,0 +1,3 @@
+[0, [1,
+[[[0, 0], [0, 0]]]
+]]:

output_files/x2y2-qq.p1024.res

@@ -0,0 +1,3 @@
+[0, [1,
+[[[0, 0], [0, 0]]]
+]]:

output_files/x2y2-qq.p128.res

@@ -2,7 +2,7 @@ noinst_LTLIBRARIES 	= libfglm.la
 libfglm_la_SOURCES 	= fglm_core.c
 libfglm_ladir				=	$(includedir)/msolve/fglm
 libfglm_la_HEADERS	= fglm.h
-libfglm_la_CFLAGS		= $(SIMD_FLAGS) $(CPUEXT_FLAGS) $(OPENMP_CFLAGS)
+libfglm_la_CFLAGS		= $(SIMD_FLAGS) $(CPUEXT_FLAGS) $(OPENMP_CFLAGS) -Wall -Wextra
 
 EXTRA_DIST	=		fglm.h \
                 libfglm.h \

src/fglm/Makefile.am

@@ -191,8 +191,7 @@ void nmod_berlekamp_massey_add_point_modif(
     B->points->length = old_length + 1;
 }
 
-//shift ne sert pas 
-int nmod_em_gcd(nmod_berlekamp_massey_t B, long shift){
+int nmod_em_gcd(nmod_berlekamp_massey_t B){
   slong i, l, k, queue_len, queue_lo, queue_hi;
   queue_lo = B->npoints; // vaut 0 en entree
   queue_hi = B->points->length; //vaut 2*dim ou dim est la dimension du quotient
@@ -316,7 +315,6 @@ int nmod_em_gcd(nmod_berlekamp_massey_t B, long shift){
 }
 
 
-//shift ne sert pas 
 int nmod_em_gcd_preinstantiated(nmod_berlekamp_massey_t B, long shift){
   slong l, k, queue_len, queue_lo, queue_hi;
   queue_lo = B->npoints; // vaut 0 en entree
@@ -436,7 +434,6 @@ int nmod_em_gcd_preinstantiated(nmod_berlekamp_massey_t B, long shift){
   FLINT_ASSERT(2*nmod_poly_degree(B->V1) <= B->npoints);
   FLINT_ASSERT(2*nmod_poly_degree(B->R0) >= B->npoints);
   FLINT_ASSERT(2*nmod_poly_degree(B->R1) <  B->npoints);
-
 
   return 1;
 }