From 5d1cd4306966a5433bcc8375d627989aade53a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 21 May 2022 07:21:47 +0200 Subject: add new script for risch part --- buch/chapters/060-integral/experiments/rxy.maxima | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 buch/chapters/060-integral/experiments/rxy.maxima (limited to 'buch') diff --git a/buch/chapters/060-integral/experiments/rxy.maxima b/buch/chapters/060-integral/experiments/rxy.maxima new file mode 100644 index 0000000..0d5a56d --- /dev/null +++ b/buch/chapters/060-integral/experiments/rxy.maxima @@ -0,0 +1,9 @@ +y: sqrt(a*x^2+b*x+c); + +F: log(x + b/(2 * a) + y/sqrt(a))/sqrt(a); + +f: diff(F, x); + +ratsimp(f); + +ratsimp(y*f); -- cgit v1.2.1 From eceae67b3a13bc28acc446288429a90be2efa99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 21 May 2022 12:45:42 +0200 Subject: curvature graph --- buch/papers/kugel/images/Makefile | 13 ++++++ buch/papers/kugel/images/curvature.pov | 72 +++++++++++++++++++++++++++++ buch/papers/kugel/images/curvgraph.m | 83 ++++++++++++++++++++++++++++++++++ 3 files changed, 168 insertions(+) create mode 100644 buch/papers/kugel/images/Makefile create mode 100644 buch/papers/kugel/images/curvature.pov create mode 100644 buch/papers/kugel/images/curvgraph.m (limited to 'buch') diff --git a/buch/papers/kugel/images/Makefile b/buch/papers/kugel/images/Makefile new file mode 100644 index 0000000..8efa228 --- /dev/null +++ b/buch/papers/kugel/images/Makefile @@ -0,0 +1,13 @@ +# +# Makefile -- build images +# +# (c) 2022 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule +# +all: curvature.png + +curvature.inc: curvgraph.m + octave curvgraph.m + +curvature.png: curvature.pov curvature.inc + povray +A0.1 +W1920 +H1080 +Ocurvature.png curvature.pov + diff --git a/buch/papers/kugel/images/curvature.pov b/buch/papers/kugel/images/curvature.pov new file mode 100644 index 0000000..3535488 --- /dev/null +++ b/buch/papers/kugel/images/curvature.pov @@ -0,0 +1,72 @@ +// +// curvature.pov +// +// (c) 2022 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule +// + +#version 3.7; +#include "colors.inc" + +global_settings { + assumed_gamma 1 +} + +#declare imagescale = 0.1; + +camera { + location <40, 10, -20> + look_at <0, 0, 0> + right 16/9 * x * imagescale + up y * imagescale +} + +light_source { + <10, 10, -40> color White + area_light <1,0,0> <0,0,1>, 10, 10 + adaptive 1 + jitter +} + +sky_sphere { + pigment { + color rgb<1,1,1> + } +} + +// +// draw an arrow from to with thickness with +// color +// +#macro arrow(from, to, arrowthickness, c) +#declare arrowdirection = vnormalize(to - from); +#declare arrowlength = vlength(to - from); +union { + sphere { + from, 1.1 * arrowthickness + } + cylinder { + from, + from + (arrowlength - 5 * arrowthickness) * arrowdirection, + arrowthickness + } + cone { + from + (arrowlength - 5 * arrowthickness) * arrowdirection, + 2 * arrowthickness, + to, + 0 + } + pigment { + color c + } + finish { + specular 0.9 + metallic + } +} +#end + +arrow(<-3.1,0,0>, <3.1,0,0>, 0.01, White) +arrow(<0,-1,0>, <0,1,0>, 0.01, White) +arrow(<0,0,-2.1>, <0,0,2.1>, 0.01, White) + +#include "curvature.inc" diff --git a/buch/papers/kugel/images/curvgraph.m b/buch/papers/kugel/images/curvgraph.m new file mode 100644 index 0000000..96ca4b1 --- /dev/null +++ b/buch/papers/kugel/images/curvgraph.m @@ -0,0 +1,83 @@ +# +# curvature.m +# +# (c) 2022 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule +# + +global N; +N = 10; + +global sigma2; +sigma2 = 1; + +global s; +s = 1; + +xmin = -3; +xmax = 3; +xsteps = 1000; +hx = (xmax - xmin) / xsteps; + +ymin = -2; +ymax = 2; +ysteps = 1000; +hy = (ymax - ymin) / ysteps; + +function retval = f0(r) + global sigma2; + retval = exp(-r^2/sigma2)/sigma2 - exp(-r^2/(2*sigma2))/(sqrt(2)*sigma2); +end + +global N0; +N0 = f0(0); + +function retval = f1(x,y) + global N0; + retval = f0(hypot(x, y)) / N0; +endfunction + +function retval = f(x, y) + global s; + retval = f1(x+s, y) - f1(x-s, y); +endfunction + +function retval = curvature0(r) + global sigma2; + retval = ( + (2*sigma2-r^2)*exp(-r^2/(2*sigma2)) + + + 4*(r^2-sigma2)*exp(-r^2/sigma2) + ) / (sigma2^2); +endfunction + +function retval = curvature1(x, y) + retval = curvature0(hypot(x, y)); +endfunction + +function retval = curvature(x, y) + global s; + retval = curvature1(x+s, y) + curvature1(x-s, y); +endfunction + +function retval = farbe(x, y) + c = curvature(x, y); + retval = c * ones(1,3); +endfunction + +fn = fopen("curvature.inc", "w"); + +for ix = (0:xsteps) + x = xmin + ix * hx; + for iy = (0:ysteps) + y = ymin + iy * hy; + fprintf(fn, "sphere { <%.4f, %.4f, %.4f>, 0.01\n", + x, f(x, y), y); + color = farbe(x, y); + fprintf(fn, "pigment { color rgb<%.4f,%.4f,%.4f> }\n", + color(1,1), color(1,2), color(1,3)); + fprintf(fn, "finish { metallic specular 0.5 }\n"); + fprintf(fn, "}\n"); + end +end + +fclose(fn); -- cgit v1.2.1 From ab62c3937cc111ce1d61d76f0bdf396a4a5a9297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 21 May 2022 20:36:01 +0200 Subject: add image code --- buch/papers/kugel/images/Makefile | 4 +- buch/papers/kugel/images/curvature.maxima | 6 ++ buch/papers/kugel/images/curvature.pov | 72 +++++++++++++++++++++++- buch/papers/kugel/images/curvgraph.m | 93 +++++++++++++++++++++++++------ 4 files changed, 153 insertions(+), 22 deletions(-) create mode 100644 buch/papers/kugel/images/curvature.maxima (limited to 'buch') diff --git a/buch/papers/kugel/images/Makefile b/buch/papers/kugel/images/Makefile index 8efa228..e8bf919 100644 --- a/buch/papers/kugel/images/Makefile +++ b/buch/papers/kugel/images/Makefile @@ -3,7 +3,7 @@ # # (c) 2022 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule # -all: curvature.png +all: curvature.jpg curvature.inc: curvgraph.m octave curvgraph.m @@ -11,3 +11,5 @@ curvature.inc: curvgraph.m curvature.png: curvature.pov curvature.inc povray +A0.1 +W1920 +H1080 +Ocurvature.png curvature.pov +curvature.jpg: curvature.png + convert curvature.png -density 300 -units PixelsPerInch curvature.jpg diff --git a/buch/papers/kugel/images/curvature.maxima b/buch/papers/kugel/images/curvature.maxima new file mode 100644 index 0000000..6313642 --- /dev/null +++ b/buch/papers/kugel/images/curvature.maxima @@ -0,0 +1,6 @@ + +f: exp(-r^2/sigma^2)/sigma; +laplacef: ratsimp(diff(r * diff(f,r), r) / r); +f: exp(-r^2/(2*sigma^2))/(sqrt(2)*sigma); +laplacef: ratsimp(diff(r * diff(f,r), r) / r); + diff --git a/buch/papers/kugel/images/curvature.pov b/buch/papers/kugel/images/curvature.pov index 3535488..9dbaa86 100644 --- a/buch/papers/kugel/images/curvature.pov +++ b/buch/papers/kugel/images/curvature.pov @@ -11,17 +11,17 @@ global_settings { assumed_gamma 1 } -#declare imagescale = 0.1; +#declare imagescale = 0.09; camera { - location <40, 10, -20> + location <10, 10, -40> look_at <0, 0, 0> right 16/9 * x * imagescale up y * imagescale } light_source { - <10, 10, -40> color White + <-10, 10, -40> color White area_light <1,0,0> <0,0,1>, 10, 10 adaptive 1 jitter @@ -70,3 +70,69 @@ arrow(<0,-1,0>, <0,1,0>, 0.01, White) arrow(<0,0,-2.1>, <0,0,2.1>, 0.01, White) #include "curvature.inc" + +#declare sigma = 1; +#declare N0 = 0.5; +#declare funktion = function(r) { + (exp(-r*r/(sigma*sigma)) / sigma + - + exp(-r*r/(2*sigma*sigma)) / (sqrt(2)*sigma)) / N0 +}; +#declare hypot = function(xx, yy) { sqrt(xx*xx+yy*yy) }; + +#declare Funktion = function(x,y) { funktion(hypot(x+1,y)) - funktion(hypot(x-1,y)) }; +#macro punkt(xx,yy) + +#end + +#declare griddiameter = 0.006; +union { + #declare xmin = -3; + #declare xmax = 3; + #declare ymin = -2; + #declare ymax = 2; + + + #declare xstep = 0.2; + #declare ystep = 0.02; + #declare xx = xmin; + #while (xx < xmax + xstep/2) + #declare yy = ymin; + #declare P = punkt(xx, yy); + #while (yy < ymax - ystep/2) + #declare yy = yy + ystep; + #declare Q = punkt(xx, yy); + sphere { P, griddiameter } + cylinder { P, Q, griddiameter } + #declare P = Q; + #end + sphere { P, griddiameter } + #declare xx = xx + xstep; + #end + + #declare xstep = 0.02; + #declare ystep = 0.2; + #declare yy = ymin; + #while (yy < ymax + ystep/2) + #declare xx = xmin; + #declare P = punkt(xx, yy); + #while (xx < xmax - xstep/2) + #declare xx = xx + xstep; + #declare Q = punkt(xx, yy); + sphere { P, griddiameter } + cylinder { P, Q, griddiameter } + #declare P = Q; + #end + sphere { P, griddiameter } + #declare yy = yy + ystep; + #end + + pigment { + color rgb<0.8,0.8,0.8> + } + finish { + metallic + specular 0.8 + } +} + diff --git a/buch/papers/kugel/images/curvgraph.m b/buch/papers/kugel/images/curvgraph.m index 96ca4b1..b83c877 100644 --- a/buch/papers/kugel/images/curvgraph.m +++ b/buch/papers/kugel/images/curvgraph.m @@ -13,23 +13,34 @@ sigma2 = 1; global s; s = 1; +global cmax; +cmax = 0.9; +global cmin; +cmin = -0.9; + +global Cmax; +global Cmin; +Cmax = 0; +Cmin = 0; + xmin = -3; xmax = 3; -xsteps = 1000; +xsteps = 200; hx = (xmax - xmin) / xsteps; ymin = -2; ymax = 2; -ysteps = 1000; +ysteps = 200; hy = (ymax - ymin) / ysteps; function retval = f0(r) global sigma2; - retval = exp(-r^2/sigma2)/sigma2 - exp(-r^2/(2*sigma2))/(sqrt(2)*sigma2); + retval = exp(-r^2/sigma2)/sqrt(sigma2) - exp(-r^2/(2*sigma2))/(sqrt(2*sigma2)); end global N0; -N0 = f0(0); +N0 = f0(0) +N0 = 0.5; function retval = f1(x,y) global N0; @@ -44,10 +55,10 @@ endfunction function retval = curvature0(r) global sigma2; retval = ( - (2*sigma2-r^2)*exp(-r^2/(2*sigma2)) + -4*(sigma2-r^2)*exp(-r^2/sigma2) + - 4*(r^2-sigma2)*exp(-r^2/sigma2) - ) / (sigma2^2); + (2*sigma2-r^2)*exp(-r^2/(2*sigma2)) + ) / (sigma2^(5/2)); endfunction function retval = curvature1(x, y) @@ -56,28 +67,74 @@ endfunction function retval = curvature(x, y) global s; - retval = curvature1(x+s, y) + curvature1(x-s, y); + retval = curvature1(x+s, y) - curvature1(x-s, y); endfunction function retval = farbe(x, y) + global Cmax; + global Cmin; + global cmax; + global cmin; c = curvature(x, y); - retval = c * ones(1,3); + if (c < Cmin) + Cmin = c + endif + if (c > Cmax) + Cmax = c + endif + u = (c - cmin) / (cmax - cmin); + if (u > 1) + u = 1; + endif + if (u < 0) + u = 0; + endif + color = [ u, 0.5, 1-u ]; + color = color/max(color); + color(1,4) = c/2; + retval = color; endfunction -fn = fopen("curvature.inc", "w"); +function dreieck(fn, A, B, C) + fprintf(fn, "\ttriangle {\n"); + fprintf(fn, "\t <%.4f,%.4f,%.4f>,\n", A(1,1), A(1,3), A(1,2)); + fprintf(fn, "\t <%.4f,%.4f,%.4f>,\n", B(1,1), B(1,3), B(1,2)); + fprintf(fn, "\t <%.4f,%.4f,%.4f>\n", C(1,1), C(1,3), C(1,2)); + fprintf(fn, "\t}\n"); +endfunction +function viereck(fn, punkte) + color = farbe(mean(punkte(:,1)), mean(punkte(:,2))); + fprintf(fn, " mesh {\n"); + dreieck(fn, punkte(1,:), punkte(2,:), punkte(3,:)); + dreieck(fn, punkte(2,:), punkte(3,:), punkte(4,:)); + fprintf(fn, "\tpigment { color rgb<%.4f,%.4f,%.4f> } // %.4f\n", + color(1,1), color(1,2), color(1,3), color(1,4)); + fprintf(fn, " }\n"); +endfunction + +fn = fopen("curvature.inc", "w"); +punkte = zeros(4,3); for ix = (0:xsteps) x = xmin + ix * hx; + punkte(1,1) = x; + punkte(2,1) = x; + punkte(3,1) = x + hx; + punkte(4,1) = x + hx; for iy = (0:ysteps) y = ymin + iy * hy; - fprintf(fn, "sphere { <%.4f, %.4f, %.4f>, 0.01\n", - x, f(x, y), y); - color = farbe(x, y); - fprintf(fn, "pigment { color rgb<%.4f,%.4f,%.4f> }\n", - color(1,1), color(1,2), color(1,3)); - fprintf(fn, "finish { metallic specular 0.5 }\n"); - fprintf(fn, "}\n"); + punkte(1,2) = y; + punkte(2,2) = y + hy; + punkte(3,2) = y; + punkte(4,2) = y + hy; + for i = (1:4) + punkte(i,3) = f(punkte(i,1), punkte(i,2)); + endfor + viereck(fn, punkte); end end - +#fprintf(fn, " finish { metallic specular 0.5 }\n"); fclose(fn); + +printf("Cmax = %.4f\n", Cmax); +printf("Cmin = %.4f\n", Cmin); -- cgit v1.2.1 From d8d6a61a2ab45d9171a93e4a72d254a3ed5ef87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 21 May 2022 20:42:47 +0200 Subject: fix some bugs --- buch/papers/kugel/images/curvature.pov | 5 +++-- buch/papers/kugel/images/curvgraph.m | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'buch') diff --git a/buch/papers/kugel/images/curvature.pov b/buch/papers/kugel/images/curvature.pov index 9dbaa86..3b15d77 100644 --- a/buch/papers/kugel/images/curvature.pov +++ b/buch/papers/kugel/images/curvature.pov @@ -72,7 +72,8 @@ arrow(<0,0,-2.1>, <0,0,2.1>, 0.01, White) #include "curvature.inc" #declare sigma = 1; -#declare N0 = 0.5; +#declare s = 1.4; +#declare N0 = 0.4; #declare funktion = function(r) { (exp(-r*r/(sigma*sigma)) / sigma - @@ -80,7 +81,7 @@ arrow(<0,0,-2.1>, <0,0,2.1>, 0.01, White) }; #declare hypot = function(xx, yy) { sqrt(xx*xx+yy*yy) }; -#declare Funktion = function(x,y) { funktion(hypot(x+1,y)) - funktion(hypot(x-1,y)) }; +#declare Funktion = function(x,y) { funktion(hypot(x+s,y)) - funktion(hypot(x-s,y)) }; #macro punkt(xx,yy) #end diff --git a/buch/papers/kugel/images/curvgraph.m b/buch/papers/kugel/images/curvgraph.m index b83c877..75effd6 100644 --- a/buch/papers/kugel/images/curvgraph.m +++ b/buch/papers/kugel/images/curvgraph.m @@ -11,7 +11,7 @@ global sigma2; sigma2 = 1; global s; -s = 1; +s = 1.4; global cmax; cmax = 0.9; @@ -40,7 +40,7 @@ end global N0; N0 = f0(0) -N0 = 0.5; +N0 = 0.4; function retval = f1(x,y) global N0; @@ -115,13 +115,13 @@ endfunction fn = fopen("curvature.inc", "w"); punkte = zeros(4,3); -for ix = (0:xsteps) +for ix = (0:xsteps-1) x = xmin + ix * hx; punkte(1,1) = x; punkte(2,1) = x; punkte(3,1) = x + hx; punkte(4,1) = x + hx; - for iy = (0:ysteps) + for iy = (0:ysteps-1) y = ymin + iy * hy; punkte(1,2) = y; punkte(2,2) = y + hy; -- cgit v1.2.1