Changeset e4ac9d in git

Timestamp:

Sep 7, 2016, 6:16:35 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

bebd5a0361ed499fa0769cad9424e1bb193acd7c

Parents:

e1ccd6716e34657f35d7ef3c0a08f29295742d935600a4f5be2705b151d6d42fac572d137ff0924b

Message:

Merge branch 'spielwiese' of github.com:Singular/Sources into spielwiese

Files:

• Singular/LIB/modular.lib (modified) (6 diffs)
• kernel/GBEngine/kInline.h (modified) (1 diff)
• kernel/GBEngine/kutil.h (modified) (1 diff)

Singular/LIB/modular.lib

@@ -40 +40 @@
 ";
 
+LIB "general.lib";
 LIB "resources.lib";
 LIB "tasks.lib";
@@ -157 +158 @@
         // delete unlucky primes
         indices = deleteUnluckyPrimes(modresults);
+        indices = sort(indices)[1];
+        for (i = size(indices); i > 1; i--) {
+            if (indices[i] == indices[i-1]) {
+                indices = delete(indices, i);
+            }
+        }
         for (i = size(indices); i > 0; i--) {
             modresults = delete(modresults, indices[i]);
@@ -164 +171 @@
         // lift result
         if (N == 1) {
-            result_lift = chinrem(modresults, primes);
+            result_lift = chinrem_recursive(modresults, primes);
         }
         else {
-            result_lift = chinrem(list(result_lift)+modresults,
+            result_lift = chinrem_recursive(list(result_lift)+modresults,
                 list(N)+primes);
         }
@@ -211 +218 @@
     ideal I = x9y2+x10, x2y7-y8;
     modular("std", list(I));
+}
+
+static proc chinrem_recursive(list modresults, list moduli)
+{
+    if (typeof(modresults[1]) != "list") {
+        return(chinrem(modresults, moduli));
+    }
+    // if typeof(modresults[1]) == "list", then we assume
+    // size(modresults[1]) == size(modresults[k])
+    // for k = 2, ..., size(modresults)
+    int n_sublists = size(modresults[1]);
+    int i, j;
+    list modresults_sublists;
+    for (j = n_sublists; j > 0; j--) {
+        modresults_sublists[j] = list();
+        for (i = size(modresults); i > 0; i--) {
+            modresults_sublists[j][i] = modresults[i][j];
+        }
+        task t(j) = "Modular::chinrem_recursive",
+            list(modresults_sublists[j], moduli);
+    }
+    startTasks(t(1..n_sublists));
+    waitAllTasks(t(1..n_sublists));
+    list result;
+    for (j = n_sublists; j > 0; j--) {
+        result[j] = getResult(t(j));
+        killTask(t(j));
+    }
+    return(result);
 }
 
@@ -290 +326 @@
 {
     arg_type = typeof(farey_arg);
-    if (arg_type != "bigint" && arg_type != "ideal"
-        && arg_type != "module" && arg_type != "matrix") {
+    if (arg_type != "bigint" && arg_type != "ideal" && arg_type != "module"
+        && arg_type != "matrix" && arg_type != "list") {
         ERROR("wrong input type");
+    }
+    int i;
+    if (arg_type == "list") {
+        int size_farey_arg = size(farey_arg);
+        for (i = size_farey_arg; i > 0; i--) {
+            task t(i) = "Modular::farey_parallel", list(farey_arg[i], farey_N);
+        }
+        startTasks(t(1..size_farey_arg));
+        waitAllTasks(t(1..size_farey_arg));
+        list result;
+        for (i = size_farey_arg; i > 0; i--) {
+            result[i] = getResult(t(i));
+            killTask(t(i));
+        }
+        return(result);
     }
     if (arg_type == "bigint" || arg_type == "matrix") {
@@ -302 +353 @@
     int chunks = par_range(size_arg);
     intvec range;
-    int i;
     for (i = chunks; i > 0; i--) {
         range = par_range(size_arg, i);

kernel/GBEngine/kInline.h

@@ -739 +739 @@
 }
 
-KINLINE poly sLObject::CopyGetP()
-{
-  if (bucket != NULL)
-  {
-    int i = kBucketCanonicalize(bucket);
-    poly bp = p_Copy(bucket->buckets[i], tailRing);
-    pLength = bucket->buckets_length[i] + 1;
-    if (bp != NULL)
-    {
-      assume(t_p != NULL || p != NULL);
-      if (t_p != NULL) pNext(t_p) = bp;
-      else pNext(p) = bp;
-    }
-    bucket = NULL;
-  }
-  return sLObject::GetP();
-}
-
-
 KINLINE long sLObject::pLDeg()
 {

kernel/GBEngine/kutil.h

@@ -230 +230 @@
   // makes a copy of the poly of L
   KINLINE void Copy();
-  // gets the poly and makes a copy of it
-  KINLINE poly CopyGetP();
 
   KINLINE int GetpLength();