Changeset 348448 in git

Timestamp:

Jan 10, 2020, 2:53:21 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

cda219b49052ca5cb986873dea788d108e8164c5

Parents:

ba395e82b78541478d15708d0c9437137658d1e2

Message:

fix: OrdSgn for matrix orderings with 0 in first row

Files:

• Tst/Short/bug_OrdSgn.res.gz.uu (added)
• Tst/Short/bug_OrdSgn.stat (added)
• Tst/Short/bug_OrdSgn.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)

Tst/Short/ok_s.lst

@@ -16 +16 @@
 bug_newstruct3
 bug_normalize
+bug_OrdSgn
 bug_printres
 bug_qring2

libpolys/polys/monomials/ring.cc

@@ -3863 +3863 @@
           else
           {
-            // very bad:
-            nonpos++;
-            nonneg++;
-            found=1;
+            // very bad: try next row(s)
+            int add=r->block1[j]-r->block0[j]+1;
+            int max_i=r->block0[j]+add*add-add-1;
+            while(found==0)
+            {
+              i+=add;
+              if (r->wvhdl[j][i-r->block0[j]]<0)
+              {
+                r->OrdSgn=-1;
+                nonpos++;
+                found=1;
+              }
+              else if(r->wvhdl[j][i-r->block0[j]]>0)
+              {
+                nonneg++;
+                found=1;
+              }
+              else if(i>max_i)
+              {
+                nonpos++;
+                nonneg++;
+                found=1;
+              }
+            }
           }
         }