# HG changeset patch # User Steve Losh # Date 1584482838 14400 # Node ID fd4566bbfa9f4fe7a2a7f5e1c0dbc94e5d7a4a64 # Parent 638fb374ef6e99aa4906140194abefae0c729562# Parent a5781ceaf296bef0ab54c1f2b329cbbb5a2c4be0 Merge. diff -r a5781ceaf296 -r fd4566bbfa9f gnuplot --- a/gnuplot Tue Mar 17 11:28:35 2020 -0700 +++ b/gnuplot Tue Mar 17 18:07:18 2020 -0400 @@ -9,11 +9,12 @@ set grid -set pointintervalbox 1.25 +set pointintervalbox 1.3 clr = "call '~/src/dotfiles/gnuplot-scripts/color.gp'" bwp = "call '~/src/dotfiles/gnuplot-scripts/black-and-white-points.gp'" bwl = "call '~/src/dotfiles/gnuplot-scripts/black-and-white-lines.gp'" +bwlp = "call '~/src/dotfiles/gnuplot-scripts/black-and-white-lines-points.gp'" @clr # }}} @@ -30,6 +31,25 @@ max(a, b) = (a>b) ? a : b # }}} +# Linear Regression Fitting Functions ------------------------------------- {{{ + +baselrt(mm, bb, mprecision, bprecision) = sprintf(\ + sprintf("%%.%dfx + %%.%df", mprecision, bprecision), \ + mm, bb) + +lr(x) = m * x + b +lrt(mp, bp) = baselrt(m, b, mp, bp) + +lr2(x) = m2 * x + b2 +lrt2(mp, bp) = baselrt(m2, b2, mp, bp) + +lr3(x) = m3 * x + b3 +lrt3(mp, bp) = baselrt(m3, b3, mp, bp) + +lr4(x) = m4 * x + b4 +lrt4(mp, bp) = baselrt(m4, b4, mp, bp) + +# }}} # Exporting --------------------------------------------------------------- {{{ export(file, terminal) = sprintf( \ diff -r a5781ceaf296 -r fd4566bbfa9f gnuplot-scripts/black-and-white-lines-points.gp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnuplot-scripts/black-and-white-lines-points.gp Tue Mar 17 18:07:18 2020 -0400 @@ -0,0 +1,25 @@ +set palette defined (0 '#111111', 1 '#eeeeee') + +set linetype 1 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt solid +set linetype 2 linewidth 1.25 pointtype 1 ps 1.1 linecolor rgb 'black' pointinterval -1 dt '-' +set linetype 3 linewidth 1.25 pointtype 9 ps 1.3 linecolor rgb 'black' pointinterval -1 dt '.' +set linetype 4 linewidth 1.25 pointtype 6 ps 1.0 linecolor rgb 'black' pointinterval -1 dt (10, 5, 2, 5) +set linetype 5 linewidth 1.25 pointtype 10 ps 1.3 linecolor rgb 'black' pointinterval -1 dt (8, 7, 2, 7, 2, 7) +set linetype 6 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt solid +set linetype 7 linewidth 1.25 pointtype 1 ps 1.1 linecolor rgb 'black' pointinterval -1 dt '-' +set linetype 8 linewidth 1.25 pointtype 9 ps 1.3 linecolor rgb 'black' pointinterval -1 dt '.' +set linetype 9 linewidth 1.25 pointtype 6 ps 1.0 linecolor rgb 'black' pointinterval -1 dt (10, 5, 2, 5) +set linetype 10 linewidth 1.25 pointtype 10 ps 1.3 linecolor rgb 'black' pointinterval -1 dt (8, 7, 2, 7, 2, 7) + +unset linetype 11 +unset linetype 12 +unset linetype 13 +unset linetype 14 +unset linetype 15 +unset linetype 16 +unset linetype 17 +unset linetype 18 +unset linetype 19 +unset linetype 20 + +set linetype cycle 10 diff -r a5781ceaf296 -r fd4566bbfa9f gnuplot-scripts/black-and-white-lines.gp --- a/gnuplot-scripts/black-and-white-lines.gp Tue Mar 17 11:28:35 2020 -0700 +++ b/gnuplot-scripts/black-and-white-lines.gp Tue Mar 17 18:07:18 2020 -0400 @@ -1,15 +1,15 @@ set palette defined (0 '#111111', 1 '#eeeeee') -set linetype 1 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '' -set linetype 2 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '-' -set linetype 3 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '.' -set linetype 4 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt (10, 5, 2, 5) -set linetype 5 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt (8, 7, 2, 7, 2, 7) -set linetype 6 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '' -set linetype 7 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '-' -set linetype 8 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '.' -set linetype 9 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt (10, 5, 2, 5) -set linetype 10 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt (8, 7, 2, 7, 2, 7) +set linetype 1 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt solid +set linetype 2 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt '-' +set linetype 3 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt '.' +set linetype 4 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt (10, 5, 2, 5) +set linetype 5 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt (8, 7, 2, 7, 2, 7) +set linetype 6 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt solid +set linetype 7 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt '-' +set linetype 8 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt '.' +set linetype 9 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt (10, 5, 2, 5) +set linetype 10 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt (8, 7, 2, 7, 2, 7) unset linetype 11 unset linetype 12 @@ -22,4 +22,4 @@ unset linetype 19 unset linetype 20 - +set linetype cycle 10 diff -r a5781ceaf296 -r fd4566bbfa9f gnuplot-scripts/black-and-white-points.gp --- a/gnuplot-scripts/black-and-white-points.gp Tue Mar 17 11:28:35 2020 -0700 +++ b/gnuplot-scripts/black-and-white-points.gp Tue Mar 17 18:07:18 2020 -0400 @@ -1,15 +1,16 @@ set palette defined (0 '#111111', 1 '#eeeeee') -set linetype 1 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '' -set linetype 2 linewidth 1.25 pointtype 1 ps 1.1 linecolor rgb 'black' dt '' -set linetype 3 linewidth 1.25 pointtype 9 ps 1.3 linecolor rgb 'black' dt '' -set linetype 4 linewidth 1.25 pointtype 6 ps 1.0 linecolor rgb 'black' dt '' -set linetype 5 linewidth 1.25 pointtype 10 ps 1.3 linecolor rgb 'black' dt '' -set linetype 6 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '' -set linetype 7 linewidth 1.25 pointtype 1 ps 1.1 linecolor rgb 'black' dt '' -set linetype 8 linewidth 1.25 pointtype 9 ps 1.3 linecolor rgb 'black' dt '' -set linetype 9 linewidth 1.25 pointtype 6 ps 1.0 linecolor rgb 'black' dt '' -set linetype 10 linewidth 1.25 pointtype 10 ps 1.3 linecolor rgb 'black' dt '' +set linetype 1 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt solid pointinterval -1 +set linetype 2 linewidth 1.25 pointtype 1 ps 1.1 linecolor rgb 'black' dt solid pointinterval -1 +set linetype 3 linewidth 1.25 pointtype 6 ps 1.0 linecolor rgb 'black' dt solid pointinterval -1 +set linetype 4 linewidth 1.25 pointtype 8 ps 1.1 linecolor rgb 'black' dt solid pointinterval -1 +set linetype 5 linewidth 1.25 pointtype 4 ps 1.0 linecolor rgb 'black' dt solid pointinterval -1 + +set linetype 6 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt solid pointinterval -1 +set linetype 7 linewidth 1.25 pointtype 1 ps 1.1 linecolor rgb 'black' dt solid pointinterval -1 +set linetype 8 linewidth 1.25 pointtype 6 ps 1.0 linecolor rgb 'black' dt solid pointinterval -1 +set linetype 9 linewidth 1.25 pointtype 8 ps 1.1 linecolor rgb 'black' dt solid pointinterval -1 +set linetype 10 linewidth 1.25 pointtype 4 ps 1.0 linecolor rgb 'black' dt solid pointinterval -1 unset linetype 11 unset linetype 12 diff -r a5781ceaf296 -r fd4566bbfa9f gnuplot-scripts/color.gp --- a/gnuplot-scripts/color.gp Tue Mar 17 11:28:35 2020 -0700 +++ b/gnuplot-scripts/color.gp Tue Mar 17 18:07:18 2020 -0400 @@ -1,17 +1,16 @@ -set palette defined (0 '#fef0d9', 1 '#fdcc8a', 2 '#fc8d59', 3 '#d7301f') set palette defined (0 '#fef0d9', 1 '#d7301f', 2 '#fc8d59', 3 '#d7301f') -set linetype 1 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb '#1f78b4' -set linetype 2 linewidth 1.25 pointtype 1 ps 1.1 linecolor rgb '#33a02c' -set linetype 3 linewidth 1.25 pointtype 9 ps 1.2 linecolor rgb '#e31a1c' -set linetype 4 linewidth 1.25 pointtype 6 ps 1.0 linecolor rgb '#ff7f00' -set linetype 5 linewidth 1.25 pointtype 10 ps 1.2 linecolor rgb '#6a3d9a' +set linetype 1 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb '#1f78b4' pointinterval -1 dashtype solid +set linetype 2 linewidth 1.25 pointtype 1 ps 1.1 linecolor rgb '#33a02c' pointinterval -1 dashtype solid +set linetype 3 linewidth 1.25 pointtype 9 ps 1.2 linecolor rgb '#e31a1c' pointinterval -1 dashtype solid +set linetype 4 linewidth 1.25 pointtype 6 ps 1.0 linecolor rgb '#ff7f00' pointinterval -1 dashtype solid +set linetype 5 linewidth 1.25 pointtype 10 ps 1.2 linecolor rgb '#6a3d9a' pointinterval -1 dashtype solid -set linetype 6 linewidth 1.5 pointtype 7 ps 1.0 linecolor rgb '#a6cee3' -set linetype 7 linewidth 1.5 pointtype 1 ps 1.1 linecolor rgb '#b2df8a' -set linetype 8 linewidth 1.5 pointtype 9 ps 1.2 linecolor rgb '#fb9a99' -set linetype 9 linewidth 1.5 pointtype 6 ps 1.0 linecolor rgb '#fdbf6f' -set linetype 10 linewidth 1.5 pointtype 10 ps 1.2 linecolor rgb '#cab2d6' +set linetype 6 linewidth 1.5 pointtype 7 ps 1.0 linecolor rgb '#1f78b4' pointinterval -1 dt (10, 6) +set linetype 7 linewidth 1.5 pointtype 1 ps 1.1 linecolor rgb '#33a02c' pointinterval -1 dt (2, 4) +set linetype 8 linewidth 1.5 pointtype 9 ps 1.2 linecolor rgb '#e31a1c' pointinterval -1 dt (10, 5, 2, 5) +set linetype 9 linewidth 1.5 pointtype 6 ps 1.0 linecolor rgb '#ff7f00' pointinterval -1 dt (8, 7, 2, 7, 2, 7) +set linetype 10 linewidth 1.5 pointtype 10 ps 1.2 linecolor rgb '#6a3d9a' pointinterval -1 dt (8, 4, 2, 4, 2, 4, 2, 4) unset linetype 11 unset linetype 12