Merge remote-tracking branch 'origin/main'

2026-05-19 04:18:49 +00:00 · 2024-04-11 12:29:54 +02:00 · 2024-04-11 12:29:54 +02:00 · 89ce5d46f1
commit 89ce5d46f1
parent f338e65562 9a18f6c5e0
10 changed files with 5423 additions and 34 deletions
--- a/notes/.obsidian/workspace.json
+++ b/notes/.obsidian/workspace.json
@ -4,19 +4,15 @@
    "type": "split",
    "children": [
      {
-        "id": "6004ee0bb496ffde",
+        "id": "a450f24fab986058",
        "type": "tabs",
        "children": [
          {
-            "id": "f2c4199809ef0427",
+            "id": "8f82be4dbb1c94b2",
            "type": "leaf",
            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "fyz/elektrika/fotoveci.md",
-                "mode": "source",
-                "source": false
-              }
+              "type": "empty",
+              "state": {}
            }
          }
        ]
@ -48,7 +44,7 @@
            "state": {
              "type": "search",
              "state": {
-                "query": "diskri",
+                "query": "d=2b",
                "matchingCase": false,
                "explainSearch": false,
                "collapseAll": true,
@ -85,7 +81,6 @@
            "state": {
              "type": "backlink",
              "state": {
-                "file": "fyz/elektrika/fotoveci.md",
                "collapseAll": false,
                "extraContext": false,
                "sortOrder": "alphabetical",
@ -102,7 +97,6 @@
            "state": {
              "type": "outgoing-link",
              "state": {
-                "file": "fyz/elektrika/fotoveci.md",
                "linksCollapsed": false,
                "unlinkedCollapsed": true
              }
@ -148,9 +142,7 @@
            "type": "leaf",
            "state": {
              "type": "outline",
-              "state": {
-                "file": "fyz/elektrika/fotoveci.md"
-              }
+              "state": {}
            }
          },
          {
@ -238,44 +230,44 @@
      "breadcrumbs:Breadcrumbs Visualisation": false
    }
  },
-  "active": "f2c4199809ef0427",
+  "active": "8f82be4dbb1c94b2",
  "lastOpenFiles": [
-    "cjl/literatura/Tropy a figury.md",
-    "fyz/elektrika/fotoveci.md",
-    "mat/Geometrie/Analytická/Hyperbola.md",
    "mat/Geometrie/Analytická/Příklady.md",
+    "mat/Geometrie/Analytická/kružnice a přímka.md",
    "mat/Geometrie/Analytická/Parabola.md",
+    "mat/Funkce/Exponenciální funkce.md",
+    "eko/eko.md",
+    "mat/Geometrie/Analytická/Vektor.md",
    "mat/Geometrie/Analytická/Kuželosečky.md",
+    "mat/mat.md",
+    "eko/Podnikání.md",
+    "eko/Marek.md",
+    "eko/Pracovní proces.md",
+    "fyz/elektrika/fotoveci.md",
+    "conflict-files-obsidian-git.md",
+    "export/export.md",
+    "vyp/Cenová politika a swot analýza.md",
+    "pva/pva.md",
+    "export/Buffer Overflow/Buffer Overflow.md",
+    "data/Příklady 2024-03-15 11.06.56.excalidraw.svg",
+    "data/Příklady 2024-03-15 11.06.56.excalidraw.md",
+    "cjl/literatura/Tropy a figury.md",
+    "mat/Geometrie/Analytická/Hyperbola.md",
    "mat/Geometrie/Analytická/Elipsa.md",
    "mat/Geometrie/Analytická/Kružnice.md",
-    "mat/mat.md",
    "vyp/vyp.md",
    "vyp/swot.md",
    "vyp/Vytváření značky a loga.md",
    "vyp/opakovani.md",
-    "data/Parabola 2024-03-22 11.31.41.excalidraw.md",
    "data/Parabola 2024-03-22 11.31.41.excalidraw.svg",
-    "data/Parabola 2024-03-22 11.21.34.excalidraw.md",
-    "data/Parabola 2024-03-22 11.21.03.excalidraw.md",
-    "fyz/fyz.md",
-    "fyz/elektrika/mag sila.md",
-    "eko/Hospodarsky proces.md",
-    "data/Parabola 2024-03-21 11.18.48.excalidraw.md",
-    "data/Parabola 2024-03-21 11.58.33.excalidraw.md",
    "data/Parabola 2024-03-21 11.58.33.excalidraw.svg",
    "data/Parabola 2024-03-21 11.18.48.excalidraw.svg",
-    "data/Hyperbola 2024-03-14 11.33.16.excalidraw.md",
    "data/Hyperbola 2024-03-14 11.33.16.excalidraw.svg",
-    "data/Hyperbola 2024-03-08 12.05.45.excalidraw.md",
    "data/Hyperbola 2024-03-08 12.05.45.excalidraw.svg",
-    "mat/Geometrie/Analytická/kružnice a přímka.md",
-    "data/Elipsa 2024-03-01 11.25.47.excalidraw.md",
    "data/Elipsa 2024-03-01 11.25.47.excalidraw.svg",
-    "data/Elipsa 2024-03-01 11.39.24.excalidraw.md",
    "data/Pasted image 20240301122558.png",
    "data/Pasted image 20240301120922.png",
    "data/kružnice a přímka 2024-02-29 10.17.55.excalidraw.svg",
-    "data/kružnice a přímka 2024-02-23 12.14.30.excalidraw.svg",
    "export/Buffer Overflow/data",
    "export/Buffer Overflow/plugin/chalkboard/_style.css",
    "export/Buffer Overflow/plugin/chalkboard/img",
--- a/notes/cjl/literatura/literatura.md
+++ b/notes/cjl/literatura/literatura.md
@ -14,6 +14,7 @@ imagePrefix: 'data/'
 -  [[cjl/literatura/Díla, postavy, vlastnosti|Díla, postavy, vlastnosti]]
 -  [[cjl/literatura/Jan Hus|Jan Hus]]
 -  [[cjl/literatura/Jednota bratrská|Jednota bratrská]]
+-  [[cjl/literatura/Majovci|Majovci]]
 -  [[cjl/literatura/poznávání žánrů|poznávání žánrů]]
 -  [[cjl/literatura/slohy/slohy|slohy]]
 -  [[cjl/literatura/Slovní spojení|Slovní spojení]]
--- a/11.06.56.excalidraw.md
+++ b/11.06.56.excalidraw.md
--- a/11.06.56.excalidraw.svg
+++ b/11.06.56.excalidraw.svg
--- a/notes/export/Buffer
+++ b/notes/export/Buffer
@ -0,0 +1,7 @@
+%% Zoottelkeeper: Beginning of the autogenerated index file list  %%
+-  [[export/Buffer Overflow/css/css|css]]
+-  [[export/Buffer Overflow/data/data|data]]
+-  [[export/Buffer Overflow/dist/dist|dist]]
+-  [[export/Buffer Overflow/index.html|index.html]]
+-  [[export/Buffer Overflow/plugin/plugin|plugin]]
+%% Zoottelkeeper: End of the autogenerated index file list  %%
--- a/notes/mat/Geometrie/Analytická/Příklady.md
+++ b/notes/mat/Geometrie/Analytická/Příklady.md
@ -46,3 +46,125 @@ $\frac{}2-\frac{}1=0$

 $x^2+4x+6y=0$

+hyprbola
+$E=[4;-3]$
+$F=[4;1]$
+$a=1$
+
+$\frac{(x-x_s)^2}{a^2}-\frac{(y-y_s)^2}{b^2}=1$
+
+![[Příklady 2024-03-15 11.06.56.excalidraw]]
+
+$-\frac{(x-x_s)}{b^2}+\frac{(y-y_s)}{a^2}=1$
+
+$S=[4;-1]$
+$e^2=a^2+b^2$
+$b=\sqrt{e^2-a^2}=\sqrt{4-1}=\sqrt3$
+$e=|ES|=2$
+
+$-\frac{(x-4)(x-4)}{3}+\frac{(y+1)(y+1)}1=1$
+$-\frac{x^2-8x+16}3+y^2+2y+1=1$
+$-\frac{x^2}3+\frac{8x}3-\frac{16}3+y^2+2y+1=1$
+$-\frac{x^2}3+y^2+\frac83x+2y-\frac{13}3=1$
+$-\frac13x^2+y^2+\frac83x+2y-\frac{16}3=0$
+$-x^2+3y^2+8x+6y-16=0$
+
+$o_1:x=4$
+$o_2:y=-1$
+
+$A=[4;0]$
+$B=[4;-2]$
+$C=[4-\sqrt3;-1]$
+$D=[4+\sqrt3;-1]$
+
+
+náklon: $\pm\frac{a}b$; prochází $S$
+$y=\pm\frac{a}b x+$něco
+$S\rightarrow-1=\pm\frac1{\sqrt3}4+neco$
+$neco=-1\pm\frac4{\sqrt3}$
+
+$m_1,m_2:y=\pm\frac1{\sqrt3}x-1\pm\frac4{\sqrt3}$
+
+> [!SENTENCE]
+> asymptoty u hyperboly
+> 1. typ (x-y)
+> $y=\pm\frac{B}{A}(x-x_s)+y_s$
+> 2. typ (-x+y)
+> $m_1,m_2:(y-y_s)=\pm\frac{a}b(x-x_s)$
+> $y=\pm\frac{a}b(x-x+s)$
+
+$\frac{(x-x_s)^2}{A^2}-\frac{(y-y_s)^2}{B^2}=1$
+$A=b=\sqrt3$ 
+$B=a=1$
+$\frac{(x-4)^2}3-\frac{(y+1)^2}1=1$
+
+---
+
+$A=[1;3]$
+$B=[-3;3]$
+$e=5$
+
+$S=[-1;3]$
+$a=2$
+$e^2=a^2+b^2$ 
+$b=\sqrt{e^2-a^2}$
+$b=\sqrt{25-4}=\sqrt{3*7}$
+
+$y=\pm\frac{\sqrt{21}}{2}(x+1)+3$
+
+---
+
+$S=[-2;1]$
+$B=[-2;5]$
+$A=[-2;-3]$
+$e=7$
+$a=4$
+$b=\sqrt{e^2-a^2}$
+$b=\sqrt{48-16}=\sqrt{32}=\sqrt{2*2*2*2*2}=4\sqrt2$
+
+---
+
+$m:y^2+8x-2y+1=0$
+parabola smerem doprava (vpravo je nejvyssi bod)
+
+$y^2+8x-2y+1=0$
+$y^2-2y+1=-8x$
+$(y-1)^2=-8x$
+$(y-1)^2=2*(-4)x$
+
+$S=[0;1]$
+$p=-4$
+
+$l:-2x+y-1=0$
+
+$y=2x+1$
+
+$(y-1)^2=-8x$
+$(2x+1-1)^2=-8x$
+$4x^2=-8x$
+$x^2=-2x$
+$x^2+2x=0$
+
+$D=b^2-4ac$
+$x=\frac{-b\pm\sqrt{D}}{2a}$
+
+$D=2*2$
+$x=\frac{2\pm2}{2}$
+
+$x_1=0$
+$y_1=2x+1=1$
+$x_2=-2$
+$y_2=2x+1=-3$
+
+přímka protíná parabolu v bodech $[0;1]$ a $[-2;-3]$.
+
+---
+
+$E=[1;-6]$
+$F=[1;2]$
+$b=3$
+$a=|EF|=8$
+
+$X=[1;-2]$
+
+$\frac{(x-1)^2}8+\frac{(y+2)^2}3=1$
--- a/notes/notes.md
+++ b/notes/notes.md
@ -15,7 +15,6 @@
 -  [[mat/mat|mat]]
 -  [[Maturitni cetba/Maturitni cetba|Maturitni cetba]]
 -  [[Misc/Misc|Misc]]
-  [[numbat/numbat|numbat]]
 -  [[ONA/ONA|ONA]]
 -  [[OSE/OSE|OSE]]
 -  [[Osobnosti|Osobnosti]]
--- a/notes/pva/pva.md
+++ b/notes/pva/pva.md
@ -0,0 +1,4 @@
+%% Zoottelkeeper: Beginning of the autogenerated index file list  %%
+-  [[pva/skripta|skripta]]
+-  [[pva/vasek|vasek]]
+%% Zoottelkeeper: End of the autogenerated index file list  %%
--- a/notes/vyp/Cenová
+++ b/notes/vyp/Cenová
@ -0,0 +1,19 @@
+# Cenová politika a swot analýza
+
+- metoda ceny nahrazení
+- metoda tržního srovnání
+- metoda npv
+- metoda určení ceny dle užitku zákazníka
+
+reaktivace
+- prodej zakaznikum aby si neco koupili znovu
+- idealne mit svoleni k dalsimu oslovovani
+- nejlepsi model predplatneho
+
+swot
+- silna stranka (strenghts)
+- slaba stranka (weaknesses)
+- preliztosti (oppurtunities)
+- hrozby (threats)
+
+personální swot za free jedničku, na papír (tisk nebo ručně)
--- a/notes/vyp/vyp.md
+++ b/notes/vyp/vyp.md
@ -1,5 +1,6 @@
 # vyp
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
+-  [[vyp/Cenová politika a swot analýza|Cenová politika a swot analýza]]
 -  [[vyp/opakovani|opakovani]]
 -  [[vyp/swot|swot]]
 -  [[vyp/Vytváření značky a loga|Vytváření značky a loga]]