Changeset 28f60c in git

Timestamp:

Nov 26, 2009, 3:40:09 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

954ea75d96fb42a2592f4aa08cad7778f69766e2

Parents:

6a5712c8ea777d6518549d07dc27a939291bac6d

Message:

allow int/bigint for chinrem

git-svn-id: file:///usr/local/Singular/svn/trunk@12331 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/iparith.cc (modified) (9 diffs)

Singular/iparith.cc

@@ -1044 +1044 @@
     b=pCopy((poly)v->Data());
     #if 0
-    if ((a!=NULL) && (b!=NULL) 
+    if ((a!=NULL) && (b!=NULL)
     && (pLDeg(a,&dummy,currRing)+pLDeg(b,&dummy,currRing)>=currRing->bitmask))
     {
@@ -1845 +1845 @@
       for(i=rl-1;i>=0;i--)
       {
-        if (pl->m[i].Typ()!=BIGINT_CMD)
+        if (pl->m[i].Typ()==INT_CMD)
+        {
+          q[i]=nlInit((int)(long)pl->m[i].Data(),currRing);
+        }
+        else if (pl->m[i].Typ()==BIGINT_CMD)
+        {
+          q[i]=nlCopy((number)(pl->m[i].Data()));
+        }
+        else
         {
           Werror("bigint expected at pos %d",i+1);
+          for(i++;i<rl;i++)
+          {
+            nlDelete(&(q[i]),currRing);
+          }
           omFree(x); // delete c
           omFree(q); // delete pl
           return TRUE;
         }
-        q[i]=(number)(pl->m[i].Data());
       }
     }
     result=idChineseRemainder(x,q,rl);
-    if (p!=NULL)
-    {
-      for(i=rl-1;i>=0;i--)
-      {
-        nlDelete(&(q[i]),currRing);
-      }
+    for(i=rl-1;i>=0;i--)
+    {
+      nlDelete(&(q[i]),currRing);
     }
     omFree(q);
@@ -2668 +2676 @@
     return TRUE;
   }
-  
+
   if (iiOp==NCALGEBRA_CMD)
   {
@@ -2748 +2756 @@
 {
   res->data=NULL;
-            
+
   if (rIsPluralRing(currRing))
   {
@@ -3217 +3225 @@
   }
   int ii0=idElem(i0); /* size of i0 */
-  i1=idSimpleAdd(i1,i0); // 
+  i1=idSimpleAdd(i1,i0); //
   memset(i0->m,0,sizeof(poly)*IDELEMS(i0)); // TODO: memory leak? !!
   idDelete(&i0);
@@ -3239 +3247 @@
   BITSET save_test=test;
   test|=Sy_bit(OPT_SB_1);
-  /* IDELEMS(il)-ii0 appears to be the position of the first element of il that 
+  /* IDELEMS(il)-ii0 appears to be the position of the first element of il that
      does not belong to the input ideal */
   result=kStd(i1,currQuotient,hom,&w,NULL,0,IDELEMS(i1)-ii0);
@@ -4120 +4128 @@
   {
     res->data=(void *)(long)idHomModule(v_id,currQuotient,&w);
-    if (res->data!=NULL) 
+    if (res->data!=NULL)
     {
       if (v->rtyp==IDHDL)
@@ -4256 +4264 @@
   int W = IDELEMS(id);
 
-  ideal result = idInit(W * pVariables, id->rank); 
+  ideal result = idInit(W * pVariables, id->rank);
   poly *p = result->m;
-        
+
   for( int v = 1; v <= pVariables; v++ )
   {
     poly* q = id->m;
-    for( int i = 0; i < W; i++, p++, q++ ) 
+    for( int i = 0; i < W; i++, p++, q++ )
       *p = pDiff( *q, v );
   }
@@ -6183 +6191 @@
   res->data = (char *)idLiftStd((ideal)u->Data(),
                                 &(hv->data.umatrix),testHomog,
-                                &(hw->data.uideal));
+                                &(hw->data.uideal));
   setFlag(res,FLAG_STD); v->flag=0; w->flag=0;
   return FALSE;