Changeset a8c225 in git

Timestamp:

Dec 16, 2003, 7:14:29 PM (20 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9708d8baac2bc8ee72ab1755a216b0fc12ea607b

Parents:

1c3b7ec229e223b0425eb2e0e13c272e25617424

Message:

*levandov: plural routines added


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

File:

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.307 2003-12-16 14:55:34 Singular Exp $ */
+/* $Id: iparith.cc,v 1.308 2003-12-16 18:14:29 levandov Exp $ */
 
 /*
@@ -58 +58 @@
 
 #ifdef HAVE_PLURAL
+#include "gring.h"
 #define ALLOW_PLURAL    ,1
 #define NO_PLURAL       ,0
@@ -199 +200 @@
   { "gcd",         0, GCD_CMD ,           CMD_2},
   { "GCD",         2, GCD_CMD ,           CMD_2},
-#ifdef HAVE_PLURAL
-  { "gring",       0, GRING_CMD ,         GRING_CMD},
-#endif
   { "hilb",        0, HILBERT_CMD ,       CMD_123},
   { "highcorner",  0, HIGHCORNER_CMD,     CMD_1},
@@ -1981 +1979 @@
   return FALSE;
 }
+
+#ifdef HAVE_PLURAL
+static BOOLEAN jjPlural_mat_mat(leftv res, leftv a, leftv b)
+{
+  return nc_CallPlural((matrix)a->Data(),(matrix)b->Data(),NULL,NULL,currRing);
+}
+
+static BOOLEAN jjPlural_num_mat(leftv res, leftv a, leftv b)
+{
+  return nc_CallPlural(NULL,(matrix)b->Data(),(poly)a->Data(),NULL,currRing);
+}
+
+static BOOLEAN jjPlural_mat_poly(leftv res, leftv a, leftv b)
+{
+  return nc_CallPlural((matrix)a->Data(),NULL,NULL,(poly)b->Data(),currRing);
+}
+
+static BOOLEAN jjPlural_num_poly(leftv res, leftv a, leftv b)
+{
+  return nc_CallPlural(NULL,NULL,(poly)a->Data(),(poly)b->Data(),currRing);
+}
+#endif
+
 static BOOLEAN jjQUOT(leftv res, leftv u, leftv v)
 {
@@ -2537 +2558 @@
 ,{jjLIFTSTD,   LIFTSTD_CMD,    IDEAL_CMD,      IDEAL_CMD,  MATRIX_CMD NO_PLURAL}
 ,{jjLIFTSTD,   LIFTSTD_CMD,    MODUL_CMD,      MODUL_CMD,  MATRIX_CMD NO_PLURAL}
+#ifdef HAVE_PLURAL
+,{jjPlural_mat_mat,  NCALGEBRA_CMD,  NONE,  MATRIX_CMD, MATRIX_CMD NO_PLURAL}
+,{jjPlural_num_mat,  NCALGEBRA_CMD,  NONE,  POLY_CMD,   MATRIX_CMD NO_PLURAL}
+,{jjPlural_mat_poly, NCALGEBRA_CMD,  NONE,  MATRIX_CMD, POLY_CMD   NO_PLURAL}
+,{jjPlural_num_poly, NCALGEBRA_CMD,  NONE,  POLY_CMD,   POLY_CMD   NO_PLURAL}
+#endif
 ,{jjCALL2MANY, LIST_CMD,       LIST_CMD,       DEF_CMD,    DEF_CMD ALLOW_PLURAL}
 ,{jjRES,       LRES_CMD,       RESOLUTION_CMD, IDEAL_CMD,  INT_CMD NO_PLURAL}