Changeset 81dab73 in git for Singular/iparith.cc

Timestamp:

Nov 10, 2009, 2:46:54 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

12e5d14f674ea1fe23c399cbcd4c77be738ab4f8

Parents:

2cc33cb332d892eb103308dfdb232467896c09ad

Message:

*hannes: liftstd with 3 args (track 186)

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

File:

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

Singular/iparith.cc

@@ -295 +295 @@
   { "LIB",         0, LIB_CMD ,           SYSVAR},
   { "lift",        0, LIFT_CMD ,          CMD_23},
-  { "liftstd",     0, LIFTSTD_CMD ,       CMD_2},
+  { "liftstd",     0, LIFTSTD_CMD ,       CMD_23},
   { "link",        0, LINK_CMD ,          ROOT_DECL},
   { "listvar",     0, LISTVAR_CMD ,       LISTVAR_CMD},
@@ -2511 +2511 @@
   res->data = (char *)idLiftStd((ideal)u->Data(),
                                 &(h->data.umatrix),testHomog);
-  setFlag(res,FLAG_STD);
+  setFlag(res,FLAG_STD); v->flag=0;
   return FALSE;
 }
@@ -6174 +6174 @@
   return FALSE;
 }
+static BOOLEAN jjLIFTSTD3(leftv res, leftv u, leftv v, leftv w)
+{
+  if ((v->rtyp!=IDHDL)||(v->e!=NULL)) return TRUE;
+  if ((w->rtyp!=IDHDL)||(w->e!=NULL)) return TRUE;
+  idhdl hv=(idhdl)v->data;
+  idhdl hw=(idhdl)w->data;
+  // CopyD for IDEAL_CMD and MODUL_CMD are identical:
+  res->data = (char *)idLiftStd((ideal)u->Data(),
+                                &(hv->data.umatrix),testHomog,
+                                &(hw->data.uideal));
+  setFlag(res,FLAG_STD); v->flag=0; w->flag=0;
+  return FALSE;
+}
 static BOOLEAN jjREDUCE3_CP(leftv res, leftv u, leftv v, leftv w)
 {
@@ -6352 +6365 @@
 ,{jjWRONG3,         JET_CMD,    POLY_CMD,   POLY_CMD,   INT_CMD,    INT_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{mpKoszul,         KOSZUL_CMD, MATRIX_CMD, INT_CMD,    INT_CMD,    IDEAL_CMD, NO_PLURAL |NO_RING}
+,{jjLIFTSTD3,       LIFTSTD_CMD,IDEAL_CMD,  IDEAL_CMD,  MATRIX_CMD, MODUL_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{jjLIFTSTD3,       LIFTSTD_CMD,MODUL_CMD,  MODUL_CMD,  MATRIX_CMD, MODUL_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{jjCALL3MANY,      LIST_CMD,   LIST_CMD,   DEF_CMD,    DEF_CMD,    DEF_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{jjMATRIX_Id,      MATRIX_CMD, MATRIX_CMD, IDEAL_CMD,  INT_CMD,    INT_CMD, ALLOW_PLURAL |ALLOW_RING}