Changeset fee24e in git for Singular/iparith.cc

Timestamp:

Dec 6, 2011, 12:02:30 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

600d9a415e87303ccbc4a8f4460e9617a66c7f81

Parents:

ae3ad6cdf6204f707110d832cded7d76f5258ed2

git-author:

Martin Lee <martinlee84@web.de>2011-12-06 12:02:30+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-12 21:04:27+01:00

Message:

chg: sqrfree command now returns also multiplicities by default

File:

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

Singular/iparith.cc

@@ -3145 +3145 @@
   return FALSE;
 }
+#ifdef HAVE_FACTORY
+extern int singclap_factorize_retry;
+static BOOLEAN jjSQR_FREE2(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_sqrfree((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 FALSE;
+}
+#endif
 static BOOLEAN jjSTATUS2(leftv res, leftv u, leftv v)
 {
@@ -4629 +4679 @@
 }
 #ifdef HAVE_FACTORY
-extern int singclap_factorize_retry;
 static BOOLEAN jjSQR_FREE(leftv res, leftv u)
 {
   singclap_factorize_retry=0;
-  ideal f=singclap_sqrfree((poly)(u->CopyD()),currRing);
-  if (f==NULL)
-    return TRUE;
-  res->data=(void *)f;
+  ideal f=singclap_sqrfree((poly)(u->CopyD()), &v, 0, currRing);
+  if (f==NULL) return TRUE;
+  ivTest(v);
+  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;
   return FALSE;
 }