Changeset 3eccafa in git

Timestamp:

Jan 22, 1999, 6:40:57 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

31b8436f979efbf98c360c7279f6ef542bf0c26f

Parents:

29a9d139b98d3546d9bf9d28c6bbe74f351c98a3

Message:

* hannes: minor changes to naEqual
          highcorner introduced (iparith.cc, tok.h) and documented
	  (reference.doc, general.doc)


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

Files:

• Singular/extra.cc (modified) (4 diffs)
• Singular/iparith.cc (modified) (4 diffs)
• Singular/longalg.cc (modified) (2 diffs)
• Singular/tok.h (modified) (2 diffs)
• Tst/Old/palg.stat (modified) (1 diff)
• doc/general.doc (modified) (previous)
• doc/reference.doc (modified) (previous)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.87 1999-01-19 13:42:30 Singular Exp $ */
+/* $Id: extra.cc,v 1.88 1999-01-22 17:40:49 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -881 +881 @@
         if (slOpen(l, SI_LINK_READ)) return TRUE;
       }
-      
+
       MP_Link_pt link = (MP_Link_pt) l->data;
-      if (MP_InitMsg(link) != MP_Success) 
+      if (MP_InitMsg(link) != MP_Success)
       {
         WerrorS("Can not Init");
@@ -915 +915 @@
     else
 #endif
+/*============================================================*/
       Werror( "system(\"%s\",...) %s", sys_cmd, feNotImplemented );
   }
@@ -920 +921 @@
 }
 #endif // HAVE_EXTENDED_SYSTEM
-/*============================================================*/

Singular/iparith.cc

@@ -168 +168 @@
   { "GCD",         2, GCD_CMD ,           CMD_2},
   { "hilb",        0, HILBERT_CMD ,       CMD_12},
+  { "highcorner",  0, HIGHCORNER_CMD,     CMD_1},
   { "homog",       0, HOMOG_CMD ,         CMD_12},
   { "ideal",       0, IDEAL_CMD ,         IDEAL_CMD},
@@ -2473 +2474 @@
   return FALSE;
 }
+#ifdef HAVE_FACTORY
+static BOOLEAN jjFACSTD(leftv res, leftv v)
+{
+  res->data=(void *)kStdfac((ideal)v->Data(),NULL,testHomog,NULL);
+  setFlag(res,FLAG_STD);
+  return FALSE;
+}
+#endif
 static BOOLEAN jjGETDUMP(leftv res, leftv v)
 {
@@ -2487 +2496 @@
     return FALSE;
 }
-#ifdef HAVE_FACTORY
-static BOOLEAN jjFACSTD(leftv res, leftv v)
-{
-  res->data=(void *)kStdfac((ideal)v->Data(),NULL,testHomog,NULL);
-  setFlag(res,FLAG_STD);
-  return FALSE;
-}
-#endif
+static BOOLEAN jjHIGHCORNER(leftv res, leftv v)
+{
+  ideal I=(ideal)v->Data();
+  BOOLEAN *UsedAxis=(BOOLEAN *)Alloc0(pVariables*sizeof(BOOLEAN));
+  int i,n;
+  for(i=IDELEMS(I)-1;i>=0;i--)
+  {
+    if((n=pIsPurePower(I->m[i]))!=0) UsedAxis[n-1]=TRUE;
+  }
+  for(i=pVariables-1;i>=0;i--)
+  {
+    if(UsedAxis[i]==FALSE) return FALSE; // not zero-dim.
+  }
+  if (currRing->OrdSgn==1)
+  {
+    res->data=pOne();
+    return FALSE;
+  }
+  poly po=NULL;
+  scComputeHC(I,0,po);
+  if (po!=NULL)
+  {
+    pGetCoeff(po)=nInit(1);
+    for (i=pVariables; i>0; i--)
+    {
+      if (pGetExp(po, i) > 0) pDecrExp(po,i);
+    }
+    pSetm(po);
+  }
+  res->data=(void *)po;
+  return FALSE;
+}
 static BOOLEAN jjHILBERT(leftv res, leftv v)
 {
@@ -3348 +3381 @@
 #endif
 ,{jjGETDUMP,    GETDUMP_CMD,     NONE,           LINK_CMD }
+,{jjHIGHCORNER, HIGHCORNER_CMD,  POLY_CMD,       IDEAL_CMD }
 ,{jjHILBERT,    HILBERT_CMD,     NONE,           IDEAL_CMD }
 ,{jjHILBERT,    HILBERT_CMD,     NONE,           MODUL_CMD }

Singular/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.27 1999-01-21 15:00:07 Singular Exp $ */
+/* $Id: longalg.cc,v 1.28 1999-01-22 17:40:51 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -1640 +1640 @@
 BOOLEAN naEqual (number a, number b)
 {
-  number h;
-  BOOLEAN bo;
-  h = naSub(a, b);
-  bo = naIsZero(h);
+  if(a==b) return TRUE;
+  if((a==NULL)&&(b!=NULL)) return FALSE;
+  if((b==NULL)&&(a!=NULL)) return FALSE;
+
+  lnumber aa=(lnumber)a;
+  lnumber bb=(lnumber)b;
+
+  int an_deg=0;
+  if(aa->n!=NULL)
+    an_deg=napDeg(aa->n);
+  int bn_deg=0;
+  if(bb->n!=NULL)
+    bn_deg=napDeg(bb->n);
+  if(an_deg+napDeg(bb->z)!=bn_deg+napDeg(aa->z))
+    return FALSE;
+#if 0
+  naNormalize(a);
+  aa=(lnumber)a;
+  naNormalize(b);
+  bb=(lnumber)b;
+  if((aa->n==NULL)&&(bb->n!=NULL)) return FALSE;
+  if((bb->n==NULL)&&(aa->n!=NULL)) return FALSE;
+  if(napComp(aa->z,bb->z)!=0) return FALSE;
+  if((aa->n!=NULL) && (napComp(aa->n,bb->n))) return FALSE;
+#endif
+  number h = naSub(a, b);
+  BOOLEAN bo = naIsZero(h);
   naDelete(&h);
   return bo;

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: token for interpreter, as types; general macros
 */
-/* $Id: tok.h,v 1.21 1998-10-21 10:25:40 krueger Exp $ */
+/* $Id: tok.h,v 1.22 1999-01-22 17:40:52 Singular Exp $ */
 
 #ifndef MYYSTYPE
@@ -68 +68 @@
   GCD_CMD,
   GETDUMP_CMD,
+  HIGHCORNER_CMD,
   INSERT_CMD,
   INT_CMD,

Tst/Old/palg.stat

@@ -2 +2 @@
 1 >> tst_memory_1 :: nepomuck.mathematik.uni-kl.de:707254
 1 >> tst_memory_2 :: nepomuck.mathematik.uni-kl.de:675840
-1 >> tst_timer_1 :: nepomuck.mathematik.uni-kl.de:194
+1 >> tst_timer_1 :: nepomuck.mathematik.uni-kl.de:199