diff options
| author | wukong <wukong@longaeva> | 2019-04-13 13:04:26 -0700 |
|---|---|---|
| committer | wukong <wukong@longaeva> | 2019-04-13 13:04:26 -0700 |
| commit | 0e225c6d140a5a4986d0771aefb8a8edbe5d435d (patch) | |
| tree | 78d197f2e6c972e9483c95ee1154bee2b76d15c4 /lin_reg.awk | |
| parent | 187ab8368c39a3fd459d5715c91a71104413299a (diff) | |
optimized covariance script;
added 'nan' output to diff;
added ':' output delimiter to lin_reg and quad_reg;
fixed broken r^2 calc in quad_reg;
Diffstat (limited to '')
| -rw-r--r-- | lin_reg.awk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lin_reg.awk b/lin_reg.awk index aeb5dfc..52e55d3 100644 --- a/lin_reg.awk +++ b/lin_reg.awk @@ -4,6 +4,7 @@ # simple linear regression between columns BEGIN { + OFS = ":" sign = "[+-]?" decimal = "[0-9]+[.]?[0-9]*" fraction = "[.][0-9]*" @@ -91,15 +92,15 @@ END { for (y=1; y<=nf_max; y++) { for (x=1; x<=nf_max; x++) { if (x != y && r[x,y]) { - printf(OFMT OFS "(%s)" OFS " = (" OFMT " +/- " OFMT ")(%s)" OFS " + (" OFMT " +/- " OFMT ")", + printf(OFMT OFS "(%s)" OFS " = (" OFMT " +/- " OFMT ")(%s) + (" OFMT " +/- " OFMT ")" OFS, (r[x,y]*r[x,y]), header[y], b[x,y], b_err[x,y], header[x], a[x,y], a_err[x,y]) - printf(" [" OFMT "," OFMT "][" OFMT "," OFMT "] [" OFMT "," OFMT "]", + printf("[" OFMT "," OFMT "][" OFMT "," OFMT "]" OFS "[" OFMT "," OFMT "]" OFS, 0, a[x,y], (-1.0*a[x,y]/b[x,y]), 0, mean[x], b[x,y]*(mean[x]) + a[x,y]) - printf(" [" OFMT "," OFMT "]", xw[x,y], yw[x,y]) - printf(" [" OFMT "]" ORS, sqrt(xw_dist[x,y]*xw_dist[x,y] + yw_dist[x,y]*yw_dist[x,y])) + printf("[" OFMT "," OFMT "]" OFS, xw[x,y], yw[x,y]) + printf("[" OFMT "]" ORS, sqrt(xw_dist[x,y]*xw_dist[x,y] + yw_dist[x,y]*yw_dist[x,y])) } } } |