Changeset f9fde8 in git for libpolys

Timestamp:

Jan 20, 2022, 3:19:54 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

908d1f167af74acb9bca8213230d13d6c99501f5

Parents:

7be1d21a7379ce28be9574c8b6e13800001a7653

Message:

fix: system("rref")

File:

• libpolys/polys/flintconv.cc (modified) (11 diffs)

libpolys/polys/flintconv.cc

@@ -353 +353 @@
     {
       poly h=MATELEM(m,i,j);
-      if (h==NULL)
-        nmod_mat_entry(M,i-1,j-1)=0;
-      else
+      if (h!=NULL)
         nmod_mat_entry(M,i-1,j-1)=(long)pGetCoeff(h);
     }
@@ -380 +378 @@
   int c=m->cols();
   int i,j;
-  matrix M=mpNew(r,c);
+  matrix M=NULL;
   if (rField_is_Q(R))
   {
     fmpq_mat_t FLINTM;
     fmpq_mat_init(FLINTM,r,c);
-    number n=n_Init(0,R->cf);
+    M=mpNew(r,c);
     for(i=r;i>0;i--)
     {
@@ -401 +399 @@
       }
     }
-    n_Delete(&n,R->cf);
     fmpq_mat_rref(FLINTM,FLINTM);
     for(i=r;i>0;i--)
@@ -407 +404 @@
       for(j=c;j>0;j--)
       {
-        n=convFlintNSingN(fmpq_mat_entry(FLINTM,i-1,j-1),R->cf);
+        number n=convFlintNSingN(fmpq_mat_entry(FLINTM,i-1,j-1),R->cf);
         MATELEM(M,i,j)=p_NSet(n,R);
       }
@@ -417 +414 @@
     nmod_mat_t FLINTM;
     // convert matrix
-    convSingMFlintNmod_mat(M,FLINTM,R);
+    convSingMFlintNmod_mat(m,FLINTM,R);
     // rank
     long rk= nmod_mat_rref (FLINTM);
@@ -456 +453 @@
     fmpq_mat_t FLINTM;
     fmpq_mat_init(FLINTM,r,c);
-    for(j=c;j>0;j--)
+    for(j=c-1;j>=0;j--)
     {
       poly h=m->m[j];
@@ -463 +460 @@
         i=p_GetComp(h,R);
         if (p_Totaldegree(h,R)==0)
-          convSingNFlintN(fmpq_mat_entry(FLINTM,i-1,j-1),p_GetCoeff(h,R),R->cf);
+          convSingNFlintN(fmpq_mat_entry(FLINTM,i-1,j),p_GetCoeff(h,R),R->cf);
         else
         {
@@ -475 +472 @@
     for(i=r;i>0;i--)
     {
-      for(j=c;j>0;j--)
-      {
-        number n=convFlintNSingN(fmpq_mat_entry(FLINTM,i-1,j-1),R->cf);
+      for(j=c-1;j>=0;j--)
+      {
+        number n=convFlintNSingN(fmpq_mat_entry(FLINTM,i-1,j),R->cf);
         if(!n_IsZero(n,R->cf))
         {
@@ -492 +489 @@
     nmod_mat_t FLINTM;
     nmod_mat_init(FLINTM,r,c,rChar(R));
-    for(j=c;j>0;j--)
+    for(j=c-1;j>=0;j--)
     {
       poly h=m->m[j];
@@ -499 +496 @@
         i=p_GetComp(h,R);
         if (p_Totaldegree(h,R)==0)
-          nmod_mat_entry(FLINTM,i-1,j-1)=(long)p_GetCoeff(h,R);
+          nmod_mat_entry(FLINTM,i-1,j)=(long)p_GetCoeff(h,R);
         else
         {
@@ -511 +508 @@
     for(i=r;i>0;i--)
     {
-      for(j=c;j>0;j--)
-      {
-        number n=n_Init(nmod_mat_entry(FLINTM,i-1,j-1),R->cf);
+      for(j=c-1;j>=0;j--)
+      {
+        number n=n_Init(nmod_mat_entry(FLINTM,i-1,j),R->cf);
         if(!n_IsZero(n,R->cf))
         {