diff options
| author | Markus Teich <markus.teich@stusta.mhn.de> | 2016-10-08 16:58:25 +0200 |
|---|---|---|
| committer | Markus Teich <markus.teich@stusta.mhn.de> | 2016-10-08 16:58:25 +0200 |
| commit | 233f9559280015c6c260ab10fd61750cd599fce5 (patch) | |
| tree | 15ec78c0aad0c902b21cde3c16480f8ab0b58674 /gp-scripts | |
| parent | 3940092e24ca895c2771c92f5775b1f44c5f927e (diff) | |
gp script formatting
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] )) \\ winner matrix 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) 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]) \\ multiplicative shares \\ first index level = owning agent id (multiplicative share) \\ 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]) )) -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]) )) +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]) )) \\\\\\\\\\\\ \\ ROUND3 |