Changeset ddc193 in git


Ignore:
Timestamp:
Jul 6, 2015, 9:45:41 AM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '3720ae8bfcff4a4649ee98a15552089151d2d59b')
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:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/crypto.lib

    r988b95c rddc193  
    6969  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
    7070  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
    71   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   
     71  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
    7272  super_increasing_knapsack(int ksize)                            Creates the smallest super-increasing knapsack of given size ksize
    7373  h_increasing_knapsack(int ksize, int h)                            Creates the smallest h-increasing knapsack of given size ksize and h
     
    12721272   if((k mod 2)==0)
    12731273   {
    1274       resu=ellipticMult(N,a,b,P,k/2);
     1274      resu=ellipticMult(N,a,b,P,k div 2);
    12751275      return(ellipticAdd(N,a,b,resu,resu));
    12761276   }
  • Singular/LIB/primdec.lib

    r105eb27 rddc193  
    874874  int uytrewq;
    875875  int nva = nvars(basering);
    876   int @k,@s,@n,@k1,zz;
     876  int @k,@s,@n,@k1,@zz;
    877877  list primary,lres0,lres1,act,@lh,@wh;
    878878  map phi,psi,phi1,psi1;
     
    10551055  {
    10561056    poly randp;
    1057     for(zz=1;zz<nvars(basering);zz++)
     1057    for(@zz=1;@zz<nvars(basering);@zz++)
    10581058    {
    10591059      randp=randp
    1060               +(random(0,5)*par(1)^2+random(0,5)*par(1)+random(0,5))*var(zz);
     1060              +(random(0,5)*par(1)^2+random(0,5)*par(1)+random(0,5))*var(@zz);
    10611061    }
    10621062    randp=randp+var(nvars(basering));
     
    10681068    if (size(primary[2*@k])==0)
    10691069    {
    1070       for(zz=1;zz<size(primary[2*@k-1])-1;zz++)
     1070      for(@zz=1;@zz<size(primary[2*@k-1])-1;@zz++)
    10711071      {
    10721072        attrib(primary[2*@k-1],"isSB",1);
    1073         if(vdim(primary[2*@k-1])==deg(primary[2*@k-1][zz]))
     1073        if(vdim(primary[2*@k-1])==deg(primary[2*@k-1][@zz]))
    10741074        {
    10751075          primary[2*@k]=primary[2*@k-1];
     
    10991099        if(deg(lead(primary[2*@k-1][@n]))==1)
    11001100        {
    1101           for(zz=1;zz<=nva;zz++)
     1101          for(@zz=1;@zz<=nva;@zz++)
    11021102          {
    1103             if(lead(primary[2*@k-1][@n])/var(zz)!=0)
     1103            if(lead(primary[2*@k-1][@n])/var(@zz)!=0)
    11041104            {
    1105               jmap1[zz]=-1/leadcoef(primary[2*@k-1][@n])*primary[2*@k-1][@n]
     1105              jmap1[@zz]=-1/leadcoef(primary[2*@k-1][@n])*primary[2*@k-1][@n]
    11061106                   +2/leadcoef(primary[2*@k-1][@n])*lead(primary[2*@k-1][@n]);
    1107               jmap2[zz]=primary[2*@k-1][@n];
    1108               @qht[@n]=var(zz);
     1107              jmap2[@zz]=primary[2*@k-1][@n];
     1108              @qht[@n]=var(@zz);
    11091109            }
    11101110          }
     
    90239023  int uytrewq;
    90249024  int nva = nvars(basering);
    9025   int @k,@s,@n,@k1,zz;
     9025  int @k,@s,@n,@k1,@zz;
    90269026  list primary,lres0,lres1,act,@lh,@wh;
    90279027  map phi,psi,phi1,psi1;
     
    92069206  {
    92079207    poly randp;
    9208     for(zz=1;zz<nvars(basering);zz++)
     9208    for(@zz=1;@zz<nvars(basering);@zz++)
    92099209    {
    92109210      randp=randp
    9211               +(random(0,5)*par(1)^2+random(0,5)*par(1)+random(0,5))*var(zz);
     9211              +(random(0,5)*par(1)^2+random(0,5)*par(1)+random(0,5))*var(@zz);
    92129212    }
    92139213    randp=randp+var(nvars(basering));
     
    92199219    if (size(primary[2*@k])==0)
    92209220    {
    9221       for(zz=1;zz<size(primary[2*@k-1])-1;zz++)
     9221      for(@zz=1;@zz<size(primary[2*@k-1])-1;@zz++)
    92229222      {
    92239223        attrib(primary[2*@k-1],"isSB",1);
    9224         if(vdim(primary[2*@k-1])==deg(primary[2*@k-1][zz]))
     9224        if(vdim(primary[2*@k-1])==deg(primary[2*@k-1][@zz]))
    92259225        {
    92269226          primary[2*@k]=primary[2*@k-1];
     
    92509250        if(deg(lead(primary[2*@k-1][@n]))==1)
    92519251        {
    9252           for(zz=1;zz<=nva;zz++)
     9252          for(@zz=1;@zz<=nva;@zz++)
    92539253          {
    9254             if(lead(primary[2*@k-1][@n])/var(zz)!=0)
     9254            if(lead(primary[2*@k-1][@n])/var(@zz)!=0)
    92559255            {
    9256               jmap1[zz]=-1/leadcoef(primary[2*@k-1][@n])*primary[2*@k-1][@n]
     9256              jmap1[@zz]=-1/leadcoef(primary[2*@k-1][@n])*primary[2*@k-1][@n]
    92579257                   +2/leadcoef(primary[2*@k-1][@n])*lead(primary[2*@k-1][@n]);
    9258               jmap2[zz]=primary[2*@k-1][@n];
    9259               @qht[@n]=var(zz);
     9258              jmap2[@zz]=primary[2*@k-1][@n];
     9259              @qht[@n]=var(@zz);
    92609260            }
    92619261          }
Note: See TracChangeset for help on using the changeset viewer.