Changeset 86fcc0 in git

Timestamp:

Nov 4, 2009, 6:59:51 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3580b7115f22b137b32322afb07cb8febdf9e80c

Parents:

c84406c7f927d46cedeb1e94024cd843f319713f

Message:

*hannes: bigint extended

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

File:

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

Singular/iparith.cc

@@ -1798 +1798 @@
 {
   lists c=(lists)u->CopyD(); // list of ideal
-  intvec* p=(intvec*)v->Data();
-  int rl=p->length();
+  lists pl=NULL;
+  intvec *p=NULL;
+  if (v->Typ()==LIST_CMD) pl=(lists)v->Data();
+  else                    p=(intvec*)v->Data();
+  int rl=c->nr+1;
   poly r=NULL,h;
   ideal result;
   ideal *x=(ideal *)omAlloc(rl*sizeof(ideal));
   int i;
+  int return_type=c->m[0].Typ();
+  if ((return_type!=IDEAL_CMD)
+  && (return_type!=MODUL_CMD)
+  && (return_type!=MATRIX_CMD))
+  {
+    WerrorS("ideal/module/matrix expected");
+    omFree(x); // delete c
+    return TRUE;
+  }
   for(i=rl-1;i>=0;i--)
   {
-    if (c->m[i].Typ()!=IDEAL_CMD)
-    {
-      Werror("ideal expected at pos %d",i+1);
+    if (c->m[i].Typ()!=return_type)
+    {
+      Werror("%s expected at pos %d",Tok2Cmdname(return_type),i+1);
       omFree(x); // delete c
       return TRUE;
@@ -1815 +1827 @@
   }
   number *q=(number *)omAlloc(rl*sizeof(number));
-  for(i=rl-1;i>=0;i--)
-  {
-    q[i]=nlInit((*p)[i], currRing);
+  if (p!=NULL)
+  {
+    for(i=rl-1;i>=0;i--)
+    {
+      q[i]=nlInit((*p)[i], currRing);
+    }
+  }
+  else
+  {
+    for(i=rl-1;i>=0;i--)
+    {
+      if (pl->m[i].Typ()!=BIGINT_CMD)
+      {
+        Werror("bigint expected at pos %d",i+1);
+        omFree(x); // delete c
+        omFree(q); // delete pl
+        return TRUE;
+      }
+      q[i]=(number)(pl->m[i].Data());
+    }
   }
   result=idChineseRemainder(x,q,rl);
-  for(i=rl-1;i>=0;i--)
-  {
-    nlDelete(&(q[i]),currRing);
+  if (p!=NULL)
+  {
+    for(i=rl-1;i>=0;i--)
+    {
+      nlDelete(&(q[i]),currRing);
+    }
   }
   omFree(q);
   res->data=(char *)result;
+  res->rtyp=return_type;
   return FALSE;
 }
@@ -3398 +3431 @@
 ,{jjCHINREM_BI,CHINREM_CMD,    BIGINT_CMD,     INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}
 //,{jjCHINREM_P, CHINREM_CMD,    POLY_CMD,       LIST_CMD,   INTVEC_CMD, ALLOW_PLURAL}
-,{jjCHINREM_ID,CHINREM_CMD,    IDEAL_CMD,      LIST_CMD,   INTVEC_CMD, ALLOW_PLURAL |NO_RING}
+,{jjCHINREM_ID,CHINREM_CMD,    IDEAL_CMD/*set by p*/,LIST_CMD,INTVEC_CMD, ALLOW_PLURAL |NO_RING}
+,{jjCHINREM_ID,CHINREM_CMD,    IDEAL_CMD/*set by p*/,LIST_CMD,LIST_CMD, ALLOW_PLURAL |NO_RING}
 ,{jjCOEF,      COEF_CMD,       MATRIX_CMD,     POLY_CMD,   POLY_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{jjCOEFFS_Id, COEFFS_CMD,     MATRIX_CMD,     IDEAL_CMD,  POLY_CMD, ALLOW_PLURAL |ALLOW_RING}