Changeset 6f84e21 in git

Timestamp:

Mar 19, 2012, 6:56:53 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1090a989f7d101fde20b92a6a0a5544ba05b8f9b

Parents:

6725bc35b7238be24cfd7a910c9493d9a59d5a91

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-19 18:56:53+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-19 19:03:54+01:00

Message:

fix: "? wrong type declaration. type 'help poly;'" was due to making 'denominator' & 'numerator' - reserved words (kernel functions)

Location:

Singular/LIB

Files:

• multigrading.lib (modified) (5 diffs)
• reesclos.lib (modified) (2 diffs)

Singular/LIB/multigrading.lib

@@ -3828 +3828 @@
   // this uniqueness if switching to this torsion ring.
 
-  poly monom, summand, numerator;
-  poly denominator = 1;
+  poly monom, summand, @numerator;
+  poly @denominator = 1;
 
   for( i = 1; i <= cc; i++)
@@ -3853 +3853 @@
     }
 
-    denominator = denominator * (1 - monom);
+    @denominator = @denominator * (1 - monom);
   }
 
@@ -3878 +3878 @@
       summand = summand + monom;
     }
-    numerator = numerator - (-1)^j * summand;
-  }
-
-  if( denominator == 0 )
+    @numerator = @numerator - (-1)^j * summand;
+  }
+
+  if( @denominator == 0 )
   {
     ERROR("Multigrading not positive.");
   }
 
-  poly denominator1 = denominator;
-  poly numerator1 = numerator;
+  poly denominator1 = @denominator;
+  poly numerator1 = @numerator;
 
   export denominator1;
@@ -3894 +3894 @@
   if( numerator != 0 )
   {
-    poly d = gcd(denominator, numerator);
-
-    poly denominator2 = denominator/d;
-    poly numerator2 = numerator/d;
+    poly d = gcd(@denominator, @numerator);
+
+    poly denominator2 = @denominator/d;
+    poly numerator2 = @numerator/d;
 
     if( gcd(denominator2, numerator2) != 1 )
@@ -3906 +3906 @@
   else
   {
-    poly denominator2 = denominator;
-    poly numerator2 = numerator;
+    poly denominator2 = @denominator;
+    poly numerator2 = @numerator;
   }
 

Singular/LIB/reesclos.lib

@@ -406 +406 @@
   int length = size(images)-1;             // the number of generators
   poly image;
-  poly denominator = images[length+1];     // the universal denominator
+  poly @denominator = images[length+1];     // the universal denominator
 
   if (size(#)>0)
@@ -429 +429 @@
   for (j=1;j<=length;j++)
   {
-    images[j] = (images[j]/denominator); // construct the fraction
+    images[j] = (images[j]/@denominator); // construct the fraction
     image = images[j];
     if (dblvl>0)