From 1168cbf0d046c151d1590f5c928b01fd8136f564 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Thu, 2 Feb 2023 10:58:04 +0100 Subject: [PATCH] vault backup: 2023-02-02 10:58:04 --- .../obsidian-activity-history/data.json | 16 ++++++++-- notes/.obsidian/workspace.json | 30 +++++++++---------- .../literatura/slohy/Romantismus/Divadlo.md | 3 ++ .../slohy/Romantismus/Frantisek Palacky.md | 8 +++++ .../slohy/Romantismus/Romantismus.md | 1 + notes/mat/Funkce/Goniometrické funkce.md | 26 +++++++++++++++- 6 files changed, 66 insertions(+), 18 deletions(-) create mode 100644 notes/cjl/literatura/slohy/Romantismus/Frantisek Palacky.md diff --git a/notes/.obsidian/plugins/obsidian-activity-history/data.json b/notes/.obsidian/plugins/obsidian-activity-history/data.json index 9cab481..e316d9a 100644 --- a/notes/.obsidian/plugins/obsidian-activity-history/data.json +++ b/notes/.obsidian/plugins/obsidian-activity-history/data.json @@ -12,8 +12,8 @@ "checkpointList": [ { "path": "/", - "date": "2023-01-26", - "size": 962034 + "date": "2023-02-02", + "size": 962977 } ], "activityHistory": [ @@ -1063,6 +1063,18 @@ { "date": "2023-01-26", "value": 0 + }, + { + "date": "2023-01-27", + "value": 250 + }, + { + "date": "2023-01-28", + "value": 0 + }, + { + "date": "2023-02-02", + "value": 693 } ] } diff --git a/notes/.obsidian/workspace.json b/notes/.obsidian/workspace.json index 8610ef4..a5f52af 100644 --- a/notes/.obsidian/workspace.json +++ b/notes/.obsidian/workspace.json @@ -4,16 +4,16 @@ "type": "split", "children": [ { - "id": "7a491a44055c43a8", + "id": "5ea8bf9219eaed57", "type": "tabs", "children": [ { - "id": "8a5742d8430e1937", + "id": "50fe0c34474c1bf4", "type": "leaf", "state": { "type": "markdown", "state": { - "file": "psi/CCNA2/vlan.md", + "file": "mat/Funkce/Goniometrické funkce.md", "mode": "source", "source": false } @@ -77,7 +77,7 @@ "state": { "type": "backlink", "state": { - "file": "psi/CCNA2/vlan.md", + "file": "mat/Funkce/Goniometrické funkce.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -94,7 +94,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "psi/CCNA2/vlan.md", + "file": "mat/Funkce/Goniometrické funkce.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -141,7 +141,7 @@ "state": { "type": "outline", "state": { - "file": "psi/CCNA2/vlan.md" + "file": "mat/Funkce/Goniometrické funkce.md" } } }, @@ -216,17 +216,17 @@ "breadcrumbs:Breadcrumbs Visualisation": false } }, - "active": "8a5742d8430e1937", + "active": "50fe0c34474c1bf4", "lastOpenFiles": [ - "psi/CCNA2/DHCP.md", - "psi/psi.md", - "mat/Funkce/Goniometrické funkce.md", "mat/mat.md", - "cjl/literatura/slohy/Romantismus/Romantismus.md", - "cjl/literatura/slohy/Romantismus/Václav Matěj Kramerius.md", - "cjl/literatura/slohy/Romantismus/Divadlo.md", "cjl/cjl.md", - "cjl/literatura/slohy/Romantismus/Hudba.md", - "cjl/literatura/slohy/Romantismus/Národní obrozeni.md" + "cjl/literatura/slohy/Romantismus/Národní obrozeni.md", + "cjl/literatura/slohy/Romantismus/Frantisek Palacky.md", + "cjl/literatura/slohy/Romantismus/Divadlo.md", + "cjl/literatura/slohy/Romantismus/Václav Matěj Kramerius.md", + "cjl/literatura/slohy/Romantismus/Romantismus.md", + "psi/psi.md", + "psi/CCNA2/vlan.md", + "psi/CCNA2/DHCP.md" ] } \ No newline at end of file diff --git a/notes/cjl/literatura/slohy/Romantismus/Divadlo.md b/notes/cjl/literatura/slohy/Romantismus/Divadlo.md index 0926727..9fbc8f8 100644 --- a/notes/cjl/literatura/slohy/Romantismus/Divadlo.md +++ b/notes/cjl/literatura/slohy/Romantismus/Divadlo.md @@ -13,11 +13,14 @@ - 1783 - Německé - 1798 přejmenováno na stavovské +- tylovo divadlo - Jan Nepomuk Štěpánek (1783-1844) - Dramatik, dramaturg, spoluředitel - Čech a Němec +## Klicperovo divadlo +- v hradci - Václav Kliment Klicpera (1792-1859) - Dramatik (princip kuklení, postava se představí ale ve zkušenosti to je někdo jiný) - Veselohra na mostě diff --git a/notes/cjl/literatura/slohy/Romantismus/Frantisek Palacky.md b/notes/cjl/literatura/slohy/Romantismus/Frantisek Palacky.md new file mode 100644 index 0000000..fe50795 --- /dev/null +++ b/notes/cjl/literatura/slohy/Romantismus/Frantisek Palacky.md @@ -0,0 +1,8 @@ +# Frantisek Palacky +- otec naroda +- Dejiny narod u ceskeho v Cechach i v Morave + +- 1836 nemecky +- 1848-1876 cesky +- 5 dilu + diff --git a/notes/cjl/literatura/slohy/Romantismus/Romantismus.md b/notes/cjl/literatura/slohy/Romantismus/Romantismus.md index 622024b..4bd86bf 100644 --- a/notes/cjl/literatura/slohy/Romantismus/Romantismus.md +++ b/notes/cjl/literatura/slohy/Romantismus/Romantismus.md @@ -5,6 +5,7 @@ tags: [cjl, cjl/slohy, cjl/slohy/romantismus, MOC, generated, index] %% Zoottelkeeper: Beginning of the autogenerated index file list %% - [[cjl/literatura/slohy/Romantismus/Divadlo|Divadlo]] +- [[cjl/literatura/slohy/Romantismus/Frantisek Palacky|Frantisek Palacky]] - [[cjl/literatura/slohy/Romantismus/Hudba|Hudba]] - [[cjl/literatura/slohy/Romantismus/Národní obrozeni|Národní obrozeni]] - [[cjl/literatura/slohy/Romantismus/Václav Matěj Kramerius|Václav Matěj Kramerius]] diff --git a/notes/mat/Funkce/Goniometrické funkce.md b/notes/mat/Funkce/Goniometrické funkce.md index 983332a..fc8086e 100644 --- a/notes/mat/Funkce/Goniometrické funkce.md +++ b/notes/mat/Funkce/Goniometrické funkce.md @@ -38,5 +38,29 @@ $\cos\beta=\frac{x_B}1=x_B$ | $\alpha$ | $0\degree/0$ | $30\degree/\frac\pi6$ | $45\degree/\frac\pi4$ | $60\degree/\frac\pi3$ | $90\degree/\frac\pi2$ | | ------------ | ------------ | --------------------- | --------------------- | --------------------- | --------------------- | | $\sin\alpha$ | $0$ | $\frac12$ | $\frac{\sqrt2}2$ | $\frac{\sqrt3}2$ | $1$ | -| $\cos\alpha$ | $1$ | $\frac{\sqrt3}2$ | $\frac{\sqrt2}2$ | 0 | | +| $\cos\alpha$ | $1$ | $\frac{\sqrt3}2$ | $\frac{\sqrt2}2$ | $\frac12$ | 0 | + +--- + +40/6.3/8 (petakova) + +a) +$\sin\frac56\pi=\sin\frac{5*\pi*6}6=\sin(5\frac\pi6)=\sin(5*30\degree)=\sin(150\degree)=\sin(30\degree)=\frac12$ +$\sin\frac{15}3\pi=\sin(15*60\degree)=\sin900\degree=0$ +$\sin(-\frac74\pi)=\sin(-7*45\degree)=\sin(450-135\degree)=\sin(315\degree)=-\sin(45\degree)=\frac{\sqrt2}2$ + +b) +$\cos\frac34\pi=\cos(3*45\degree)=\cos(135\degree)=\sin(45\degree)=\frac{\sqrt2}2$ +$\cos\frac76\pi=\cos(7*30\degree)=\cos(300-90)=\cos(210\degree)=-\sin(60\degree)=$ +$\cos(-\frac43\pi)$ + +c) +$\sin210\degree=-\sin30\degree=-\frac12$ +$\sin330\degree=-\sin30\degree=-\frac12$ +$\sin720\degree=0$ + +d) +$\cos(-180\degree)=1$ +$\cos120\degree=\sin60\degree=\frac{\sqrt3}2$ +$\cos240\degree=-\sin30\degree=-\frac12$