Merge pull request #294 from jerebertho/fix_bug_shape_position

mohabsafey · web-flow · commit 754adb75ed54 · 2026-03-14T13:27:56.000+01:00
Fix bug shape position
diff --git a/Makefile.am b/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
diff --git a/configure.ac b/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
diff --git a/input_files/x2y2-qq.ms b/input_files/x2y2-qq.ms
@@ -0,0 +1,4 @@
+x,y
+0
+x^2,
+y^2
diff --git a/output_files/nonradical-shape-31.P2.d0.res b/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]]]
+]]]]]:
diff --git a/output_files/nonradical-shape-31.res b/output_files/nonradical-shape-31.res
diff --git a/output_files/x2y2-qq.P2.d0.res b/output_files/x2y2-qq.P2.d0.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]
+]]]]]:
diff --git a/output_files/x2y2-qq.p1024.res b/output_files/x2y2-qq.p1024.res
@@ -0,0 +1,3 @@
+[0, [1,
+[[[0, 0], [0, 0]]]
+]]:
diff --git a/output_files/x2y2-qq.p128.res b/output_files/x2y2-qq.p128.res
@@ -0,0 +1,3 @@
+[0, [1,
+[[[0, 0], [0, 0]]]
+]]:
diff --git a/src/msolve/msolve.c b/src/msolve/msolve.c
@@ -1702,7 +1702,8 @@ static int32_t *initial_modular_step(
                                                    lineqs_ptr[0], squvars,
                                                    md->info_level, bdata_fglm,
                                                    bdata_bms, success, md);
-            if((*bparam)->elim->length - 1 != dquot){
+            if((*bparam)->degelimpol != dquot){
+                /* not in shape position */
                 /* reset times for change of order */
                 md->fglm_ctime = cputime();
                 md->fglm_rtime = realtime();
@@ -2361,11 +2362,12 @@ int msolve_trace_qq(mpz_param_t *mpz_paramp,
   }
   if (*dim_ptr == 0 && success && *dquot_ptr > 0 && print_gb == 0) {
     if (nmod_params[0]->degsqfrelimpol != *minpolydeg_ptr
-	&& nmod_params[0]->elim->length - 1 != *dquot_ptr) {
+        && nmod_params[0]->degelimpol != *dquot_ptr) {
       for (int i = 0; i < nr_vars - 1; i++) {
         if ((squvars[i] == 0) && round) {
           squares = 0;
           success = 0;
+          break;
         }
       }
     }
diff --git a/test/diff/diff_nonradical-shape-31.sh b/test/diff/diff_nonradical-shape-31.sh
@@ -4,4 +4,6 @@ file=nonradical-shape-31
 
 source test/diff/diff_source.sh
 
+source test/diff/diff_source-param-nonf.sh
+
 normal_exit
diff --git a/test/diff/diff_x2y2-qq.sh b/test/diff/diff_x2y2-qq.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+file=x2y2-qq
+
+source test/diff/diff_source.sh
+
+source test/diff/diff_source-param-nonf.sh
+
+source test/diff/diff_source-param-nonf-qq.sh
+
+source test/diff/diff_source-real.sh
+
+normal_exit

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +x,y
 +0
 +x^2,
 +y^2
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[0, [1,`
	`2`	`+[[[0, 0], [0, 0]]]`
	`3`	`+]]:`
Original file line number	Diff line number	Diff line change
`@@ -1702,7 +1702,8 @@ static int32_t *initial_modular_step(`
`1702`	`1702`	`lineqs_ptr[0], squvars,`
`1703`	`1703`	`md->info_level, bdata_fglm,`
`1704`	`1704`	`bdata_bms, success, md);`
`1705`		`- if((*bparam)->elim->length - 1 != dquot){`
	`1705`	`+ if((*bparam)->degelimpol != dquot){`
	`1706`	`+ /* not in shape position */`
`1706`	`1707`	`/* reset times for change of order */`
`1707`	`1708`	`md->fglm_ctime = cputime();`
`1708`	`1709`	`md->fglm_rtime = realtime();`
`@@ -2361,11 +2362,12 @@ int msolve_trace_qq(mpz_param_t *mpz_paramp,`
`2361`	`2362`	`}`
`2362`	`2363`	`if (dim_ptr == 0 && success && dquot_ptr > 0 && print_gb == 0) {`
`2363`	`2364`	`if (nmod_params[0]->degsqfrelimpol != *minpolydeg_ptr`
`2364`		`- && nmod_params[0]->elim->length - 1 != *dquot_ptr) {`
	`2365`	`+ && nmod_params[0]->degelimpol != *dquot_ptr) {`
`2365`	`2366`	`for (int i = 0; i < nr_vars - 1; i++) {`
`2366`	`2367`	`if ((squvars[i] == 0) && round) {`
`2367`	`2368`	`squares = 0;`
`2368`	`2369`	`success = 0;`
	`2370`	`+ break;`
`2369`	`2371`	`}`
`2370`	`2372`	`}`
`2371`	`2373`	`}`