Changeset ddc193 in git

Timestamp:

Jul 6, 2015, 9:45:41 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

63d1994c5890bc99de5206f4dd3d39b2cda38a4f

Parents:

105eb273abbf2ab214f10f04627af4902c750d87988b95c72fc990b11e9eec2eac106b9b5e6e422c

Message:

Merge pull request #719 from surface-smoothers/fix.zz.warning.primdec

change for zz is number warning

Location:

Singular/LIB

Files:

• crypto.lib (modified) (2 diffs)
• primdec.lib (modified) (8 diffs)

Singular/LIB/crypto.lib

@@ -69 +69 @@
   merkle_hellman_transformation(list knapsack, int key, int mod1                generates a hard knapsack for the  Merkle-Hellman Kryptosystem for a given easy knapsack , a multiplicator key and a modulus mod1
   merkle_hellman_encryption(list knapsack, list message)                    encrypts a message with the Merkle-Hellman Kryptosystem, using a hard knapsack and a message encoded as binary list
-  merkle_hellman_decryption(list knapsack, int key, int mod1, int message)          decrypts a message with the multiplicative Merkle-Hellman Kryptosystem, using the hard knapsack, the key, the modulus mod1 and the message encoded as integer   
+  merkle_hellman_decryption(list knapsack, int key, int mod1, int message)          decrypts a message with the multiplicative Merkle-Hellman Kryptosystem, using the hard knapsack, the key, the modulus mod1 and the message encoded as integer
   super_increasing_knapsack(int ksize)                            Creates the smallest super-increasing knapsack of given size ksize
   h_increasing_knapsack(int ksize, int h)                            Creates the smallest h-increasing knapsack of given size ksize and h
@@ -1272 +1272 @@
    if((k mod 2)==0)
    {
-      resu=ellipticMult(N,a,b,P,k/2);
+      resu=ellipticMult(N,a,b,P,k div 2);
       return(ellipticAdd(N,a,b,resu,resu));
    }

Singular/LIB/primdec.lib

@@ -874 +874 @@
   int uytrewq;
   int nva = nvars(basering);
-  int @k,@s,@n,@k1,zz;
+  int @k,@s,@n,@k1,@zz;
   list primary,lres0,lres1,act,@lh,@wh;
   map phi,psi,phi1,psi1;
@@ -1055 +1055 @@
   {
     poly randp;
-    for(zz=1;zz<nvars(basering);zz++)
+    for(@zz=1;@zz<nvars(basering);@zz++)
     {
       randp=randp
-              +(random(0,5)*par(1)^2+random(0,5)*par(1)+random(0,5))*var(zz);
+              +(random(0,5)*par(1)^2+random(0,5)*par(1)+random(0,5))*var(@zz);
     }
     randp=randp+var(nvars(basering));
@@ -1068 +1068 @@
     if (size(primary[2*@k])==0)
     {
-      for(zz=1;zz<size(primary[2*@k-1])-1;zz++)
+      for(@zz=1;@zz<size(primary[2*@k-1])-1;@zz++)
       {
         attrib(primary[2*@k-1],"isSB",1);
-        if(vdim(primary[2*@k-1])==deg(primary[2*@k-1][zz]))
+        if(vdim(primary[2*@k-1])==deg(primary[2*@k-1][@zz]))
         {
           primary[2*@k]=primary[2*@k-1];
@@ -1099 +1099 @@
         if(deg(lead(primary[2*@k-1][@n]))==1)
         {
-          for(zz=1;zz<=nva;zz++)
+          for(@zz=1;@zz<=nva;@zz++)
           {
-            if(lead(primary[2*@k-1][@n])/var(zz)!=0)
+            if(lead(primary[2*@k-1][@n])/var(@zz)!=0)
             {
-              jmap1[zz]=-1/leadcoef(primary[2*@k-1][@n])*primary[2*@k-1][@n]
+              jmap1[@zz]=-1/leadcoef(primary[2*@k-1][@n])*primary[2*@k-1][@n]
                    +2/leadcoef(primary[2*@k-1][@n])*lead(primary[2*@k-1][@n]);
-              jmap2[zz]=primary[2*@k-1][@n];
-              @qht[@n]=var(zz);
+              jmap2[@zz]=primary[2*@k-1][@n];
+              @qht[@n]=var(@zz);
             }
           }
@@ -9023 +9023 @@
   int uytrewq;
   int nva = nvars(basering);
-  int @k,@s,@n,@k1,zz;
+  int @k,@s,@n,@k1,@zz;
   list primary,lres0,lres1,act,@lh,@wh;
   map phi,psi,phi1,psi1;
@@ -9206 +9206 @@
   {
     poly randp;
-    for(zz=1;zz<nvars(basering);zz++)
+    for(@zz=1;@zz<nvars(basering);@zz++)
     {
       randp=randp
-              +(random(0,5)*par(1)^2+random(0,5)*par(1)+random(0,5))*var(zz);
+              +(random(0,5)*par(1)^2+random(0,5)*par(1)+random(0,5))*var(@zz);
     }
     randp=randp+var(nvars(basering));
@@ -9219 +9219 @@
     if (size(primary[2*@k])==0)
     {
-      for(zz=1;zz<size(primary[2*@k-1])-1;zz++)
+      for(@zz=1;@zz<size(primary[2*@k-1])-1;@zz++)
       {
         attrib(primary[2*@k-1],"isSB",1);
-        if(vdim(primary[2*@k-1])==deg(primary[2*@k-1][zz]))
+        if(vdim(primary[2*@k-1])==deg(primary[2*@k-1][@zz]))
         {
           primary[2*@k]=primary[2*@k-1];
@@ -9250 +9250 @@
         if(deg(lead(primary[2*@k-1][@n]))==1)
         {
-          for(zz=1;zz<=nva;zz++)
+          for(@zz=1;@zz<=nva;@zz++)
           {
-            if(lead(primary[2*@k-1][@n])/var(zz)!=0)
+            if(lead(primary[2*@k-1][@n])/var(@zz)!=0)
             {
-              jmap1[zz]=-1/leadcoef(primary[2*@k-1][@n])*primary[2*@k-1][@n]
+              jmap1[@zz]=-1/leadcoef(primary[2*@k-1][@n])*primary[2*@k-1][@n]
                    +2/leadcoef(primary[2*@k-1][@n])*lead(primary[2*@k-1][@n]);
-              jmap2[zz]=primary[2*@k-1][@n];
-              @qht[@n]=var(zz);
+              jmap2[@zz]=primary[2*@k-1][@n];
+              @qht[@n]=var(@zz);
             }
           }