Changeset d7626fe in git for Singular

Timestamp:

May 29, 2006, 2:35:09 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

f06d10c42ba650766e1cc962deb5435f3c72d9f3

Parents:

03b1a7285ca5db618ee83e8eec33fc10554e6992

Message:

*hannes: std(i,j), + bigint preparation


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

Location:

Singular

Files:

• iparith.cc (modified) (13 diffs)
• tok.h (modified) (2 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.398 2006-05-19 10:38:53 bricken Exp $ */
+/* $Id: iparith.cc,v 1.399 2006-05-29 12:34:41 Singular Exp $ */
 
 /*
@@ -164 +164 @@
   { "bareiss",     0, BAREISS_CMD ,       CMD_123},
   { "betti",       0, BETTI_CMD ,         CMD_12},
+  { "bigint",      0, BIGINT_CMD ,        ROOT_DECL},
   #ifdef HAVE_PLURAL
   { "bracket",     0, BRACKET_CMD ,       CMD_2},
@@ -790 +791 @@
   return jjPLUSMINUS_Gen(res,u,v);
 }
+static BOOLEAN jjPLUS_BI(leftv res, leftv u, leftv v)
+{
+  res->data = (char *)(nlAdd((number)u->Data(), (number)v->Data()));
+  return jjPLUSMINUS_Gen(res,u,v);
+}
 static BOOLEAN jjPLUS_N(leftv res, leftv u, leftv v)
 {
@@ -863 +869 @@
   return jjPLUSMINUS_Gen(res,u,v);
 }
+static BOOLEAN jjMINUS_BI(leftv res, leftv u, leftv v)
+{
+  res->data = (char *)(nlSub((number)u->Data(), (number)v->Data()));
+  return jjPLUSMINUS_Gen(res,u,v);
+}
 static BOOLEAN jjMINUS_N(leftv res, leftv u, leftv v)
 {
@@ -906 +917 @@
   return FALSE;
 }
+static BOOLEAN jjTIMES_BI(leftv res, leftv u, leftv v)
+{
+  res->data = (char *)(nlMult( (number)u->Data(), (number)v->Data()));
+  if ((v->next!=NULL) || (u->next!=NULL))
+    return jjOP_REST(res,u,v);
+  return FALSE;
+}
 static BOOLEAN jjTIMES_N(leftv res, leftv u, leftv v)
 {
@@ -1076 +1094 @@
   }
   res->data=(void *)r;
+  return FALSE;
+}
+static BOOLEAN jjDIV_BI(leftv res, leftv u, leftv v)
+{
+  number q=(number)v->Data();
+  if (nlIsZero(q))
+  {
+    WerrorS(ii_div_by_0);
+    return TRUE;
+  }
+  q = nlIntDiv((number)u->Data(),q);
+  nlNormalize(q);
+  res->data = (char *)q;
   return FALSE;
 }
@@ -2644 +2675 @@
   assumeStdFlag(u);
   ideal i1=(ideal)(u->Data());
-  ideal i0=idInit(1,i1->rank);
-  i0->m[0]=(poly)v->Data();
+  ideal i0;
+  int r=v->Typ();
+  if ((/*v->Typ()*/r==POLY_CMD) ||(r==VECTOR_CMD))
+  {
+    i0=idInit(1,i1->rank);
+    i0->m[0]=(poly)v->Data();
+  }
+  else /*IDEAL*/
+  {
+    i0=(ideal)v->Data();
+  }
   i1=idSimpleAdd(i1,i0);
-  i0->m[0]=NULL;
+  memset(i0->m,0,sizeof(poly)*IDELEMS(i0));
   idDelete(&i0);
   intvec *w=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
@@ -2719 +2759 @@
  {jjCOLCOL,    COLONCOLON,     ANY_TYPE,       DEF_CMD,    DEF_CMD ALLOW_PLURAL}
 ,{jjPLUS_I,    '+',            INT_CMD,        INT_CMD,    INT_CMD ALLOW_PLURAL}
+,{jjPLUS_BI,   '+',           BIGINT_CMD,     BIGINT_CMD, BIGINT_CMD ALLOW_PLURAL}
 ,{jjPLUS_N,    '+',            NUMBER_CMD,     NUMBER_CMD, NUMBER_CMD ALLOW_PLURAL}
 ,{jjPLUS_P,    '+',            POLY_CMD,       POLY_CMD,   POLY_CMD ALLOW_PLURAL}
