Changeset 0936ad in git

Timestamp:

Feb 27, 2001, 7:11:57 PM (22 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

c4c09e76adac559bf8a62d01b19240258705f112

Parents:

2d19a1bcc1aee3296e6608f8ae49f22b191d6880

Message:

*mschulze: redNF with parameters


git-svn-id: file:///usr/local/Singular/svn/trunk@5287 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.257 2001-02-14 12:31:07 Singular Exp $ */
+/* $Id: iparith.cc,v 1.258 2001-02-27 18:11:57 mschulze Exp $ */
 
 /*
@@ -4434 +4434 @@
     return TRUE;
   }
-  res->data = (char *)rednf((ideal)v->CopyD(),(poly)u->CopyD(),
+  res->data = (char *)redNF((ideal)v->CopyD(),(poly)u->CopyD(),
     (poly)w->CopyD());
   return FALSE;
@@ -4446 +4446 @@
     return TRUE;
   }
-  res->data = (char *)rednf((ideal)v->CopyD(),(ideal)u->CopyD(),
+  res->data = (char *)redNF((ideal)v->CopyD(),(ideal)u->CopyD(),
     (matrix)w->CopyD());
   return FALSE;
@@ -4974 +4974 @@
   return r;
 }
+static BOOLEAN jjREDUCE5(leftv res, leftv v)
+{
+  leftv u1=v;
+  leftv u2=v->next;
+  leftv u3=u2->next;
+  leftv u4=u3->next;
+  leftv u5=u4->next;
+  if((u1->Typ()==IDEAL_CMD)&&(u2->Typ()==IDEAL_CMD)&&(u3->Typ()==MATRIX_CMD)&&
+     (u4->Typ()==INT_CMD)&&(u5->Typ()==INTVEC_CMD))
+  {
+    if(!mpIsDiagUnit((matrix)u3->Data()))
+    {
+      Werror("3rd argument must be a diagonal matrix of units");
+      return FALSE;
+    }
+    res->rtyp=IDEAL_CMD;
+    res->data=(char*)redNF(idCopy((ideal)u2->Data()),idCopy((ideal)u1->Data()),
+                           mpCopy((matrix)u3->Data()),
+                           (int)u4->Data(),(intvec*)u5->Data());
+    return FALSE;
+  }
+  else
+  if((u1->Typ()==POLY_CMD)&&(u2->Typ()==IDEAL_CMD)&&(u3->Typ()==POLY_CMD)&&
+     (u4->Typ()==INT_CMD)&&(u5->Typ()==INTVEC_CMD))
+  {
+    if(!pIsUnit((poly)u3->Data()))
+    {
+      Werror("3rd argument must be a unit");
+      return FALSE;
+    }
+    res->rtyp=POLY_CMD;
+    res->data=(char*)redNF(idCopy((ideal)u2->Data()),pCopy((poly)u1->Data()),
+                           pCopy((poly)u3->Data()),
+                           (int)u4->Data(),(intvec*)u5->Data());
+    return FALSE;
+  }
+  else
+  {
+    Werror("%s(`ideal`,`ideal`,`matrix`,`int`,`intvec`) exppected",
+           Tok2Cmdname(iiOp));
+    return TRUE;
+  }
+}
 static BOOLEAN jjRESERVED0(leftv res, leftv v)
 {
@@ -5213 +5256 @@
 ,{jjCALL3ARG,  REDUCE_CMD,      IDEAL_CMD/*or set by p*/,          3  }
 ,{jjREDUCE4,   REDUCE_CMD,      IDEAL_CMD/*or set by p*/,          4  }
+,{jjREDUCE5,   REDUCE_CMD,      IDEAL_CMD/*or set by p*/,          5  }
 ,{jjCALL1ARG,  RESERVEDNAME_CMD, INT_CMD,            1 }
 ,{jjRESERVED0, RESERVEDNAME_CMD, NONE,               0 }