Changeset 3fa56b in git for Singular/iparith.cc

Timestamp:

Aug 1, 2011, 8:14:09 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

9b398bf9bcc10fa186e47a13bfee0f9c2411be18

Parents:

5f0de86b93880cf5a4ec451d78ebc9de6163c54c

Message:

fix tr. 351

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

File:

• Singular/iparith.cc (modified) (1 diff)

Singular/iparith.cc

@@ -3786 +3786 @@
 static BOOLEAN jjFACSTD(leftv res, leftv v)
 {
-  ideal_list p,h;
-  h=kStdfac((ideal)v->Data(),NULL,testHomog,NULL);
   lists L=(lists)omAllocBin(slists_bin);
-  if (h==NULL)
-  {
+  if (rField_is_Zp()
+  || rField_is_Q()
+  || rField_is_Zp_a()
+  || rField_is_Q_a())
+  {
+    ideal_list p,h;
+    h=kStdfac((ideal)v->Data(),NULL,testHomog,NULL);
+    if (h==NULL)
+    {
+      L->Init(1);
+      L->m[0].data=(char *)idInit(0,1);
+      L->m[0].rtyp=IDEAL_CMD;
+    }
+    else
+    {
+      p=h;
+      int l=0;
+      while (p!=NULL) { p=p->next;l++; }
+      L->Init(l);
+      l=0;
+      while(h!=NULL)
+      {
+        L->m[l].data=(char *)h->d;
+        L->m[l].rtyp=IDEAL_CMD;
+        p=h->next;
+        omFreeSize(h,sizeof(*h));
+        h=p;
+        l++;
+      }
+    }
+  }
+  else
+  {
+    WarnS("no factorization implemented");
     L->Init(1);
-    L->m[0].data=(char *)idInit(0,1);
-    L->m[0].rtyp=IDEAL_CMD;
-  }
-  else
-  {
-    p=h;
-    int l=0;
-    while (p!=NULL) { p=p->next;l++; }
-    L->Init(l);
-    l=0;
-    while(h!=NULL)
-    {
-      L->m[l].data=(char *)h->d;
-      L->m[l].rtyp=IDEAL_CMD;
-      p=h->next;
-      omFreeSize(h,sizeof(*h));
-      h=p;
-      l++;
-    }
+    iiExprArith1(&(L->m[0]),v,STD_CMD);
   }
   res->data=(void *)L;