Changeset 5c8e18f in git

Timestamp:

Jan 23, 2014, 2:22:22 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cdfcdb8287f66bc6070028082cbbc6eff10e609b')

Children:

8baa377f0e7bdff672abd5ddeade4e629a51e405

Parents:

616d68556ae75bb7c49364150bb827162c506899

Message:

fix: access to chinese remainder, normalization of results

Files:

• Singular/iparith.cc (modified) (3 diffs)
• libpolys/coeffs/longrat.cc (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (1 diff)

Singular/iparith.cc

@@ -1787 +1787 @@
     for(i=rl-1;i>=0;i--)
     {
-      q[i]=n_Init((*p)[i], currRing->cf);
+      q[i]=n_Init((*p)[i], coeffs_BIGINT);
     }
   }
@@ -1796 +1796 @@
       if (pl->m[i].Typ()==INT_CMD)
       {
-        if (return_type==BIGINT_CMD)
-          q[i]=n_Init((int)(long)pl->m[i].Data(),coeffs_BIGINT);
-        else
-          q[i]=n_Init((int)(long)pl->m[i].Data(),currRing->cf);
+        q[i]=n_Init((int)(long)pl->m[i].Data(),coeffs_BIGINT);
       }
       else if (pl->m[i].Typ()==BIGINT_CMD)
       {
-        if (return_type==BIGINT_CMD)
-          q[i]=n_Copy((number)(pl->m[i].Data()),coeffs_BIGINT);
-        else
-          q[i]=n_Init_bigint((number)(pl->m[i].Data()),coeffs_BIGINT,currRing->cf);
+        q[i]=n_Copy((number)(pl->m[i].Data()),coeffs_BIGINT);
       }
       else
       {
         Werror("bigint expected at pos %d",i+1);
-        if (return_type==BIGINT_CMD)
         for(i++;i<rl;i++)
         {
           n_Delete(&(q[i]),coeffs_BIGINT);
         }
-        else
-        for(i++;i<rl;i++)
-        {
-          n_Delete(&(q[i]),currRing);
-        }
-
         omFree(x); // delete c
         omFree(q); // delete pl
@@ -1840 +1827 @@
     res->data=(char *)result;
   }
-  if (return_type==BIGINT_CMD)
   for(i=rl-1;i>=0;i--)
   {
     n_Delete(&(q[i]),coeffs_BIGINT);
-  }
-  else
-  for(i=rl-1;i>=0;i--)
-  {
-    n_Delete(&(q[i]),currRing);
   }
   omFree(q);

libpolys/coeffs/longrat.cc

@@ -2631 +2631 @@
     nlDelete(&p,CF);
   }
+  nlNormalize(n,CF);
   return n;
 }

libpolys/polys/ext_fields/transext.cc

@@ -2383 +2383 @@
   omFreeSize(X,rl*sizeof(number));
   omFreeSize(P,rl*sizeof(poly*));
+  if (p_IsConstant(DEN(result), ntRing)
+  && n_IsOne(pGetCoeff(DEN(result)), ntCoeffs))
+  {
+    p_Delete(&DEN(result),ntRing);
+  }
   return ((number)result);
 }