gp script formatting

This commit is contained in:
Markus Teich 2016-10-08 16:58:25 +02:00
parent 3940092e24
commit 233f955928
2 changed files with 2 additions and 3 deletions

View File

@ -89,7 +89,6 @@ Phi = vector(n,a,matrix(n,k,i,j, prod(h=1,n,Delta[h][i,j])^x[a] ))
\\ winner matrix \\ winner matrix
v = matrix(n,k,a,j, prod(i=1,n,Gamma[i][a,j]) / prod(i=1,n,Phi[i][a,j]) ) v = matrix(n,k,a,j, prod(i=1,n,Gamma[i][a,j]) / prod(i=1,n,Phi[i][a,j]) )
vi = lift(v) vi = lift(v)
print("bids are: ", bid) print("bids are: ", bid)

View File

@ -66,8 +66,8 @@ beta = matrix(n,k,i,j, g^r[i,j])
\\ multiplicative shares \\ multiplicative shares
\\ first index level = owning agent id (multiplicative share) \\ first index level = owning agent id (multiplicative share)
\\ second index level = agent id, price id \\ second index level = agent id, price id
Gamma = vector(n,a,matrix(n,k,i,j, ( prod(h=1,n,prod(d=j,k,alpha[h,d])*prod(d=j+1,k,alpha[h,d])) * prod(d=1,j,alpha[i,d])^(2*M+2) / g^(2*M+1) )^(m[a][i,j]) )) Gamma = vector(n,a,matrix(n,k,i,j, ( prod(h=1,n,prod(d=j,k,alpha[h,d]) * prod(d=j+1,k,alpha[h,d])) * prod(d=1,j,alpha[i,d])^(2*M+2) / g^(2*M+1) )^(m[a][i,j]) ))
Delta = vector(n,a,matrix(n,k,i,j, ( prod(h=1,n,prod(d=j,k, beta[h,d])*prod(d=j+1,k, beta[h,d])) * prod(d=1,j, beta[i,d])^(2*M+2) )^(m[a][i,j]) )) Delta = vector(n,a,matrix(n,k,i,j, ( prod(h=1,n,prod(d=j,k, beta[h,d]) * prod(d=j+1,k, beta[h,d])) * prod(d=1,j, beta[i,d])^(2*M+2) )^(m[a][i,j]) ))
\\\\\\\\\\\\ \\\\\\\\\\\\
\\ ROUND3 \\ ROUND3