Changeset 35cfa3 in git

Timestamp:

Jan 22, 2008, 10:41:26 AM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

b4295512db55bc6ac6f2916cebb10337102336e4

Parents:

ef9d6b431bfae763ec3be1cc7fa8a7ff3a44d0d3

Message:

*hannes: sqrfree


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

Location:

Singular

Files:

• ChangeLog (modified) (1 diff)
• iparith.cc (modified) (8 diffs)
• tok.h (modified) (2 diffs)

Singular/ChangeLog

@@ -71 +71 @@
 - fixed LIB/involut.lib: problems with ring change : nc_algebra
 
+---------------------------------------------------------
+Tue Jan 22 10:40:39 CET 2008
+more Changes with respect to 3-0-4-1
+- sqrFree moved from libfac to factory
+- new command sqrfree
+

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.465 2008-01-21 18:04:48 Singular Exp $ */
+/* $Id: iparith.cc,v 1.466 2008-01-22 09:40:03 Singular Exp $ */
 
 /*
@@ -375 +375 @@
   { "slimgb",      0, SLIM_GB_CMD ,       CMD_1},
   { "sortvec",     0, SORTVEC_CMD ,       CMD_1},
+  { "sqrfree",     0, SQR_FREE_CMD ,      CMD_1},
 #ifdef OLD_RES
   { "sres",        0, SRES_CMD ,          CMD_23},
@@ -1980 +1981 @@
   return FALSE;
 }
+extern int singclap_factorize_retry;
+static BOOLEAN jjFAC_P2(leftv res, leftv u,leftv dummy)
+{
+  intvec *v=NULL;
+  int sw=(int)(long)dummy->Data();
+  int fac_sw=sw;
+  if ((sw<0)||(sw>2)) fac_sw=1;
+  singclap_factorize_retry=0;
+  ideal f=singclap_factorize((poly)(u->CopyD()), &v, fac_sw);
+  if (f==NULL)
+    return TRUE;
+  switch(sw)
+  {
+    case 0:
+    case 2:
+    {
+      lists l=(lists)omAllocBin(slists_bin);
+      l->Init(2);
+      l->m[0].rtyp=IDEAL_CMD;
+      l->m[0].data=(void *)f;
+      l->m[1].rtyp=INTVEC_CMD;
+      l->m[1].data=(void *)v;
+      res->data=(void *)l;
+      res->rtyp=LIST_CMD;
+      return FALSE;
+    }
+    case 1:
+      res->data=(void *)f;
+      return FALSE;
+    case 3:
+      {
+        poly p=f->m[0];
+        int i=IDELEMS(f);
+        f->m[0]=NULL;
+        while(i>1)
+        {
+          i--;
+          p=pMult(p,f->m[i]);
+          f->m[i]=NULL;
+        }
+        res->data=(void *)p;
+        res->rtyp=POLY_CMD;
+      }
+      return FALSE;
+  }
+  WerrorS("invalid switch");
+  return TRUE;
+}
 static BOOLEAN jjFACSTD2(leftv res, leftv v, leftv w)
 {
@@ -2876 +2925 @@
   return FALSE;
 }
-#ifdef HAVE_FACTORY
-extern int singclap_factorize_retry;
-static BOOLEAN jjSQR_FREE_DEC(leftv res, leftv u,leftv dummy)
-{
-  intvec *v=NULL;
-  int sw=(int)(long)dummy->Data();
-  int fac_sw=sw;
-  if ((sw<0)||(sw>2)) fac_sw=1;
-  singclap_factorize_retry=0;
-  ideal f=singclap_factorize((poly)(u->CopyD()), &v, fac_sw);
-  if (f==NULL)
-    return TRUE;
-  switch(sw)
-  {
-    case 0:
-    case 2:
-    {
-      lists l=(lists)omAllocBin(slists_bin);
-      l->Init(2);
-      l->m[0].rtyp=IDEAL_CMD;
-      l->m[0].data=(void *)f;
-      l->m[1].rtyp=INTVEC_CMD;
-      l->m[1].data=(void *)v;
-      res->data=(void *)l;
-      res->rtyp=LIST_CMD;
-      return FALSE;
-    }
-    case 1:
-      res->data=(void *)f;
-      return FALSE;
-    case 3:
-      {
-        poly p=f->m[0];
-        int i=IDELEMS(f);
-        f->m[0]=NULL;
-        while(i>1)
-        {
-          i--;
-          p=pMult(p,f->m[i]);
-          f->m[i]=NULL;
-        }
-        res->data=(void *)p;
-        res->rtyp=POLY_CMD;
-      }
-      return FALSE;
-  }
-  WerrorS("invalid switch");
-  return TRUE;
-}
-#endif
 static BOOLEAN jjSTATUS2(leftv res, leftv u, leftv v)
 {
@@ -3256 +3255 @@
 #ifdef HAVE_FACTORY
 ,{jjEXTGCD_P,  EXTGCD_CMD,     LIST_CMD,       POLY_CMD,   POLY_CMD NO_PLURAL}
-,{jjSQR_FREE_DEC,FAC_CMD,      IDEAL_CMD,      POLY_CMD,   INT_CMD NO_PLURAL}
-,{jjFACSTD2,    FACSTD_CMD,    LIST_CMD,       IDEAL_CMD,  IDEAL_CMD NO_PLURAL}
+,{jjFAC_P2,     FAC_CMD,        IDEAL_CMD,      POLY_CMD,   INT_CMD NO_PLURAL}
+,{jjFACSTD2,   FACSTD_CMD,     LIST_CMD,       IDEAL_CMD,  IDEAL_CMD NO_PLURAL}
 #else
 ,{jjWRONG2,    EXTGCD_CMD,     LIST_CMD,       POLY_CMD,   POLY_CMD NO_PLURAL}
@@ -4404 +4403 @@
   return FALSE;
 }
+#ifdef HAVE_FACTORY
+extern int singclap_factorize_retry;
+static BOOLEAN jjSQR_FREE(leftv res, leftv u)
+{
+  intvec *v=NULL;
+  singclap_factorize_retry=0;
+  ideal f=singclap_sqrfree((poly)(u->CopyD()));
+  if (f==NULL)
+    return TRUE;
+  res->data=(void *)f;
+  return FALSE;
+}
+#endif
 #if 1
 static BOOLEAN jjSYZYGY(leftv res, leftv v)
@@ -4413 +4425 @@
 }
 #else
-// activate, if idSyz hadle moduke weights correctly !
+// activate, if idSyz handle module weights correctly !
 static BOOLEAN jjSYZYGY(leftv res, leftv v)
 {
@@ -5071 +5083 @@
 ,{jjSort_Id,    SORTVEC_CMD,     INTVEC_CMD,     IDEAL_CMD      ALLOW_PLURAL}
 ,{jjSort_Id,    SORTVEC_CMD,     INTVEC_CMD,     MODUL_CMD      ALLOW_PLURAL}
+,{jjSQR_FREE,   SQR_FREE_CMD,    IDEAL_CMD,      POLY_CMD       NO_PLURAL}
 ,{jjSTD,        STD_CMD,         IDEAL_CMD,      IDEAL_CMD      ALLOW_PLURAL}
 ,{jjSTD,        STD_CMD,         MODUL_CMD,      MODUL_CMD      ALLOW_PLURAL}

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: tokens, types for interpreter; general macros
 */
-/* $Id: tok.h,v 1.68 2007-11-16 15:33:51 Singular Exp $ */
+/* $Id: tok.h,v 1.69 2008-01-22 09:40:03 Singular Exp $ */
 
 #ifndef MYYSTYPE
@@ -128 +128 @@
   SIMPLEX_CMD,
   SLIM_GB_CMD,
-  SQR_FREE_DEC_CMD,
+  SQR_FREE_CMD,
   STATUS_CMD,
   STRING_CMD,