Changeset 5402320 in git for Singular/iparith.cc

Timestamp:

Jun 24, 2010, 1:56:07 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

7c4567365d4b984af1971a4e0e08294f46788f75

Parents:

be8dbbe24ea3d24955f3335b0be7c4c0bafd4d87

Message:

primefactors is now implemented in the kernel

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

File:

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

Singular/iparith.cc

@@ -58 +58 @@
 #include "MinorInterface.h"
 #include "linearAlgebra.h"
+#include "misc.h"
 #ifdef HAVE_FACTORY
 #include "clapsing.h"
@@ -372 +373 @@
   { "preimage",    0, PREIMAGE_CMD ,      CMD_13},
   { "prime",       0, PRIME_CMD ,         CMD_1},
+  { "primefactors",0, PFAC_CMD ,          CMD_12},
   { "print",       0, PRINT_CMD ,         CMD_12},
   { "prune",       0, PRUNE_CMD ,         CMD_1},
@@ -3181 +3183 @@
 }
 #endif
+static BOOLEAN jjPFAC2(leftv res, leftv u, leftv v)
+{
+  number m = (number)u->Data();
+  int bound = (int)(long)v->Data();
+  number n;
+  if (u->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, bound);
+  res->data=(char*)l;
+  return FALSE;
+}
 static BOOLEAN jjRSUM(leftv res, leftv u, leftv v)
 {
@@ -3652 +3671 @@
 ,{jjRES,       MRES_CMD,       RESOLUTION_CMD, MODUL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
 //,{nuMPResMat,  MPRES_CMD,      MODUL_CMD,      IDEAL_CMD,  INT_CMD, NO_PLURAL |ALLOW_RING}
+,{jjPFAC2,     PFAC_CMD,       LIST_CMD,       BIGINT_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{jjPFAC2,     PFAC_CMD,       LIST_CMD,       NUMBER_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING}
 #ifdef HAVE_PLURAL
 ,{jjPlural_num_poly, NCALGEBRA_CMD,NONE,       POLY_CMD,   POLY_CMD  , NO_PLURAL |NO_RING}
@@ -4441 +4462 @@
 #define jjLONG2N(D) nlInit((int)D, NULL)
 #endif
+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;
+}
 static BOOLEAN jjLU_DECOMP(leftv res, leftv v)
 {
@@ -5431 +5468 @@
 ,{jjKBASE,      KBASE_CMD,       MODUL_CMD,      MODUL_CMD     , ALLOW_PLURAL |ALLOW_RING}
 ,{jjLU_DECOMP,  LU_CMD,          LIST_CMD,       MATRIX_CMD    , NO_PLURAL |NO_RING}
+,{jjPFAC1,      PFAC_CMD,        LIST_CMD,       BIGINT_CMD    , ALLOW_PLURAL |ALLOW_RING}
+,{jjPFAC1,      PFAC_CMD,        LIST_CMD,       NUMBER_CMD    , ALLOW_PLURAL |ALLOW_RING}
 ,{atKILLATTR1,  KILLATTR_CMD,    NONE,           IDHDL         , ALLOW_PLURAL |ALLOW_RING}
 #ifdef MDEBUG