Changeset 2473c9 in git

Timestamp:

Apr 3, 2019, 12:39:17 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

56ffd981992fd934df3847d95789268d842efbcc

Parents:

a74fa8837632268cfdb724eabc42506f5e99818e

Message:

fix: shadowing variables (k:int/poly, i:int/number, n:int/number) in realclassify.lib

File:

• Singular/LIB/realclassify.lib (modified) (5 diffs)

Singular/LIB/realclassify.lib

@@ -1333 +1333 @@
   ring R = 0,x,dp;
   poly k = fetch(br,k);
-  int n = nrroots(k);
+  int nn = nrroots(k);
   kill R;
   setring br;
-  if(n==1)
+  if(nn==1)
   {
     typeofsing1 = "J[10]+";
@@ -1364 +1364 @@
     }
     if(deg(MP)==1)
-      {
-        number a = -number(subst(MP,var(1),0));
-        setring br1;
-        number a = fetch(br,a);
-      }
-      else
-      {
-        string mord = ringlist(br1)[3][1][1];
-        ring R1 = (0,a),(var(1),var(2)),ds;
-        list L1 = ringlist(R1);
-        L1[3][1][1]=mord;
-        def R2 = ring(L1);
-        setring R2;
-        kill R1;
-        poly ff = fetch(br,MP);
-        minpoly = number(subst(ff,var(1),a));
-      }
-      Poly nfe1 = var(1)^3+a*var(1)^2*var(2)^2+var(1)*var(2)^4;
-      number n1 = fetch(br,n1);
-      number n2 = fetch(br,n2);
-      interval1 = list(n1,n2);
-      NormalFormEquation F1;
-      F1.normalFormEquation = nfe1;
-      F1.parameters = list(list(a*var(1)^2*var(2)^2,interval1));
-      F1.singularityType = typeofsing1;
-      setring br;
-      return(F1)
+    {
+      number a = -number(subst(MP,var(1),0));
+      setring br1;
+      number a = fetch(br,a);
+    }
+    else
+    {
+      string mord = ringlist(br1)[3][1][1];
+      ring R1 = (0,a),(var(1),var(2)),ds;
+      list L1 = ringlist(R1);
+      L1[3][1][1]=mord;
+      def R2 = ring(L1);
+      setring R2;
+      kill R1;
+      poly ff = fetch(br,MP);
+      minpoly = number(subst(ff,var(1),a));
+    }
+    Poly nfe1 = var(1)^3+a*var(1)^2*var(2)^2+var(1)*var(2)^4;
+    number n1 = fetch(br,n1);
+    number n2 = fetch(br,n2);
+    interval1 = list(n1,n2);
+    NormalFormEquation F1;
+    F1.normalFormEquation = nfe1;
+    F1.parameters = list(list(a*var(1)^2*var(2)^2,interval1));
+    F1.singularityType = typeofsing1;
+    setring br;
+    return(F1);
   }
   else
@@ -1462 +1462 @@
       kill r;
       kill j;
-      int k = size(r1);
+      int kk = size(r1);
       setring R1;
       list r2;
-      for(int i=1; i<=k;i++)
+      for(int ii=1; ii<=kk;ii++)
       {
          number m;
-         m=number(r1[i])/(10^(epsilon));
+         m=number(r1[ii])/(10^(epsilon));
          r2 = insert(r2,m);
          kill m;
       }
-      kill i;
+      kill ii;
       list L1 = ringlist(br1);
       number t = (number(epsilon))^(-1);
@@ -1504 +1504 @@
         kill r;
         kill j;
-        k = size(r1);
         setring R1;
+        kk = size(r1);
         list r2;
-        for(int i=1; i<=k;i++)
+        for(int ii=1; ii<=kk;ii++)
         {
            number m;
-           m=number(r1[i])/(10^(epsilon));
+           m=number(r1[ii])/(10^(epsilon));
            r2 = insert(r2,m);
            kill m;
         }
-        kill i;
+        kill ii;
         number t = (number(epsilon))^(-1);
         number n1 = sturm(pplus,r2[1]-t,r2[1]+t);
@@ -1524 +1524 @@
       kill R1;
       list r2;
-      for(int i=1; i<=k;i++)
+      kk = size(r1);
+      for(int ii=1; ii<=kk;ii++)
       {
          number m;
-         m=number(r1[i])/(10^(epsilon));
+         m=number(r1[ii])/(10^(epsilon));
          r2 = insert(r2,m);
          kill m;
       }
-      kill i;
+      kill ii;
       number t = (number(epsilon))^(-1);
       typeofsing1 = "J[10]-";