Changeset dd8d5d in git

Timestamp:

Jul 12, 2010, 7:17:33 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

c33f4e1e651e9c7348e3ee67fe6bc7e975dbbe6f

Parents:

29d1bf21200e88af831c550f2dce8fb241b8b95e

Message:

primefactor(number)

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

File:

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

Singular/iparith.cc

@@ -3188 +3188 @@
   int bound = (int)(long)v->Data();
   number n;
-  if (u->Typ() == BIGINT_CMD) n = m;
+  if ((u->Typ() == BIGINT_CMD)
+  || ((u->Typ()==NUMBER_CMD) && rField_is_Q()))
+  {
+    n = nlCopy(m);
+  }
   else
   {
@@ -3197 +3201 @@
   }
   lists l = primeFactorisation(n, bound);
+  nlDelete(&n,NULL);
   res->data=(char*)l;
   return FALSE;
@@ -4464 +4469 @@
 static BOOLEAN jjPFAC1(leftv res, leftv v)
 {
-  number m = (number)v->Data();
-  number n;
-  if (v->Typ() == BIGINT_CMD) n = m;
-  else
-  {
-    /* then, we expect some other type of number inside m;
-       it needs to be converted to bigint; we do this via 'int' */
-    int i = n_Int(m, currRing);
-    n = nlInit(i, NULL);
-  }
-  lists l = primeFactorisation(n, 0);
-  res->data=(char*)l;
-  return FALSE;
+  sleftv tmp;
+  memset(&tmp,0,sizeof(tmp));
+  tmp.rtyp=INT_CMD;
+  return jjPFAC2(res,v,&tmp);
 }
 static BOOLEAN jjLU_DECOMP(leftv res, leftv v)