Changeset a0f998 in git

Timestamp:

Mar 19, 2004, 6:37:29 PM (20 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

39f0690f5b3c7eacde5fc6a2e6ee80c332202f8a

Parents:

20ee6d53a86cc7bbe5d1762a73628af8fb98231a

Message:

*levandov: rewritten last plural-related system commands bracket and twostd


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

Location:

Singular

Files:

• iparith.cc (modified) (6 diffs)
• tok.h (modified) (3 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.313 2004-03-19 16:47:19 Singular Exp $ */
+/* $Id: iparith.cc,v 1.314 2004-03-19 17:37:29 levandov Exp $ */
 
 /*
@@ -155 +155 @@
   { "bareiss",     0, BAREISS_CMD ,       CMD_123},
   { "betti",       0, BETTI_CMD ,         CMD_12},
+  #ifdef HAVE_PLURAL
+  { "bracket",     0, BRACKET_CMD ,       CMD_2},
+  #endif
   { "break",       0, BREAK_CMD ,         BREAK_CMD},
   { "breakpoint",  0, BREAKPOINT_CMD ,    CMD_M},
@@ -324 +327 @@
   { "trace",       0, TRACE_CMD ,         CMD_1},
   { "transpose",   0, TRANSPOSE_CMD ,     CMD_1},
+  #ifdef HAVE_PLURAL
+  { "twostd",      0, TWOSTD_CMD ,        CMD_1},
+  #endif
   { "type",        0, TYPE_CMD ,          TYPE_CMD},
   { "typeof",      0, TYPEOF_CMD ,        CMD_1},
@@ -2001 +2007 @@
   return nc_CallPlural((matrix)a->Data(),(matrix)b->Data(),NULL,NULL,currRing);
 }
+
+static BOOLEAN jjBRACKET(leftv res, leftv a, leftv b)
+{
+  if (rIsPluralRing(currRing)) 
+  {
+    poly p = (poly)a->CopyD(POLY_CMD);
+    poly q = (poly)b->Data();
+    res->data = nc_p_Bracket_qq(p,q);
+  }
+  else res->data=NULL;
+  return FALSE;
+}
+
+static BOOLEAN jjTWOSTD(leftv res, leftv a)
+{
+  if (rIsPluralRing(currRing))  res->data=(ideal)twostd((ideal)a->Data());
+  else  res->data=(ideal)a->Data();
+  setFlag(res,FLAG_STD);
+  setFlag(res,FLAG_TWOSTD);
+  return FALSE;
+}
+
 #endif
 
@@ -2479 +2507 @@
 ,{jjWRONG2,    BAREISS_CMD,    0,              DEF_CMD,    DEF_CMD ALLOW_PLURAL}
 ,{syBetti2,    BETTI_CMD,      INTMAT_CMD,     RESOLUTION_CMD, INT_CMD ALLOW_PLURAL}
+#ifdef HAVE_PLURAL
+,{jjBRACKET,   BRACKET_CMD,    POLY_CMD,       POLY_CMD,   POLY_CMD ALLOW_PLURAL}
+#endif
 ,{jjCOEF,      COEF_CMD,       MATRIX_CMD,     POLY_CMD,   POLY_CMD ALLOW_PLURAL}
 ,{jjCOEFFS_Id, COEFFS_CMD,     MATRIX_CMD,     IDEAL_CMD,  POLY_CMD ALLOW_PLURAL}
@@ -3996 +4027 @@
 ,{jjSYZYGY,     SYZYGY_CMD,      MODUL_CMD,      IDEAL_CMD      ALLOW_PLURAL}
 ,{jjSYZYGY,     SYZYGY_CMD,      MODUL_CMD,      MODUL_CMD      ALLOW_PLURAL}
+#ifdef HAVE_PLURAL
+,{jjTWOSTD,     TWOSTD_CMD,      IDEAL_CMD,      IDEAL_CMD      ALLOW_PLURAL}
+#endif
 ,{jjWRONG,      TRACE_CMD,       0,              INTVEC_CMD     ALLOW_PLURAL}
 ,{jjWRONG,      TRACE_CMD,       0,              IDEAL_CMD      ALLOW_PLURAL}

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: tokens, types for interpreter; general macros
 */
-/* $Id: tok.h,v 1.56 2003-12-16 14:55:37 Singular Exp $ */
+/* $Id: tok.h,v 1.57 2004-03-19 17:37:28 levandov Exp $ */
 
 #ifndef MYYSTYPE
@@ -59 +59 @@
   ATTRIB_CMD,
   BAREISS_CMD,
+  BRACKET_CMD,
   BREAKPOINT_CMD,
   CHARACTERISTIC_CMD,
@@ -136 +137 @@
   TRANSPOSE_CMD,
   TRACE_CMD,
+  TWOSTD_CMD,
   TYPEOF_CMD,
   UNLOAD_CMD,