Changeset 2cd1ae in git

Timestamp:

Jan 21, 2022, 5:01:08 PM (17 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

7d610fffb54f657df3230000abd69da8db93b03f

Parents:

908d1f167af74acb9bca8213230d13d6c99501f5

Message:

fix rref

Location:

libpolys/polys

Files:

• clapsing.cc (modified) (4 diffs)
• flintconv.cc (modified) (1 diff)

libpolys/polys/clapsing.cc

@@ -2011 +2011 @@
       {
         poly h=MATELEM(m,i,j);
-        if ((h!=NULL)
-        && (p_Totaldegree(h,R)==0))
+        if (h!=NULL)
         {
-          (*NTLM)(i,j)=(long)p_GetCoeff(h,R);
-        }
-        else
-        {
-          WerrorS("smatrix for rref is not constant");
-          return M;
+          if (p_Totaldegree(h,R)==0)
+          {
+            (*NTLM)(i,j)=(long)p_GetCoeff(h,R);
+          }
+          else
+          {
+            WerrorS("smatrix for rref is not constant");
+            return M;
+          }
         }
       }
@@ -2032 +2034 @@
         {
           poly p=p_NSet(n,R);
-          p_SetComp(p,i,R);
-          M->m[j]=p_Add_q(M->m[j],p,R);
+          MATELEM(M,i,j)=p;
         }
       }
@@ -2059 +2060 @@
     mat_zz_p *NTLM=new mat_zz_p;
     NTLM->SetDims(r,c);
-    for(j=c;j>0;j--)
+    for(j=c-1;j>=0;j--)
     {
       poly h=m->m[j];
@@ -2085 +2086 @@
           poly p=p_NSet(n,R);
           p_SetComp(p,i,R);
-          M->m[j]=p_Add_q(M->m[j],p,R);
+          M->m[j-1]=p_Add_q(M->m[j-1],p,R);
         }
       }

libpolys/polys/flintconv.cc

@@ -389 +389 @@
       {
         poly h=MATELEM(m,i,j);
-        if ((h!=NULL)
-        && (p_Totaldegree(h,R)==0))
-          convSingNFlintN(fmpq_mat_entry(FLINTM,i-1,j-1),pGetCoeff(h),R->cf);
-        else
+        if (h!=NULL)
         {
-          WerrorS("matrix for rref is not constant");
-          return M;
+          if (p_Totaldegree(h,R)==0)
+            convSingNFlintN(fmpq_mat_entry(FLINTM,i-1,j-1),pGetCoeff(h),R->cf);
+          else
+          {
+            WerrorS("matrix for rref is not constant");
+            return M;
+          }
         }
       }