Changeset cdd38f in git

Timestamp:

Aug 22, 2008, 11:01:19 AM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

ed0d3c884cb3d290762c61e585627ce1f0c18f60

Parents:

c51e4a10429f5e0dc652e64d47621b06986328ad

Message:

*hannes: kernel cmd


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

Files:

• Singular/iparith.cc (modified) (6 diffs)
• Singular/tok.h (modified) (2 diffs)
• doc/NEWS.texi (modified) (3 diffs)
• doc/reference.doc (modified) (previous)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.477 2008-08-18 10:41:46 Singular Exp $ */
+/* $Id: iparith.cc,v 1.478 2008-08-22 09:01:18 Singular Exp $ */
 
 /*
@@ -283 +283 @@
   { "kbase",       0, KBASE_CMD ,         CMD_12},
   { "keepring",    0, KEEPRING_CMD ,      KEEPRING_CMD},
+  { "kernel",      0, KERNEL_CMD ,        CMD_2},
   { "kill",        0, KILL_CMD ,          KILL_CMD},
   { "killattrib",  0, KILLATTR_CMD ,      CMD_12},
@@ -2323 +2324 @@
                               (ideal)(u->Data()),currQuotient);
   return FALSE;
+}
+static BOOLEAN jjPREIMAGE(leftv res, leftv u, leftv v, leftv w);
+static BOOLEAN jjKERNEL(leftv res, leftv u, leftv v)
+{
+  return jjPREIMAGE(res,u,v,NULL);
 }
 static BOOLEAN jjKoszul(leftv res, leftv u, leftv v)
@@ -3349 +3355 @@
 ,{jjKBASE2,    KBASE_CMD,      IDEAL_CMD,      IDEAL_CMD,  INT_CMD ALLOW_PLURAL}
 ,{jjKBASE2,    KBASE_CMD,      MODUL_CMD,      MODUL_CMD,  INT_CMD ALLOW_PLURAL}
+,{jjKERNEL,    KERNEL_CMD,     IDEAL_CMD, RING_CMD,        ANY_TYPE ALLOW_PLURAL}
+,{jjKERNEL,    KERNEL_CMD,     IDEAL_CMD, QRING_CMD,       ANY_TYPE ALLOW_PLURAL}
 ,{atKILLATTR2, KILLATTR_CMD,   NONE,           IDHDL,      STRING_CMD ALLOW_PLURAL}
 ,{jjKoszul,    KOSZUL_CMD,     MATRIX_CMD,     INT_CMD,    INT_CMD NO_PLURAL}
@@ -5628 +5636 @@
 static BOOLEAN jjPREIMAGE(leftv res, leftv u, leftv v, leftv w)
 {
+  // handles preimage(r,phi,i) and kernel(r,phi)
   idhdl h;
   ring rr;
   map mapping;
-
-  if ((v->name==NULL) || (w->name==NULL))
+  BOOLEAN kernel_cmd= (iiOp==KERNEL_CMD);
+
+  if ((v->name==NULL) || (!kernel_cmd && (w->name==NULL)))
   {
     WerrorS("2nd/3rd arguments must have names");
@@ -5667 +5677 @@
     return TRUE;
   }
-  if ((h=rr->idroot->get(w->name,myynest))!=NULL)
-  {
-    if (h->typ==IDEAL_CMD)
-    {
-      if (((currRing->qideal!=NULL) && (pOrdSgn==-1))
-      || ((rr->qideal!=NULL) && (rr->OrdSgn==-1)))
-      {
-        WarnS("preimage in local qring may be wrong: use Ring::preimageLoc instead");
-      }
-      res->data=(char *)maGetPreimage(rr,mapping,IDIDEAL(h));
-      if (res->data==NULL/* is of type ideal, should not be NULL*/) return TRUE;
+  ideal image;
+  if (kernel_cmd) image=idInit(1,1);
+  else
+  {
+    if ((h=rr->idroot->get(w->name,myynest))!=NULL)
+    {
+      if (h->typ==IDEAL_CMD)
+      {
+        image=IDIDEAL(h);
+      }
+      else
+      {
+        Werror("`%s` is no ideal",IDID(h));
+        return TRUE;
+      }
     }
     else
     {
-      Werror("`%s` is no ideal",IDID(h));
+      Werror("`%s` is not defined in `%s`",w->name,ring_name);
       return TRUE;
     }
   }
-  else
-  {
-    Werror("`%s` is not defined in `%s`",w->name,ring_name);
-    return TRUE;
-  }
-  return FALSE;
+  if (((currRing->qideal!=NULL) && (pOrdSgn==-1))
+  || ((rr->qideal!=NULL) && (rr->OrdSgn==-1)))
+  {
+    WarnS("preimage in local qring may be wrong: use Ring::preimageLoc instead");
+  }
+  res->data=(char *)maGetPreimage(rr,mapping,image);
+  if (kernel_cmd) idDelete(&image);
+  return (res->data==NULL/* is of type ideal, should not be NULL*/);
 }
 static BOOLEAN jjRANDOM_Im(leftv res, leftv u, leftv v, leftv w)

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: tokens, types for interpreter; general macros
 */
-/* $Id: tok.h,v 1.69 2008-01-22 09:40:03 Singular Exp $ */
+/* $Id: tok.h,v 1.70 2008-08-22 09:01:18 Singular Exp $ */
 
 #ifndef MYYSTYPE
@@ -89 +89 @@
   IS_RINGVAR,
   JANET_CMD,
+  KERNEL_CMD,
   KILLATTR_CMD,
   KRES_CMD,

doc/NEWS.texi

@@ -1 +1 @@
 @comment -*-texinfo-*-
-@comment $Id: NEWS.texi,v 1.102 2008-08-19 18:04:02 Singular Exp $
+@comment $Id: NEWS.texi,v 1.103 2008-08-22 09:01:19 Singular Exp $
 @comment this file contains the News about Singular versions
 @comment Unix
@@ -33 +33 @@
 @itemize @bullet
 @item
+new command: kernel (@nref{kernel})
+@item
 new command: sqrfree (@nref{sqrfree})
 @item
@@ -40 +42 @@
 
 @heading Internal Changes
-@table @bullet
+@itemize @bullet
 @item new build target: libsingular.a (for gfan etc.)
 @item code variants depend now on CPU typ, not OS
 @item better test for builtin limits (@nref{Limitations})
-@end table
+@end itemize
 
 @heading New @sc{Singular} libraries