Changeset b4f7eb in git

Timestamp:

May 19, 2011, 2:08:34 PM (13 years ago)

Author:

Stefan Steidel <steidel@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

55608a78dc5f45276e2138266996767392a31c2c

Parents:

ea125f56f098dfeb4810d7c5066ec3a700e631e8

Message:

Some printlevel improvements.

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

File:

• Singular/LIB/modstd.lib (modified) (7 diffs)

Singular/LIB/modstd.lib

@@ -209 +209 @@
    if(isIncluded(I,J) == 0) { j = 0; }
 
-   if(printlevel >= 10)
+   if(printlevel >= 11)
    {
       "isIncluded(I,J) takes "+string(timer - t)+" seconds";
@@ -229 +229 @@
       if(isIncluded(J,K) == 0) { j = 0; }
 
-      if(printlevel >= 10)
+      if(printlevel >= 11)
       {
          "isIncluded(K,J) takes "+string(timer - t)+" seconds";
@@ -1036 +1036 @@
       }
 
-      if(pd > 2) { "lifting"; }
-
 //------------------------  Delete unlucky primes  -----------------------------
 //-------------  unlucky if and only if the leading ideal is wrong  ------------
@@ -1048 +1046 @@
 //-------------------  Lift results to basering via farey  ---------------------
 
+      tt = timer;     
       N = T2[1];
-      for(i = 2; i <= size(T2); i++){N = N*T2[i];}
+      for(i = 2; i <= size(T2); i++) { N = N*T2[i]; }
       H = chinrem(T1,T2);
       J = farey(H,N);
+      if(printlevel >= 10) { "Lifting-process takes "+string(timer - tt)
+                             +" seconds"; }
 
 //----------------  Test if we already have a standard basis of I --------------
 
       tt = timer; rt = rtimer;
-      if(pd > 2) { "list of primes:"; L; "pTest"; }
       if((variant == 1) || (variant == 3) || (variant == 4) || (variant == 6))
       {
@@ -1076 +1076 @@
          if(printlevel >= 10)
          {
-            "CPU-time for computation without final tests is
-            "+string(timer - TT)+" seconds.";
-            "Real-time for computation without final tests is
-            "+string(rtimer - RT)+" seconds.";
+            "CPU-time for computation without final tests is "
+            +string(timer - TT)+" seconds.";
+            "Real-time for computation without final tests is "
+            +string(rtimer - RT)+" seconds.";
          }
 
@@ -1088 +1088 @@
          if(printlevel >= 10)
          {
-            "CPU-time for checking if I subset <G> is
-            "+string(timer - tt)+" seconds.";
-            "Real-time for checking if I subset <G> is
-            "+string(rtimer - rt)+" seconds.";
+            "CPU-time for checking if I subset <G> is "
+            +string(timer - tt)+" seconds.";
+            "Real-time for checking if I subset <G> is "
+            +string(rtimer - rt)+" seconds.";
          }
 
@@ -1112 +1112 @@
                if(printlevel >= 10)
                {
-                  "CPU-time for last std-computation is
-                  "+string(timer - tt)+" seconds.";
-                  "Real-time for last std-computation is
-                  "+string(rtimer - rt)+" seconds.";
+                  "CPU-time for last std-computation is "
+                  +string(timer - tt)+" seconds.";
+                  "Real-time for last std-computation is "
+                  +string(rtimer - rt)+" seconds.";
                }