Changeset ea125f in git

Timestamp:

May 19, 2011, 12:10:13 PM (12 years ago)

Author:

Stefan Steidel <steidel@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

b4f7ebdb67074ac439d1df267fda83171f69d3b8

Parents:

5f32d50562e470047f7956821b2de0bd34fe3b6b

Message:

Redefinitions erased and printlevels improved.

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

File:

• Singular/LIB/assprimeszerodim.lib (modified) (13 diffs)

Singular/LIB/assprimeszerodim.lib

@@ -262 +262 @@
    }
 
+   int T = timer;
+   int RT = rtimer;
+   int TT;
+
    def SPR = basering;
+   if(printlevel >= 10) { "========== Start modStd =========="; }
    I = modStd(I,n);
+   if(printlevel >= 10) { "=========== End modStd ==========="; }
+   if(printlevel >= 9) { "modStd takes "+string(rtimer-RT)+" seconds."; }
    int d = vdim(I);
    if(d == -1) { ERROR("Ideal is not zero-dimensional."); }
    if(homog(I) == 1){ return(list(maxideal(1))); }
    poly f = findGen(I);
-
-   int T = timer;
-   int RT = rtimer;
-   int TT;
+   if(printlevel >= 9) { "Coordinate change: "+string(f); }
+
    if(size(f) == nvars(SPR))
    {
       TT = timer;
       int spT = pTestRad(d,f,I);
-      if(printlevel>=10)
-      {
-         "pTestRad(d,f,I) = "+string(spT)+" and takes
-         "+string(timer-TT)+" seconds.";
+      if(printlevel >= 9)
+      {
+         "pTestRad(d,f,I) = "+string(spT)+" and takes "
+         +string(timer-TT)+" seconds.";
       }
       if(!spT)
@@ -289 +294 @@
                TT = timer;
                I = zeroR(I,n);
-               if(printlevel>=10)
+               if(printlevel >= 9)
                {
                   "zeroR(I,n) takes "+string(timer-TT)+" seconds.";
@@ -295 +300 @@
                TT = timer;
                I = std(I);
-               if(printlevel>=10)
+               if(printlevel >= 9)
                {
                   "std(I) takes "+string(timer-TT)+" seconds.";
@@ -307 +312 @@
             TT = timer;
             I = zeroR(I,n);
-            if(printlevel>=10)
+            if(printlevel >= 9)
             {
                "zeroR(I,n) takes "+string(timer-TT)+" seconds.";
@@ -313 +318 @@
             TT = timer;
             I = std(I);
-            if(printlevel>=10)
+            if(printlevel >= 9)
             {
                "std(I) takes "+string(timer-TT)+" seconds.";
@@ -322 +327 @@
       }
    }
-   if(printlevel>=10)
+   if(printlevel >= 9)
    {
       "Real-time for radical-check is "+string(rtimer - RT)+" seconds.";
@@ -341 +346 @@
 
    ring rHelp = 0,T,dp;
-   list CO1,CO2,P;
+   list CO1,CO2,P,H;
    ideal F,G,testF;
    bigint N;
 
    list ringL = ringlist(SPR);
-   int i,k,e,int_break;
+   int i,k,e,int_break,s;
    int j = 1;
    int index = 1;
@@ -437 +442 @@
          }
       }
-      if(printlevel>=10)
+      if(printlevel >= 9)
       {
          "Real-time for computing list in assPrimes is "+string(rtimer - rt)+
@@ -452 +457 @@
       if(F[1]-testF[1]==0)
       {
-         if(printlevel>=10)
-         {
-            "size(L) = "+string(size(L));
-         }
+         if(printlevel >= 9) { "size(L) = "+string(size(L)); }
+         
          F = cleardenom(F[1]);
 
@@ -461 +464 @@
          if(e == d)
          {
-            list H = factorize(F[1]);
-
-            int s = size(H[1]);
+            H = factorize(F[1]);
+
+            s = size(H[1]);
             for(i = 1; i <= s; i++)
             {
@@ -477 +480 @@
                map phi = rHelp,var(nvars(SPR));
                list H = phi(H);
-               if(printlevel>=10)
+               if(printlevel >= 9)
                {
                   "Real-time without test is "+string(rtimer - RT)+" seconds.";
@@ -525 +528 @@
                      if(F1 != 0) { int_break = 1; }
                   }
-                  if(printlevel>=10)
+                  if(printlevel >= 9)
                   {
                      "Real-time for test is "+string(rtimer - RT)+" seconds.";
@@ -579 +582 @@
    assPrimes(I);
 }
+
 ////////////////////////////////////////////////////////////////////////////////