Changeset 797a9ff in git

Timestamp:

Oct 1, 2010, 1:53:08 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

cd055e1dd6e77006ee3347c53932f782e97afc29

Parents:

f2de2ee419de0f638b6b86c0d38f82d6e481ae9e

Message:

primefactors usage fixed

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

File:

• Singular/LIB/paraplanecurves.lib (modified) (6 diffs)

Singular/LIB/paraplanecurves.lib

@@ -1826 +1826 @@
   bigint nn = n; if (nn < 0) { nn = -n; }
   list L = primefactors(nn);
-  if (L[1] != 1)
+  if (L[3] != 1)
   { "WARNING: command 'primefactors(.)' did not find all prime factors"; }
   int i; bigint m = bigint(1); int e; int j;
-  for (i = 1; i <= size(L[2]); i = i + 1)
+  for (i = 1; i <= size(L[1]); i++)
   {
-    e = L[3][i] / 2;
-    for (j = 1; j <= e; j = j + 1) { m = m * bigint(L[2][i]); }
+    e = L[2][i] / 2;
+    for (j = 1; j <= e; j++) { m = m * bigint(L[1][i]); }
   }
   return (m);
@@ -1891 +1891 @@
     /* For small p, we use a brute force approach: */
     int i;
-    for (i = 2; i < p; i = i + 1)
+    for (i = 2; i < p; i++)
     {
       if (((i*i) mod p) == r) { return (i); }
@@ -1974 +1974 @@
 
   list L = primefactors(m);
-  if (L[1] != 1)
+  if ((L[3] != 1)||(L[3]!=-1))
  { "WARNING: command 'primefactors(.)' did not find all prime factors"; }
   int i;
-  for (i = 1; i <= size(L[2]); i = i + 1)
+  for (i = 1; i <= size(L[2]); i++)
   {
-    if (legendreSymbol(r, L[2][i]) == -1) { return (-1); }
+    if (legendreSymbol(r, L[1][i]) == -1) { return (-1); }
   }
   /* now we know that there is some x in {0, 1, m-1} with
@@ -1996 +1996 @@
     list roots;
     // 2.1):
-    for (i = 1; i <= size(L[2]); i = i + 1)
-    {
-      roots = insert(roots, rootModP(r mod L[2][i], L[2][i]), size(roots));
+    for (i = 1; i <= size(L[1]); i++)
+    {
+      roots = insert(roots, rootModP(r mod L[1][i], L[1][i]), size(roots));
     }
 
     // 2.2):
     bigint c; bigint l; bigint temp; bigint pPower; int e;
-    for (i = 1; i <= size(roots); i = i + 1)
-    {
-      pPower = bigint(L[2][i]);
-      for (e = 2; e <= L[3][i]; e = e + 1)
+    for (i = 1; i <= size(roots); i++)
+    {
+      pPower = bigint(L[1][i]);
+      for (e = 2; e <= L[2][i]; e++)
       {
         c = bigint(roots[i]); l = pPower;
         temp = r - c * c; l = bigint(2) * c * l; c = temp;
         c = c div pPower; l = l div pPower;
-        c = c mod L[2][i]; l = l mod L[2][i];
-        c = (c * bigint(inverseModP(l, L[2][i]))) mod L[2][i];
+        c = c mod L[1][i]; l = l mod L[1][i];
+        c = (c * bigint(inverseModP(l, L[1][i]))) mod L[1][i];
         c = bigint(roots[i]) + c * pPower;
-        pPower = pPower * L[2][i]; roots[i] = c;
+        pPower = pPower * L[1][i]; roots[i] = c;
       }
     }
@@ -2020 +2020 @@
     // 2.3):
     list mm; bigint z; int j;
-    for (i = 1; i <= size(L[2]); i = i + 1)
-    {
-      z = bigint(L[2][i]);
-      for (j = 2; j <= L[3][i]; j = j + 1)
+    for (i = 1; i <= size(L[1]); i++)
+    {
+      z = bigint(L[1][i]);
+      for (j = 2; j <= L[2][i]; j++)
       {
-        z = z * bigint(L[2][i]);
+        z = z * bigint(L[1][i]);
       }
       mm = insert(mm, z, size(mm));
@@ -2046 +2046 @@
   bigint x = bigint(0); int i; bigint N; list l;
   bigint M = bigint(mm[1]);
-  for (i = 2; i <= size(mm); i = i + 1) { M = M * bigint(mm[i]); }
-  for (i = 1; i <= size(mm); i = i + 1)
+  for (i = 2; i <= size(mm); i++) { M = M * bigint(mm[i]); }
+  for (i = 1; i <= size(mm); i++)
   {
     N = M div mm[i];