@@ -2740 +2781 @@
 ,{jjRSUM,      '+',            QRING_CMD,      QRING_CMD,  QRING_CMD ALLOW_PLURAL}
 ,{jjMINUS_I,   '-',            INT_CMD,        INT_CMD,    INT_CMD ALLOW_PLURAL}
+,{jjMINUS_BI,  '-',            BIGINT_CMD,     BIGINT_CMD, BIGINT_CMD ALLOW_PLURAL}
 ,{jjMINUS_N,   '-',            NUMBER_CMD,     NUMBER_CMD, NUMBER_CMD ALLOW_PLURAL}
 ,{jjMINUS_P,   '-',            POLY_CMD,       POLY_CMD,   POLY_CMD ALLOW_PLURAL}
@@ -2750 +2792 @@
 ,{jjMINUS_IV,  '-',            INTMAT_CMD,     INTMAT_CMD, INTMAT_CMD ALLOW_PLURAL}
 ,{jjTIMES_I,   '*',            INT_CMD,        INT_CMD,    INT_CMD ALLOW_PLURAL}
+,{jjTIMES_BI,  '*',            BIGINT_CMD,     BIGINT_CMD, BIGINT_CMD ALLOW_PLURAL}
 ,{jjTIMES_N,   '*',            NUMBER_CMD,     NUMBER_CMD, NUMBER_CMD ALLOW_PLURAL}
 ,{jjTIMES_P,   '*',            POLY_CMD,       POLY_CMD,   POLY_CMD ALLOW_PLURAL}
@@ -2783 +2826 @@
 ,{jjOP_IV_I,   '/',            INTMAT_CMD,     INTMAT_CMD, INT_CMD ALLOW_PLURAL}
 ,{jjDIVMOD_I,  INTDIV_CMD,     INT_CMD,        INT_CMD,    INT_CMD ALLOW_PLURAL}
+,{jjDIV_BI,    INTDIV_CMD,     BIGINT_CMD,     BIGINT_CMD, BIGINT_CMD ALLOW_PLURAL}
 ,{jjOP_IV_I,   INTDIV_CMD,     INTVEC_CMD,     INTVEC_CMD, INT_CMD ALLOW_PLURAL}
 ,{jjOP_IV_I,   INTDIV_CMD,     INTMAT_CMD,     INTMAT_CMD, INT_CMD ALLOW_PLURAL}
@@ -3019 +3063 @@
 ,{jjSTD_1,     STD_CMD,        IDEAL_CMD,      IDEAL_CMD,  POLY_CMD ALLOW_PLURAL}
 ,{jjSTD_1,     STD_CMD,        MODUL_CMD,      MODUL_CMD,  VECTOR_CMD ALLOW_PLURAL}
+,{jjSTD_1,     STD_CMD,        IDEAL_CMD,      IDEAL_CMD,  IDEAL_CMD ALLOW_PLURAL}
+,{jjSTD_1,     STD_CMD,        MODUL_CMD,      MODUL_CMD,  MODUL_CMD ALLOW_PLURAL}
 ,{jjSTD_HILB,  STD_CMD,        IDEAL_CMD,      IDEAL_CMD,  INTVEC_CMD NO_PLURAL}
 ,{jjSTD_HILB,  STD_CMD,        MODUL_CMD,      MODUL_CMD,  INTVEC_CMD NO_PLURAL}
@@ -4043 +4089 @@
     case INTMAT_CMD:  res->data=omStrDup("intmat"); break;
     case NUMBER_CMD:  res->data=omStrDup("number"); break;
+    case BIGINT_CMD:  res->data=omStrDup("bigint"); break;
     case LIST_CMD:   res->data=omStrDup("list"); break;
     case PACKAGE_CMD: res->data=omStrDup("package"); break;

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: tokens, types for interpreter; general macros
 */
-/* $Id: tok.h,v 1.63 2005-05-18 15:59:37 Singular Exp $ */
+/* $Id: tok.h,v 1.64 2006-05-29 12:34:41 Singular Exp $ */
 
 #ifndef MYYSTYPE
@@ -45 +45 @@
   ATTRIB_CMD,
   BAREISS_CMD,
+  BIGINT_CMD,
   BRACKET_CMD,
   BREAKPOINT_CMD,