Changeset 7c7a10 in git

Timestamp:

Jul 30, 2021, 3:35:38 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

dd0db24b6d16696e253c280d1a996df58bc2b913

Parents:

3dc7255cfd125ae424504c25faad42e6b405bbd4

Message:

chg: size(ringlist(..)..) -> nvars/npars/ring_list(..)

Location:

Singular/LIB

Files:

• bimodules.lib (modified) (2 diffs)
• curveInv.lib (modified) (1 diff)
• difform.lib (modified) (9 diffs)
• graal.lib (modified) (1 diff)
• grobcov.lib (modified) (2 diffs)
• hodge.lib (modified) (1 diff)
• ncfactor.lib (modified) (2 diffs)
• nets.lib (modified) (2 diffs)
• polybori.lib (modified) (1 diff)
• sets.lib (modified) (1 diff)
• sing.lib (modified) (3 diffs)

Singular/LIB/bimodules.lib

@@ -88 +88 @@
   setring save;
   list L = ringlist(save);
-  if (size(ringlist(save)) > 4)
+  if (size(ring_list(save)) > 4)
   {
     L = delete(L,6);
@@ -156 +156 @@
   setring save;
   list L = ringlist(save);
-  if (size(ringlist(save)) > 4)
+  if (size(ring_list(save)) > 4)
   {L = delete(L,6);L = delete(L,5);}
   def Scom = ring(L);

Singular/LIB/curveInv.lib

@@ -443 +443 @@
     // Adjust the generators of Der_P to the new variables T(1),...,T(k),x(1),...,x(n)
     // if there are new variables - check number of blocks
-    if(size(ringlist(basering)[3]) >= 3){
-        k = size(ringlist(basering)[3][1][2]);
+    if(size(ring_list(basering)[3]) >= 3){
+        k = size(ring_list(basering)[3][1][2]);
         Der_P = curveAdjustModule(Der_P,k);
     }

Singular/LIB/difform.lib

@@ -342 +342 @@
 {
 
-    int n = size(ringlist(basering)[2]) div 2;
+    int n = nvars(basering) div 2;
     int k = size(I);
     int i,j;
@@ -386 +386 @@
 
     int n = size(#);
-    int k = size(ringlist(basering)[2]) div 2;
+    int k = nvars(basering) div 2;
     int i;
     string gen_ord = "";
@@ -526 +526 @@
 EXAMPLE:    example diffAlgebraListGen; shows an example"
 {
-    int n = size(ringlist(basering)[2]);
+    int n = nvars(basering);
     int i,k,j;
     int degr = -1;
@@ -704 +704 @@
 
     poly f = df.form;
-    int n = size(ringlist(basering)[2]) div 2;
+    int n = nvars(basering) div 2;
     int i;
 
@@ -1423 +1423 @@
 
     // Degree of a difform is the degree of the poly with weights 0 for the basering variables
-    int n = size(ringlist(Omega_R)[2]) div 2;
+    int n = nvars(Omega_R) div 2;
     int i;
     intvec var_weights;
@@ -1472 +1472 @@
     setring Omega_R;
 
-    int n = size(ringlist(Omega_R)[2]) div 2;
+    int n = nvars(Omega_R) div 2;
     int i;
     intvec var_weights;
@@ -1573 +1573 @@
 {
     // Highest degree is the nr. of variables in the basering
-    int n = size(ringlist(basering)[2]);
+    int n = nvars(basering);
     int i,j,k;
     difform current_gen;
@@ -1886 +1886 @@
     difform df = 0;
     difform d_var;
-    int n = size(ringlist(basering)[2]);
+    int n = nvars(basering);
     int i;
 
@@ -2069 +2069 @@
 
     // Need an image for any generator
-    if(n != size(ringlist(basering)[2]))
+    if(n != nvars(basering))
     {
         ERROR("Given list has wrong size!");

Singular/LIB/graal.lib

@@ -105 +105 @@
   if (L[3][1][1]!="c")
   {
-    return(size(ringlist(basering)[3][1][2]));
+    return(size(ring_list(basering)[3][1][2]));
   }
   else
   {
-    return(size(ringlist(basering)[3][2][2]));
+    return(size(ring_list(basering)[3][2][2]));
   }
 }

Singular/LIB/grobcov.lib

@@ -5773 +5773 @@
   //Options
   list DD=#;
-  int nax=size(ringlist(RR)[1][2]);              // number of parameters + tracer variables
+  int nax=npars(RR);              // number of parameters + tracer variables
   int nuv=nvars(RR);                                 // number of variables
   int na=0; int nx=nax;
@@ -6411 +6411 @@
   int nv=nvars(RR);
   for(i=1;i<=nv;i++){vmov[size(vmov)+1]=var(i);}
-//  int numpars=size(ringlist(RR)[1][2]);
+//  int numpars=npars(RR);
 //  int version=0;
 //  if(nv<4){version=1;}

Singular/LIB/hodge.lib

@@ -62 +62 @@
   if (p < 0) { ERROR("Level p must be non-negative."); }
   // The base ring must be non-commutative.
-  if (size(ringlist(basering)) > 4) { ERROR("Base ring must be commutative."); }
+  if (size(ring_list(basering)) > 4) { ERROR("Base ring must be commutative."); }
 
   // Default engine & option.

Singular/LIB/ncfactor.lib

@@ -3479 +3479 @@
   def r = basering;
   list factorizeOutput;
-  if (size(ringlist(basering))<=4 && (attrib(r, "isLetterplaceRing") == 0) )
+  if (size(ring_list(basering))<=4 && (attrib(r, "isLetterplaceRing") == 0) )
   {//commutative ring case
     dbprint(p,dbprintWhitespace + "We are in a commutative ring. Factoring h using factorize.");
@@ -9560 +9560 @@
   {dbprintWhitespace = dbprintWhitespace + " ";}
   dbprint(p,dbprintWhitespace+"Checking if given ring is commutative.");
-  if (size(ringlist(basering))<=4)
+  if (size(ring_list(basering))<=4)
   {//basering was commutative
     return(0);

Singular/LIB/nets.lib

@@ -471 +471 @@
   Target=string(nameof(basering));
   Output[1]="Map"+": "+Source+" --> "+Target;
-  v=size(ringlist(preimage(f))[2]);
+  v=nvars(preimage(f));
   empty=size(Output[1]);
   Output[1]=Output[1]+" , "+string(ringlist(preimage(f))[2][1])+" -> "+string(f[1]);
@@ -521 +521 @@
   Target=string(nameof(basering));
   Output[1]=Map+": "+Source+" --> "+Target;
-  v=size(ringlist(preimage(f))[2]);
+  v=nvars(preimage(f));
   empty=size(Output[1]);
   Output[1]=Output[1]+" , "+string(ringlist(preimage(f))[2][1])+" -> "+string(f[1]);

Singular/LIB/polybori.lib

@@ -351 +351 @@
   int i;
   int counter=0;
-  for (i=1; i<=size(ringlist(r)[3]); i++)
+  for (i=1; i<=size(ring_list(r)[3]); i++)
   {
     if (rl[3][i][1]<>"C")

Singular/LIB/sets.lib

@@ -113 +113 @@
     return(0);
   }
-  for(int i=1;i<=size(ringlist(preimage(a))[2]);i++){        //check if the two maps are the same
+  for(int i=1;i<=size(ring_list(preimage(a))[2]);i++){        //check if the two maps are the same
         if(a[i]!=b[i]){                                        //in every component
                 return(0);

Singular/LIB/sing.lib

@@ -589 +589 @@
 {
    def RR=basering;
-   list RRL=ringlist(RR);
+   list RRL=ring_list(RR);
    if(RRL[4]!=0)
    {
@@ -693 +693 @@
 {
    def RR=basering;
-   list RRL=ringlist(RR);
+   list RRL=ring_list(RR);
    if(RRL[4]!=0)
    {
@@ -791 +791 @@
 {
    def RR=basering;
-   list RRL=ringlist(RR);
+   list RRL=ring_list(RR);
    if(RRL[4]!=0)
    {