Renamed Kaffeekassentransition, adjusted images (again), updated gitignore (generated by gitignore.io)
This commit is contained in:
parent
738aaab946
commit
8a7019a340
10 changed files with 192 additions and 112 deletions
51
.gitignore
vendored
51
.gitignore
vendored
|
@ -1,6 +1,53 @@
|
||||||
|
# Created by https://www.gitignore.io
|
||||||
|
|
||||||
|
### SublimeText ###
|
||||||
|
# cache files for sublime text
|
||||||
|
*.tmlanguage.cache
|
||||||
|
*.tmPreferences.cache
|
||||||
|
*.stTheme.cache
|
||||||
|
|
||||||
|
# workspace files are user-specific
|
||||||
|
*.sublime-workspace
|
||||||
|
|
||||||
|
# project files should be checked into the repository, unless a significant
|
||||||
|
# proportion of contributors will probably not be using SublimeText
|
||||||
|
# *.sublime-project
|
||||||
|
|
||||||
|
# sftp configuration file
|
||||||
|
sftp-config.json
|
||||||
|
|
||||||
|
|
||||||
|
### LaTeX ###
|
||||||
|
*.acn
|
||||||
|
*.acr
|
||||||
|
*.alg
|
||||||
*.aux
|
*.aux
|
||||||
*.log
|
*.bbl
|
||||||
*.synctex.gz
|
*.blg
|
||||||
|
*.dvi
|
||||||
*.fdb_latexmk
|
*.fdb_latexmk
|
||||||
*.fls
|
*.fls
|
||||||
|
*.glg
|
||||||
|
*.glo
|
||||||
|
*.gls
|
||||||
|
*.idx
|
||||||
|
*.ilg
|
||||||
|
*.ind
|
||||||
|
*.ist
|
||||||
|
*.lof
|
||||||
|
*.log
|
||||||
|
*.lot
|
||||||
|
*.maf
|
||||||
|
*.mtc
|
||||||
|
*.mtc0
|
||||||
|
*.nav
|
||||||
|
*.nlo
|
||||||
*.out
|
*.out
|
||||||
|
*.pdfsync
|
||||||
|
*.ps
|
||||||
|
*.snm
|
||||||
|
*.synctex.gz
|
||||||
|
*.toc
|
||||||
|
*.vrb
|
||||||
|
*.xdy
|
||||||
|
*.tdo
|
||||||
|
|
Binary file not shown.
|
@ -9,8 +9,8 @@
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
width="263.01636"
|
width="289.55466"
|
||||||
height="32.873211"
|
height="43.554962"
|
||||||
id="svg2"
|
id="svg2"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.48.4 r9939"
|
inkscape:version="0.48.4 r9939"
|
||||||
|
@ -40,8 +40,8 @@
|
||||||
inkscape:pageopacity="0.0"
|
inkscape:pageopacity="0.0"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:zoom="2.8"
|
inkscape:zoom="2.8"
|
||||||
inkscape:cx="170.34972"
|
inkscape:cx="137.82926"
|
||||||
inkscape:cy="-23.76755"
|
inkscape:cy="-23.767546"
|
||||||
inkscape:document-units="px"
|
inkscape:document-units="px"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
showgrid="false"
|
showgrid="false"
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
inkscape:label="Ebene 1"
|
inkscape:label="Ebene 1"
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer1"
|
id="layer1"
|
||||||
transform="translate(-186.68987,-329.21205)">
|
transform="translate(-174.21033,-318.5303)">
|
||||||
<path
|
<path
|
||||||
style="fill:none;stroke:#000000;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
|
style="fill:none;stroke:#000000;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
|
||||||
d="m 187.31487,342.22494 261.76636,0"
|
d="m 187.31487,342.22494 261.76636,0"
|
||||||
|
@ -144,45 +144,51 @@
|
||||||
transform="matrix(0.72916666,0,0,0.72916666,344.49995,269.98533)" />
|
transform="matrix(0.72916666,0,0,0.72916666,344.49995,269.98533)" />
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:18px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
x="451.04398"
|
x="445.04398"
|
||||||
y="357.57056"
|
y="357.57056"
|
||||||
id="text4659"
|
id="text4659"
|
||||||
sodipodi:linespacing="125%"><tspan
|
sodipodi:linespacing="125%"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4663"
|
id="tspan4663"
|
||||||
x="451.04398"
|
x="445.04398"
|
||||||
y="357.57056"
|
y="357.57056"
|
||||||
style="font-size:22px">Δ<tspan
|
style="font-size:18px"><tspan
|
||||||
style="font-size:22px;baseline-shift:sub"
|
style="font-size:14px"
|
||||||
id="tspan4665">1</tspan></tspan></text>
|
id="tspan3010">Δ</tspan><tspan
|
||||||
|
style="font-size:10px;baseline-shift:sub"
|
||||||
|
id="tspan4665">1</tspan></tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:18px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
x="452.65311"
|
x="449.43881"
|
||||||
y="326.65683"
|
y="326.37112"
|
||||||
id="text4677-7"
|
id="text4677-7"
|
||||||
sodipodi:linespacing="125%"><tspan
|
sodipodi:linespacing="125%"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4679-4"
|
id="tspan4679-4"
|
||||||
x="452.65311"
|
x="449.43881"
|
||||||
y="326.65683"
|
y="326.37112"
|
||||||
style="font-size:28px">p<tspan
|
style="font-size:18px"><tspan
|
||||||
style="font-size:65.00091553%;baseline-shift:sub"
|
style="font-size:14px"
|
||||||
id="tspan4887">1</tspan></tspan></text>
|
id="tspan3008">p</tspan><tspan
|
||||||
|
style="font-size:10px;baseline-shift:sub"
|
||||||
|
id="tspan4887">1</tspan></tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:18px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
x="164.0817"
|
x="172.93884"
|
||||||
y="327.01398"
|
y="326.37112"
|
||||||
id="text4677-7-4"
|
id="text4677-7-4"
|
||||||
sodipodi:linespacing="125%"><tspan
|
sodipodi:linespacing="125%"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4679-4-2"
|
id="tspan4679-4-2"
|
||||||
x="164.0817"
|
x="172.93884"
|
||||||
y="327.01398"
|
y="326.37112"
|
||||||
style="font-size:28px">p<tspan
|
style="font-size:18px"><tspan
|
||||||
style="font-size:65.00091553%;baseline-shift:sub"
|
style="font-size:14px"
|
||||||
id="tspan4887-4">2</tspan></tspan></text>
|
id="tspan3006">p</tspan><tspan
|
||||||
|
style="font-size:10px;baseline-shift:sub"
|
||||||
|
id="tspan4887-4">2</tspan></tspan></text>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 7.7 KiB |
Binary file not shown.
|
@ -9,8 +9,8 @@
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
width="377.39313"
|
width="359.39703"
|
||||||
height="368.89758"
|
height="355.06555"
|
||||||
id="svg2"
|
id="svg2"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.48.4 r9939"
|
inkscape:version="0.48.4 r9939"
|
||||||
|
@ -81,9 +81,9 @@
|
||||||
borderopacity="1.0"
|
borderopacity="1.0"
|
||||||
inkscape:pageopacity="0.0"
|
inkscape:pageopacity="0.0"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:zoom="2.8"
|
inkscape:zoom="1.4"
|
||||||
inkscape:cx="222.75931"
|
inkscape:cx="251.08649"
|
||||||
inkscape:cy="224.71889"
|
inkscape:cy="157.86137"
|
||||||
inkscape:document-units="px"
|
inkscape:document-units="px"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
showgrid="false"
|
showgrid="false"
|
||||||
|
@ -91,8 +91,8 @@
|
||||||
fit-margin-left="0"
|
fit-margin-left="0"
|
||||||
fit-margin-right="0"
|
fit-margin-right="0"
|
||||||
fit-margin-bottom="0"
|
fit-margin-bottom="0"
|
||||||
inkscape:window-width="1855"
|
inkscape:window-width="1301"
|
||||||
inkscape:window-height="1056"
|
inkscape:window-height="744"
|
||||||
inkscape:window-x="65"
|
inkscape:window-x="65"
|
||||||
inkscape:window-y="24"
|
inkscape:window-y="24"
|
||||||
inkscape:window-maximized="1" />
|
inkscape:window-maximized="1" />
|
||||||
|
@ -104,7 +104,7 @@
|
||||||
<dc:format>image/svg+xml</dc:format>
|
<dc:format>image/svg+xml</dc:format>
|
||||||
<dc:type
|
<dc:type
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
<dc:title></dc:title>
|
<dc:title />
|
||||||
</cc:Work>
|
</cc:Work>
|
||||||
</rdf:RDF>
|
</rdf:RDF>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
@ -112,7 +112,7 @@
|
||||||
inkscape:label="Ebene 1"
|
inkscape:label="Ebene 1"
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer1"
|
id="layer1"
|
||||||
transform="translate(-217.5625,-244.03992)">
|
transform="translate(-217.5625,-257.87195)">
|
||||||
<path
|
<path
|
||||||
style="fill:none;stroke:#000000;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
|
style="fill:none;stroke:#000000;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
|
||||||
d="m 382.3427,612.93362 0,-344.00003"
|
d="m 382.3427,612.93362 0,-344.00003"
|
||||||
|
@ -206,31 +206,35 @@
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
x="567.94977"
|
x="561.94977"
|
||||||
y="462.18802"
|
y="460.18802"
|
||||||
id="text4659"
|
id="text4659"
|
||||||
sodipodi:linespacing="125%"><tspan
|
sodipodi:linespacing="125%"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4663"
|
id="tspan4663"
|
||||||
x="567.94977"
|
x="561.94977"
|
||||||
y="462.18802"
|
y="460.18802"
|
||||||
style="font-size:22px">Δ<tspan
|
style="font-size:22px"><tspan
|
||||||
style="font-size:22px;baseline-shift:sub"
|
style="font-size:14px"
|
||||||
id="tspan4665">1</tspan></tspan></text>
|
id="tspan3023">Δ</tspan><tspan
|
||||||
|
style="font-size:10px;baseline-shift:sub"
|
||||||
|
id="tspan4665">1</tspan></tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
x="381.58887"
|
x="387.58887"
|
||||||
y="260.078"
|
y="268.078"
|
||||||
id="text4659-9"
|
id="text4659-9"
|
||||||
sodipodi:linespacing="125%"><tspan
|
sodipodi:linespacing="125%"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4663-6"
|
id="tspan4663-6"
|
||||||
x="381.58887"
|
x="387.58887"
|
||||||
y="260.078"
|
y="268.078"
|
||||||
style="font-size:22px">Δ<tspan
|
style="font-size:22px"><tspan
|
||||||
style="font-size:22px;baseline-shift:sub"
|
style="font-size:14px"
|
||||||
id="tspan4665-9">2</tspan></tspan></text>
|
id="tspan3021">Δ</tspan><tspan
|
||||||
|
style="font-size:10px;baseline-shift:sub"
|
||||||
|
id="tspan4665-9">2</tspan></tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
|
@ -275,7 +279,7 @@
|
||||||
sodipodi:cy="160.32616"
|
sodipodi:cy="160.32616"
|
||||||
sodipodi:rx="3.9285715"
|
sodipodi:rx="3.9285715"
|
||||||
sodipodi:ry="3.9285715"
|
sodipodi:ry="3.9285715"
|
||||||
d="m 343.57142,160.32616 a 3.9285715,3.9285715 0 1 1 -7.85714,0 3.9285715,3.9285715 0 1 1 7.85714,0 z"
|
d="m 343.57142,160.32616 c 0,2.16969 -1.75888,3.92857 -3.92857,3.92857 -2.16969,0 -3.92857,-1.75888 -3.92857,-3.92857 0,-2.16969 1.75888,-3.92857 3.92857,-3.92857 2.16969,0 3.92857,1.75888 3.92857,3.92857 z"
|
||||||
transform="translate(118.27679,323.32564)" />
|
transform="translate(118.27679,323.32564)" />
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
@ -9,8 +9,8 @@
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
width="495.55984"
|
width="483.56375"
|
||||||
height="429.61038"
|
height="419.76956"
|
||||||
id="svg2"
|
id="svg2"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.48.4 r9939"
|
inkscape:version="0.48.4 r9939"
|
||||||
|
@ -195,13 +195,13 @@
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:zoom="1.4"
|
inkscape:zoom="1.4"
|
||||||
inkscape:cx="222.54845"
|
inkscape:cx="222.54845"
|
||||||
inkscape:cy="231.3832"
|
inkscape:cy="231.38319"
|
||||||
inkscape:document-units="px"
|
inkscape:document-units="px"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
showgrid="false"
|
showgrid="false"
|
||||||
inkscape:window-width="1301"
|
inkscape:window-width="1920"
|
||||||
inkscape:window-height="744"
|
inkscape:window-height="1176"
|
||||||
inkscape:window-x="65"
|
inkscape:window-x="0"
|
||||||
inkscape:window-y="24"
|
inkscape:window-y="24"
|
||||||
inkscape:window-maximized="1"
|
inkscape:window-maximized="1"
|
||||||
fit-margin-top="0"
|
fit-margin-top="0"
|
||||||
|
@ -216,7 +216,7 @@
|
||||||
<dc:format>image/svg+xml</dc:format>
|
<dc:format>image/svg+xml</dc:format>
|
||||||
<dc:type
|
<dc:type
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
<dc:title />
|
<dc:title></dc:title>
|
||||||
</cc:Work>
|
</cc:Work>
|
||||||
</rdf:RDF>
|
</rdf:RDF>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
@ -224,7 +224,7 @@
|
||||||
inkscape:label="Ebene 1"
|
inkscape:label="Ebene 1"
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer1"
|
id="layer1"
|
||||||
transform="translate(-125.31516,-247.18027)">
|
transform="translate(-125.31516,-257.02109)">
|
||||||
<path
|
<path
|
||||||
style="fill:none;stroke:#000000;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:none"
|
style="fill:none;stroke:#000000;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:none"
|
||||||
d="m 127.5148,472.7591 461.27008,0"
|
d="m 127.5148,472.7591 461.27008,0"
|
||||||
|
@ -363,17 +363,19 @@
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
x="530.46912"
|
x="532.46912"
|
||||||
y="589.09894"
|
y="579.09894"
|
||||||
id="text4677-7"
|
id="text4677-7"
|
||||||
sodipodi:linespacing="125%"><tspan
|
sodipodi:linespacing="125%"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4679-4"
|
id="tspan4679-4"
|
||||||
x="530.46912"
|
x="532.46912"
|
||||||
y="589.09894"
|
y="579.09894"
|
||||||
style="font-size:28px">p<tspan
|
style="font-size:28px"><tspan
|
||||||
style="font-size:65.00091553%;baseline-shift:sub"
|
style="font-size:14px"
|
||||||
id="tspan4887">1</tspan></tspan></text>
|
id="tspan3059">p</tspan><tspan
|
||||||
|
style="font-size:10px;baseline-shift:sub"
|
||||||
|
id="tspan4887">1</tspan></tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
|
@ -423,31 +425,35 @@
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
x="150.73801"
|
x="160.73801"
|
||||||
y="587.67035"
|
y="577.67035"
|
||||||
id="text4677-7-2"
|
id="text4677-7-2"
|
||||||
sodipodi:linespacing="125%"><tspan
|
sodipodi:linespacing="125%"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4679-4-0"
|
id="tspan4679-4-0"
|
||||||
x="150.73801"
|
x="160.73801"
|
||||||
y="587.67035"
|
y="577.67035"
|
||||||
style="font-size:28px">p<tspan
|
style="font-size:28px"><tspan
|
||||||
style="font-size:65.00091553%;baseline-shift:sub"
|
style="font-size:14px"
|
||||||
id="tspan4937">3</tspan></tspan></text>
|
id="tspan3057">p</tspan><tspan
|
||||||
|
style="font-size:10px;baseline-shift:sub"
|
||||||
|
id="tspan4937">3</tspan></tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
x="342.4827"
|
x="348.4827"
|
||||||
y="262.86191"
|
y="264.86191"
|
||||||
id="text4677-7-6"
|
id="text4677-7-6"
|
||||||
sodipodi:linespacing="125%"><tspan
|
sodipodi:linespacing="125%"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan4679-4-8"
|
id="tspan4679-4-8"
|
||||||
x="342.4827"
|
x="348.4827"
|
||||||
y="262.86191"
|
y="264.86191"
|
||||||
style="font-size:28px">p<tspan
|
style="font-size:28px"><tspan
|
||||||
style="font-size:65.00091553%;baseline-shift:sub"
|
style="font-size:14px"
|
||||||
id="tspan4939">2</tspan></tspan></text>
|
id="tspan3055">p</tspan><tspan
|
||||||
|
style="font-size:10px;baseline-shift:sub"
|
||||||
|
id="tspan4939">2</tspan></tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
|
@ -459,9 +465,11 @@
|
||||||
id="tspan4663"
|
id="tspan4663"
|
||||||
x="593.86914"
|
x="593.86914"
|
||||||
y="490.21945"
|
y="490.21945"
|
||||||
style="font-size:22px">Δ<tspan
|
style="font-size:22px"><tspan
|
||||||
style="font-size:22px;baseline-shift:sub"
|
style="font-size:14px"
|
||||||
id="tspan4665">1</tspan></tspan></text>
|
id="tspan3063">Δ</tspan><tspan
|
||||||
|
style="font-size:10px;baseline-shift:sub"
|
||||||
|
id="tspan4665">1</tspan></tspan></text>
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
|
@ -473,8 +481,10 @@
|
||||||
id="tspan4663-1"
|
id="tspan4663-1"
|
||||||
x="471.72629"
|
x="471.72629"
|
||||||
y="270.21948"
|
y="270.21948"
|
||||||
style="font-size:22px">Δ<tspan
|
style="font-size:22px"><tspan
|
||||||
style="font-size:22px;baseline-shift:sub"
|
style="font-size:14px"
|
||||||
id="tspan4665-9">2</tspan></tspan></text>
|
id="tspan3061">Δ</tspan><tspan
|
||||||
|
style="font-size:10px;baseline-shift:sub"
|
||||||
|
id="tspan4665-9">2</tspan></tspan></text>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
BIN
main.pdf
BIN
main.pdf
Binary file not shown.
59
main.tex
59
main.tex
|
@ -51,7 +51,7 @@
|
||||||
\begin{abstract}
|
\begin{abstract}
|
||||||
Das n-Kaffee-Problem
|
Das n-Kaffee-Problem
|
||||||
beschreibt die Guthaben-Schulden-Verhältnisse
|
beschreibt die Guthaben-Schulden-Verhältnisse
|
||||||
in einer Gruppe von \(n\in\) Personen.
|
in einer Gruppe von \(n\in\naturals\) Personen.
|
||||||
Die Verhältnisse werden hierbei in ausgegebenen Kaffees notiert.
|
Die Verhältnisse werden hierbei in ausgegebenen Kaffees notiert.
|
||||||
In dieser Arbeit definieren wir das Problem
|
In dieser Arbeit definieren wir das Problem
|
||||||
und betrachten Visualisierungen mit dem Ziel,
|
und betrachten Visualisierungen mit dem Ziel,
|
||||||
|
@ -116,7 +116,9 @@ Bla.
|
||||||
|
|
||||||
Um das Kaffee-Problem betrachten zu können,
|
Um das Kaffee-Problem betrachten zu können,
|
||||||
müssen wir zunächst eine geeignete Menge von Personen definieren,
|
müssen wir zunächst eine geeignete Menge von Personen definieren,
|
||||||
die das Problem überhaupt interessiert.
|
die das Problem überhaupt interessiert.\footnote{%
|
||||||
|
Hierzu gehört offenbar der Leser,
|
||||||
|
sonst würde er diesen Stuss ja nicht lesen}
|
||||||
|
|
||||||
\begin{defi}[Kaffeekränzchen]
|
\begin{defi}[Kaffeekränzchen]
|
||||||
\label{def:kaffeekraenzchen}
|
\label{def:kaffeekraenzchen}
|
||||||
|
@ -159,14 +161,17 @@ Aus der Definition der \(\Delta_i\) ergibt sich:
|
||||||
Gibt eine Person einer anderen nun einen Kaffee aus,
|
Gibt eine Person einer anderen nun einen Kaffee aus,
|
||||||
müssen wir die Kaffeekasse entsprechend weiterentwickeln.
|
müssen wir die Kaffeekasse entsprechend weiterentwickeln.
|
||||||
|
|
||||||
\begin{defi}[Kaffeekassentransition]
|
% \begin{defi}[kaffeekassentransitionition]
|
||||||
|
\begin{defi}[Kaffeekassensturz]
|
||||||
\label{def:kaffeekassentransition}
|
\label{def:kaffeekassentransition}
|
||||||
Sei \(n\in\naturals_{\geq 2}\),
|
Sei \(n\in\naturals_{\geq 2}\),
|
||||||
\(K\) ein \(n\)-Kaffeekränzchen,
|
\(K\) ein \(n\)-Kaffeekränzchen,
|
||||||
\(k\) eine \(K\)-Kaffeekasse
|
\(k\) eine \(K\)-Kaffeekasse
|
||||||
sowie \(i \neq j \in {[n]}\) so,
|
sowie \(i \neq j \in {[n]}\) so,
|
||||||
dass \(p_i\) \(p_j\) einen Kaffee ausgibt.
|
dass \(p_i\) \(p_j\) einen Kaffee ausgibt.
|
||||||
Die Kaffeekassentransition liefert zu \(k\)
|
% Die Kaffeekassentransition
|
||||||
|
Der Kaffeekassensturz
|
||||||
|
liefert zu \(k\)
|
||||||
eine neue Kaffeekasse \(k' = (\Delta_1',\ldots,\Delta_n')\) mit
|
eine neue Kaffeekasse \(k' = (\Delta_1',\ldots,\Delta_n')\) mit
|
||||||
\[ \Delta_x' = \left\{
|
\[ \Delta_x' = \left\{
|
||||||
\begin{array}{ll}
|
\begin{array}{ll}
|
||||||
|
@ -267,25 +272,30 @@ in der alle Kaffeeschulden innerhalb des Kaffeekränzchens einzeln ausgewiesen w
|
||||||
\item \( \delta_{i,i} = 0 \) für alle \( i \in \naturals_{\leq n} \)
|
\item \( \delta_{i,i} = 0 \) für alle \( i \in \naturals_{\leq n} \)
|
||||||
\item \( \delta_{i,j} = -\delta_{j,i} \) für alle \( i,j \in \naturals_{\leq n} \)
|
\item \( \delta_{i,j} = -\delta_{j,i} \) für alle \( i,j \in \naturals_{\leq n} \)
|
||||||
\end{enumerate}
|
\end{enumerate}
|
||||||
Hierbei verhalten sich die einzelnen Kaffeedeltas $\delta_{ij}$ wie folgt:
|
Hierbei verhalten sich die einzelnen Kaffeedeltas $\delta_{i, j}$ wie folgt:
|
||||||
\begin{align*}
|
\begin{align*}
|
||||||
\delta_{ij} < 0 &: \enspace p_j \text{ schuldet } p_i \text{ noch } |\delta_{ij}| \text{ Kaffees.} \\
|
\delta_{i,j} < 0 &: \enspace p_j \text{ schuldet } p_i \text{ noch } |\delta_{ij}| \text{ Kaffees.} \\
|
||||||
\delta_{ij} = 0 &: \enspace \text{Niemand hat Kaffeeschulden.} \\
|
\delta_{i,j} = 0 &: \enspace \text{Die Kaffeebilanz zwischen }p_i\text{ und }p_j\text{ ist ausgeglichen.} \\
|
||||||
\delta_{ij} > 0 &: \enspace p_i \text{ schuldet } p_j \text{ noch } \delta_{ij} \text{ Kaffees.}
|
\delta_{i,j} > 0 &: \enspace p_i \text{ schuldet } p_j \text{ noch } \delta_{ij} \text{ Kaffees.}
|
||||||
\end{align*}
|
\end{align*}
|
||||||
\end{defi}
|
\end{defi}
|
||||||
|
|
||||||
Für die Verwaltung der expliziten Kaffeekasse definieren wir die Transistion
|
Für die Verwaltung der expliziten Kaffeekasse definieren wir
|
||||||
|
% die Transition
|
||||||
|
den Kassensturz
|
||||||
analog zu \autoref{def:kaffeekassentransition}.
|
analog zu \autoref{def:kaffeekassentransition}.
|
||||||
|
|
||||||
\begin{defi}[Explizite Kaffeekassentransition]
|
% \begin{defi}[Explizite Kaffeekassentransition]
|
||||||
|
\begin{defi}[Expliziter Kaffeekassensturz]
|
||||||
\label{def:explizitekaffeekassentransition}
|
\label{def:explizitekaffeekassentransition}
|
||||||
Sei \(n \in \naturals_{\geq 2}\),
|
Sei \(n \in \naturals_{\geq 2}\),
|
||||||
\(K\) ein Kaffeekränzchen über \(n\),
|
\(K\) ein Kaffeekränzchen über \(n\),
|
||||||
\(\kappa\) eine explizite \(K\)-Kaffeekasse
|
\(\kappa\) eine explizite \(K\)-Kaffeekasse
|
||||||
sowie \(i \neq j \in {[n]}\) so,
|
sowie \(i \neq j \in {[n]}\) so,
|
||||||
dass \(p_i\) \(p_j\) einen Kaffee ausgibt.
|
dass \(p_i\) \(p_j\) einen Kaffee ausgibt.
|
||||||
Die explizite Kaffeekassentransition liefert zu \(\kappa\)
|
% Die explizite Kaffeekassentransition
|
||||||
|
Der explizite Kaffeekassensturz
|
||||||
|
liefert zu \(\kappa\)
|
||||||
eine neue explizite Kaffeekasse \( \kappa' \in \integers^{n\times n} \) mit
|
eine neue explizite Kaffeekasse \( \kappa' \in \integers^{n\times n} \) mit
|
||||||
\[ \delta_{k,l}' = \left\{
|
\[ \delta_{k,l}' = \left\{
|
||||||
\begin{array}{ll}
|
\begin{array}{ll}
|
||||||
|
@ -315,7 +325,8 @@ analog zu \autoref{def:kaffeekassentransition}.
|
||||||
\begin{beob}[Kaffeeparadoxon]
|
\begin{beob}[Kaffeeparadoxon]
|
||||||
\label{beob:kaffeparadoxon}
|
\label{beob:kaffeparadoxon}
|
||||||
Betrachten wir das 3-Kaffeekränzchen \( K = {p_1, p_2, p_3} \)
|
Betrachten wir das 3-Kaffeekränzchen \( K = {p_1, p_2, p_3} \)
|
||||||
und ihre explizite Kaffeekasse \(\kappa\). Bisher hat \(p_2\)
|
und ihre explizite Kaffeekasse \(\kappa\).
|
||||||
|
Nehmen wir an \(p_2\) hat bisher
|
||||||
jeweils einen Kaffee für \(p_1\) und \(p_3\) bezahlt.
|
jeweils einen Kaffee für \(p_1\) und \(p_3\) bezahlt.
|
||||||
Weiter hat \(p_3\) \(p_1\) einen Kaffee ausgegeben.
|
Weiter hat \(p_3\) \(p_1\) einen Kaffee ausgegeben.
|
||||||
Somit ergibt sich
|
Somit ergibt sich
|
||||||
|
@ -333,8 +344,9 @@ analog zu \autoref{def:kaffeekassentransition}.
|
||||||
|
|
||||||
Bilden wir zu \(\kappa\) nun die bilanzierende Kaffeekasse \(k\),
|
Bilden wir zu \(\kappa\) nun die bilanzierende Kaffeekasse \(k\),
|
||||||
so ergibt sich \(k = (2,-2,0) \).
|
so ergibt sich \(k = (2,-2,0) \).
|
||||||
Hierbei ist zu erkennen, das nur 2 Kaffees benötigt werden, um die Kaffeeschulden
|
Hierbei ist unmittelbar zu erkennen,
|
||||||
auszugleichen.
|
das nur 2 Kaffees benötigt werden,
|
||||||
|
um die Kaffeeschulden auszugleichen.
|
||||||
|
|
||||||
Dieses Phänomen, welches wir als \emph{Kaffeeparadoxon} bezeichnen, lässt sich
|
Dieses Phänomen, welches wir als \emph{Kaffeeparadoxon} bezeichnen, lässt sich
|
||||||
in dem Auftreten von \emph{transitiven Kaffeeschulden} begründen.
|
in dem Auftreten von \emph{transitiven Kaffeeschulden} begründen.
|
||||||
|
@ -383,7 +395,7 @@ als Koordinaten eingetragen werden.
|
||||||
|
|
||||||
\begin{figure}[htbp]
|
\begin{figure}[htbp]
|
||||||
\centering
|
\centering
|
||||||
\includegraphics[width=.7\textwidth]{3KaffeeKartesisch}
|
\includegraphics[scale=.6]{3KaffeeKartesisch}
|
||||||
\caption{%
|
\caption{%
|
||||||
Visualisierung des \(3\)-Kaffee-Problems mit kartesischen Koordianten.
|
Visualisierung des \(3\)-Kaffee-Problems mit kartesischen Koordianten.
|
||||||
}
|
}
|
||||||
|
@ -410,7 +422,7 @@ zur Zeit liegt.
|
||||||
|
|
||||||
\begin{figure}[htbp]
|
\begin{figure}[htbp]
|
||||||
\centering
|
\centering
|
||||||
\includegraphics[width=.7\textwidth]{3KaffeeProblem}
|
\includegraphics[scale=.6]{3KaffeeProblem}
|
||||||
\caption{%
|
\caption{%
|
||||||
Visualisierung des \(3\)-Kaffee-Problems mit schiefen Koordianten
|
Visualisierung des \(3\)-Kaffee-Problems mit schiefen Koordianten
|
||||||
}
|
}
|
||||||
|
@ -420,16 +432,15 @@ zur Zeit liegt.
|
||||||
Als alternative Darstellung kann ein
|
Als alternative Darstellung kann ein
|
||||||
geradliniges, nichtorthgonales Koordiantensystem
|
geradliniges, nichtorthgonales Koordiantensystem
|
||||||
gewählt werden. In \autoref{fig:3-kaffee-schief}
|
gewählt werden. In \autoref{fig:3-kaffee-schief}
|
||||||
In diesem System schneiden sich die
|
schneiden sich die Achsen
|
||||||
Achsen mit einem Winkel von 60\degree.
|
mit einem Winkel von 60\degree.
|
||||||
Bei korrekter Beschriftung der Seiten, können hier
|
Bei dieser Art des Koordinatensystems
|
||||||
die selben Koordinaten verwendet werden,
|
können die selben Koordinaten verwendet werden,
|
||||||
die bereits im kartesischen Koordinatensystem
|
die bereits im kartesischen Koordinatensystem berechnet wurden.
|
||||||
bereechnet wurden.
|
Allerdings können hier die Namen der Personen an den Seiten
|
||||||
Allerdings können hier die Personen an den Seiten
|
|
||||||
plaziert werden, um eine einfacher Transition
|
plaziert werden, um eine einfacher Transition
|
||||||
zu ermöglichen.
|
zu ermöglichen.
|
||||||
Auch hier kann nun die Markierung wieder
|
Nun kann hier auch die Markierung wieder
|
||||||
``mit dem Kaffee'', von der ausgebenden Person weg
|
``mit dem Kaffee'', von der ausgebenden Person weg
|
||||||
und auf die empfangende Person zu, verschoben werden.
|
und auf die empfangende Person zu, verschoben werden.
|
||||||
|
|
||||||
|
|
2
n-kaffee-problem.sublime-project
Normal file
2
n-kaffee-problem.sublime-project
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
{
|
||||||
|
}
|
Loading…
Reference in a new issue