From 872d16b743107c7b9112e36268963115e885e480 Mon Sep 17 00:00:00 2001
From: Andrew Lorimer <andrew@lorimer.id.au>
Date: Sat, 7 Jul 2018 14:57:32 +1000
Subject: [PATCH 1/1] add english, methods, spec notes

---
 english/stasiland-history.md | 49 ++++++++++++++++++++++++++++++
 methods/circ-functions.md    | 23 ++++++++++++++
 spec/graphing.md             | 59 ++++++++++++++++++++++++++++++++----
 3 files changed, 125 insertions(+), 6 deletions(-)
 create mode 100644 english/stasiland-history.md
 create mode 100644 methods/circ-functions.md

diff --git a/english/stasiland-history.md b/english/stasiland-history.md
new file mode 100644
index 0000000..2bdfbca
--- /dev/null
+++ b/english/stasiland-history.md
@@ -0,0 +1,49 @@
+# Stasiland - History
+
+## Cold war
+
+- 1945 - 1991
+- USA (cap) and USSR (com) dominated after WWII
+
+
+### Communism
+- German philosophers Marx & Engels ($\approx$ 1848)
+- industrial revolution
+- response to class struggles
+
+#### Key concets of Marxism
+- determinism (belief that communism's domination is inevitable)
+- stages of history:
+- 1. **slave society**
+- 2. **feudal**
+- 3. **capitalist** - hierarchy
+- 4. **socialist** - production is owned collectively
+- 5. **communism** - classless utopia
+- class consciousness
+- dictatorship of the proletariat
+
+### Origins of the Cold War
+
+- defeat of Nazi Germany in 1945 - Europe jointly occupied by Soviet Red Army (East), Americans and British (West)
+- tension between Stalin (Soviet) and American/British
+- 1945 - Winston Churchill warns of "iron curtain" on Europe
+- Europe and Berlin split into two halves
+
+#### Iron curtain
+- metaphor for blocks (East and West)
+- Yalta conference - Germany divided into four zones
+- US gained economic power (commodities of gold & USD)
+- Truman Doctrine - US president, challenged communism
+- Soviets blocked West Berlin
+- 1949 - Federal Republic of Germany (GDR)
+
+### Berlin
+
+- East Berlin tightly controlled by state - deprivation of essential goods
+- Ulbricht - erected Berlin Wall in $\approx$ 1953 to prevent mass exodus of E. Berlin
+
+### Fall of the Iron Curtain
+- 1985 - Gorbachev's reformist policies - "openness" and "restructuring"
+- some Communist ideals approached capitalism
+- 1973 - East and West Germany joined UN
+- 1990 - reunification
diff --git a/methods/circ-functions.md b/methods/circ-functions.md
new file mode 100644
index 0000000..d232247
--- /dev/null
+++ b/methods/circ-functions.md
@@ -0,0 +1,23 @@
+# Circular functions
+
+## Radians and degrees
+
+$$1 \thinspace \operatorname{rad}={{180 \operatorname{deg}}\over \pi}$$
+
+## Exact values
+
+## $\sin$ and $\cos$ graphs
+
+$$f(x)=a \sin(bx-c)+d$$
+$$f(x)=a \cos(bx-c)+d$$
+
+where
+$a$ is the amplitude
+$b$ is the $x$-dilation
+$c$ is the $y$-shift
+
+Period is ${2 \pi} \over b$
+Domain is $\mathbb{R}$
+Range is $[-b+c, b+c]$;
+
+Graph of $\cos(x)$ starts at $(0,1)$. Graph of $\sin(x)$ starts at $(0,0)$.
diff --git a/spec/graphing.md b/spec/graphing.md
index 94c5a4a..5d75efc 100644
--- a/spec/graphing.md
+++ b/spec/graphing.md
@@ -18,27 +18,33 @@ As $\quad x \rightarrow  \pm \infty,\quad {-1 \over x}$
 
 - set of points that satisfy a given condition
 - path traced by a point that moves according to a condition
+- graph on CAS - **conics**
 
 ### Circular loci
 
+point $P(x,y)$ has a constant distance $r$ from point $C(a,b)$ (centre)
+
+
+$$PC  = r$$
+
 $$(x-a)^2 + (y-b)^2 = r^2$$
 
-point $P(x,y)$ has a constant distance $r$ from point $C(a,b)$ (centre)
+
 
 ### Linear loci
 
-$$QP=RP$$
+$$QP  =  RP $$
 $$\sqrt{(x_Q-q_P)^2+(y_Q-y_P)^2} = \sqrt{(x_R-x_P)^2+(y_R-y_P)^2}$$
 
 points $Q$ and $R$ are fixed and have a perpendicular bisector $QR$. Therefore, any point on line $y=mx+c$ is equidistant from $QP$ and $RP$.
 
-Since the bisector of the line joining points $Q$ and $R$ is perpendicular to $QR$:
+Since the bisector of the line joining points $Q$ and $R$ is perpendicular to $QR $:
 
-$$m(QR) \times m(RP) = -1$$
+$$m( QR ) \times m( RP ) = -1$$
 
 ### Parabolic loci
 
-$$PD=PF$$
+$$PD  =  PF $$
 $$|y-z|=\sqrt{(x-x_F)^2+(y-y_F)^2}$$
 $$(y-z)^2=(x-x_F)^2+(y-y_F)^2$$
 
@@ -50,6 +56,47 @@ Fixed line $x=z$ is the **directrix**
 
 ### Elliptical loci
 
-$$F_1 P + F_2 P =k$$
+Point $P$ moves so that the sum of its distances from two fixed points $F_1$ and $F_2$ is a constant $k$.
+
+$${F_1 P}  +   F_2 P  =k$$
 
 **Two** foci at $F_1$ and $F_2$
+
+Cartesian equation for ellipses:
+$${(x-h)^2 \over a^2} + {(y-k)^2 \over b^2} = 1$$
+centered at $(h,k)$. Width is $2a$, height is $2b$.
+
+### Transformations
+$$(x,y) \rightarrow (x \prime, y \prime)$$
+
+where $x \prime$ and $y \prime$ are the transformation factors (dilation away from $x$-axis means coefficient of $y$ increases in $y \prime$, and vice versa).
+
+Transformed equation is the same as initial equation with each term divided by its dilation coefficients (must be in terms of $x\prime$ and $y\prime$).
+
+e.g.
+
+$x^2 + y^2 = 1$ is dilated $3$ from $x$, $5$ from $y$.
+Transformation rule is $(x\prime,y\prime) = (5x,3y)$
+$x={x\prime \over 5},\quad y={y\prime \over 3}$
+
+Equation $x^2 + y^2=1$ becomes
+
+$${(x\prime)^2 \over 25}+ {(y\prime)^2 \over 9}=1$$
+
+
+### Hyperbolic loci
+
+$$|(F_2P - F_1P  )| = k$$
+
+Cartesian equation for hyperbolas ($a$ and $b$ are dilation factors):
+$${(x-h)^2 \over a^2} - {(y-k)^2 \over b^2} = 1$$
+
+Asymptotes at $y-k=\pm {b \over a}(x-h$)
+
+## Parametric equations
+
+Parametric curve:
+
+$$x=f(t), \quad y=g(t)$$
+
+$t$ is the parameter
-- 
2.43.2