Changeset d609e1 in git for Singular/iparith.cc

Timestamp:

Feb 8, 2001, 2:13:06 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

cd9bd11338310a68a7f540822564453a1bdc9889

Parents:

4cbe5ddf85f8cae8cfd990f0d4cde7d588643de9

Message:

*hannes/mschulze: invunit stuff


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

File:

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.253 2001-02-06 13:16:20 Singular Exp $ */
+/* $Id: iparith.cc,v 1.254 2001-02-08 13:13:01 Singular Exp $ */
 
 /*
@@ -44 +44 @@
 #include "sparsmat.h"
 #include "algmap.h"
+#include "units.h"
 #ifdef HAVE_FACTORY
 #include "clapsing.h"
@@ -1805 +1806 @@
 static BOOLEAN jjJET_P(leftv res, leftv u, leftv v)
 {
-  res->data = (char *)pJet((poly)u->Data(),(int)v->Data());
+  res->data = (char *)pJet((poly)u->CopyD(), (int)v->Data());
   return FALSE;
 }
@@ -4154 +4155 @@
 {
   short *iw=iv2array((intvec *)w->Data());
-  res->data = (char *)pJetW((poly)u->Data(),(int)v->Data(),iw);
+  res->data = (char *)ppJetW((poly)u->Data(),(int)v->Data(),iw);
   omFreeSize((ADDRESS)iw,(pVariables+1)*sizeof(short));
+  return FALSE;
+}
+static BOOLEAN jjJET_P_P(leftv res, leftv u, leftv v, leftv w)
+{
+  poly ww=(poly)w->Data();
+  if (!pIsUnit(ww))
+  {
+    WerrorS("3rd argument must be a unit");
+    return TRUE;
+  }
+  res->data = (char *)pSeries((int)v->Data(),(poly)u->CopyD(),(poly)w->CopyD());
   return FALSE;
 }
@@ -4162 +4174 @@
   res->data = (char *)idJetW((ideal)u->Data(),(int)v->Data(),
                              (intvec *)w->Data());
+  return FALSE;
+}
+static BOOLEAN jjJET_ID_M(leftv res, leftv u, leftv v, leftv w)
+{
+  matrix ww=(matrix)w->Data();
+  if (!mpIsDiagUnit(ww))
+  {
+    WerrorS("3rd argument must be a diagonal matrix of units");
+    return TRUE;
+  }
+  res->data = (char *)idSeries((int)v->Data(),(ideal)u->CopyD(),
+                               (matrix)w->CopyD());
   return FALSE;
 }
@@ -4400 +4424 @@
   res->data = (char *)idModule2formatedMatrix(m,ul,vl);
   test=save_test;
+  return FALSE;
+}
+static BOOLEAN jjREDUCE3_CP(leftv res, leftv u, leftv v, leftv w)
+{
+  assumeStdFlag(v);
+  if (!idIsZeroDim((ideal)v->Data()))
+  {
+    Werror("`%s` must be 0-dimensional",v->Name());
+    return TRUE;
+  }  
+  res->data = (char *)rednf((ideal)v->CopyD(),(poly)u->CopyD(),
+    (poly)w->CopyD());
+  return FALSE;
+}
+static BOOLEAN jjREDUCE3_CID(leftv res, leftv u, leftv v, leftv w)
+{
+  assumeStdFlag(v);
+  if (!idIsZeroDim((ideal)v->Data()))
+  {
+    Werror("`%s` must be 0-dimensional",v->Name());
+    return TRUE;
+  }  
+  res->data = (char *)rednf((ideal)v->CopyD(),(ideal)u->CopyD(),
+    (matrix)w->CopyD());
   return FALSE;
 }
@@ -4521 +4569 @@
 ,{jjJET_P_IV,       JET_CMD,    VECTOR_CMD, VECTOR_CMD, INT_CMD,    INTVEC_CMD }
 ,{jjJET_ID_IV,      JET_CMD,    MODUL_CMD,  MODUL_CMD,  INT_CMD,    INTVEC_CMD }
+,{jjJET_P_P,        JET_CMD,    POLY_CMD,   POLY_CMD,   INT_CMD,    POLY_CMD }
+,{jjJET_P_P,        JET_CMD,    VECTOR_CMD, VECTOR_CMD, INT_CMD,    POLY_CMD }
+,{jjJET_ID_M,       JET_CMD,    IDEAL_CMD,  IDEAL_CMD,  INT_CMD,    MATRIX_CMD }
+,{jjJET_ID_M,       JET_CMD,    MODUL_CMD,  MODUL_CMD,  INT_CMD,    MATRIX_CMD }
 ,{mpKoszul,         KOSZUL_CMD, MATRIX_CMD, INT_CMD,    INT_CMD,    IDEAL_CMD }
 ,{jjCALL3MANY,      LIST_CMD,   LIST_CMD,   DEF_CMD,    DEF_CMD,    DEF_CMD }
@@ -4543 +4595 @@
 ,{jjREDUCE3_ID,     REDUCE_CMD, MODUL_CMD,  MODUL_CMD,  MODUL_CMD,  INT_CMD }
 ,{jjREDUCE3_ID,     REDUCE_CMD, MODUL_CMD,  MODUL_CMD,  IDEAL_CMD,  INT_CMD }
+,{jjREDUCE3_CP,     REDUCE_CMD, POLY_CMD,   POLY_CMD,   IDEAL_CMD,  POLY_CMD }
+,{jjREDUCE3_CP,     REDUCE_CMD, VECTOR_CMD, VECTOR_CMD, MODUL_CMD,  POLY_CMD }
+,{jjREDUCE3_CID,    REDUCE_CMD, IDEAL_CMD,  IDEAL_CMD,  IDEAL_CMD,  MATRIX_CMD }
+,{jjREDUCE3_CID,    REDUCE_CMD, MODUL_CMD,  MODUL_CMD,  MODUL_CMD,  MATRIX_CMD }
 #ifdef OLD_RES
 ,{jjRES3,           RES_CMD,    NONE,       IDEAL_CMD,  INT_CMD,    ANY_TYPE }