Changeset ec9b96 in git

Timestamp:

May 11, 2006, 8:53:25 PM (17 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

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

Children:

c4224163d0b5a68d0df32d84c36aa034616eeb0c

Parents:

ab9844937566dae9f75927a6ac2989457ff9e881

Message:

!: found&fixed a bug: mindeg of ideal is intmat => mindegInt


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

File:

• Singular/LIB/center.lib (modified) (10 diffs)

Singular/LIB/center.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: center.lib,v 1.19 2006-05-05 14:36:12 motsak Exp $"
+version="$Id: center.lib,v 1.20 2006-05-11 18:53:25 motsak Exp $"
 category="Noncommutative"
 info="
@@ -1058 +1058 @@
   int m = (k > 0);
         
-  int MinDeg = 6; // starting guess for Maximal Bounding Degree, 6
-  int Delta  = 4; // increment of it, 4
+  int @MinDeg = 1; // starting guess for Maximal Bounding Degree, 6
+  int @Delta  = 1; // increment of it, 4
         
   if( m and (D <= 0) )
     {
       // minimal guess
-      D = MinDeg;
+      D = @MinDeg;
     }
     
@@ -1207 +1207 @@
 
           // Init new grades:
-          for( j = D + 1; j <= (D + Delta); j++ )
+          for( j = D + 1; j <= (D + @Delta); j++ )
             {
               FOUND_LEADING_MONOMIALS[j] = ideal();
@@ -1225 +1225 @@
             {
               // minimal degree:
-              d = mindeg(FLM);  
+              d = mindegInt(FLM);  /// ### ///
                 
               // take all of minimal degree:               
@@ -1233 +1233 @@
                 
               // Add them in the same way:
-              for( j = 1; j <= (D + Delta); j = j + d ) // For every degree (j*d) of T, do:
+              for( j = 1; j <= (D + @Delta); j = j + d ) // For every degree (j*d) of T, do:
                 {            
-                  for( l = j; (l + d) <= (D + Delta); l++ )
+                  for( l = j; (l + d) <= (D + @Delta); l++ )
                     {
                       if( (l + d) > D ) // Only new should be updated!
@@ -1259 +1259 @@
           setring NCRING;
 
+/*
+    if(toprint())
+    {
+      typeof(@Delta); @Delta; 
+      typeof(D); D; 
+    };
+*/    
           // And set new Bound
-          D = D + Delta;
+          D = D + @Delta;
         }
                 
@@ -1421 +1428 @@
   while( size(q) > 0 )
     {
-      d = maxdeg(p);
+      d = maxdegInt(p); /// ### /// 
         
       if( (0 < d) and (d <= N) )
@@ -1482 +1489 @@
 }
 
+
+/******************************************************/
+static proc mindegInt( ideal I )
+{    
+  /*4DEBUG*/    if( defined( @@@DEBUG ) ){ BCall( "mindegInt", I ); }; /*4DEBUG*/
+
+  intmat D = mindeg(I);
+    
+  int min = D[1, 1]; int m;
+    
+  for( int c = 2; c <= ncols(D); c++ )
+    {
+      m = D[1, c];
+        
+      if( m < min )
+        {
+          min = m;
+        }
+    }
+    
+  /*4DEBUG*/    if( defined( @@@DEBUG ) ){ ECall( "mindegInt", min ); }; /*4DEBUG*/
+
+  return( min );    
+}
+
 /******************************************************/
 proc sa_reduce( ideal V ) // 'subalgebra basis' computation
@@ -1540 +1572 @@
       FLM[1] = 0; // ...and kill it from FLM
         
-      d = maxdeg( p );
+      d = maxdegInt( p );
       T = ideal(p); 
         
@@ -1652 +1684 @@
       FLM[1] = 0; // ...and kill it from FLM
         
-      d = maxdeg(q);
+      d = maxdegInt(q);
       T = ideal(q);