diff options
Diffstat (limited to 'gp-scripts')
-rw-r--r-- | gp-scripts/firstPrice | 1 | ||||
-rw-r--r-- | gp-scripts/m+1stPrice | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/gp-scripts/firstPrice b/gp-scripts/firstPrice index 2600e6e..c638f4a 100644 --- a/gp-scripts/firstPrice +++ b/gp-scripts/firstPrice | |||
@@ -89,7 +89,6 @@ Phi = vector(n,a,matrix(n,k,i,j, prod(h=1,n,Delta[h][i,j])^x[a] )) | |||
89 | 89 | ||
90 | \\ winner matrix | 90 | \\ winner matrix |
91 | v = matrix(n,k,a,j, prod(i=1,n,Gamma[i][a,j]) / prod(i=1,n,Phi[i][a,j]) ) | 91 | v = matrix(n,k,a,j, prod(i=1,n,Gamma[i][a,j]) / prod(i=1,n,Phi[i][a,j]) ) |
92 | |||
93 | vi = lift(v) | 92 | vi = lift(v) |
94 | 93 | ||
95 | print("bids are: ", bid) | 94 | print("bids are: ", bid) |
diff --git a/gp-scripts/m+1stPrice b/gp-scripts/m+1stPrice index a6ac17c..b58648a 100644 --- a/gp-scripts/m+1stPrice +++ b/gp-scripts/m+1stPrice | |||
@@ -66,8 +66,8 @@ beta = matrix(n,k,i,j, g^r[i,j]) | |||
66 | \\ multiplicative shares | 66 | \\ multiplicative shares |
67 | \\ first index level = owning agent id (multiplicative share) | 67 | \\ first index level = owning agent id (multiplicative share) |
68 | \\ second index level = agent id, price id | 68 | \\ second index level = agent id, price id |
69 | 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]) )) | 69 | 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]) )) |
70 | 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]) )) | 70 | 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]) )) |
71 | 71 | ||
72 | \\\\\\\\\\\\ | 72 | \\\\\\\\\\\\ |
73 | \\ ROUND3 | 73 | \\ ROUND3 |