Skip to content

Commit 72db531

Browse files
author
StephenElston
committed
Edited text
1 parent 15ae9d1 commit 72db531

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

Module01/01-07-Quadratic Equations.ipynb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@
541541
"\n",
542542
"\\begin{equation}y = 2(x - 4)^{2} - 30\\end{equation}\n",
543543
"\n",
544-
"Let's just quickly check our math with Python:"
544+
"Let's just quickly check our math with R:"
545545
]
546546
},
547547
{
@@ -596,7 +596,7 @@
596596
"\n",
597597
"So, we know that the line of symmetry is at ***x = h*** (which is 4), and we now know that the ***y*** value when ***x*** is 0 (***h*** - ***h***) is 2. The ***y*** value at the same distance from the line of symmetry in the negative direction will be the same as the value in the positive direction, so when ***x*** is ***h*** + ***h***, the ***y*** value will also be 2.\n",
598598
"\n",
599-
"The following Python code encapulates all of this in a function that draws and annotates a parabola using only the ***a***, ***h***, and ***k*** values from a quadratic equation in vertex form:"
599+
"The following R code encapsulates all of this in a function that draws and annotates a parabola using only the ***a***, ***h***, and ***k*** values from a quadratic equation in vertex form:"
600600
]
601601
},
602602
{
@@ -688,7 +688,7 @@
688688
"metadata": {},
689689
"source": [
690690
"## Shortcuts for Solving Quadratic Equations\n",
691-
"We've spent some time in this notebook discussing how to solve quadratic equations to determine the vertex of a parabola and the ***x*** values in relation to ***y***. It's important to understand the techniques we've used, which incude:\n",
691+
"We've spent some time in this notebook discussing how to solve quadratic equations to determine the vertex of a parabola and the ***x*** values in relation to ***y***. It's important to understand the techniques we've used, which include:\n",
692692
"- Factoring\n",
693693
"- Calculating the Square Root\n",
694694
"- Completing the Square\n",
@@ -745,7 +745,7 @@
745745
"\n",
746746
"\\begin{equation}x = \\frac{--16 \\pm \\sqrt{-16^{2} - 4\\cdot2\\cdot2}}{2\\cdot2}\\end{equation}\n",
747747
"\n",
748-
"This simplifes to:\n",
748+
"This simplifies to:\n",
749749
"\n",
750750
"\\begin{equation}x = \\frac{16 \\pm \\sqrt{256 - 16}}{4}\\end{equation}\n",
751751
"\n",
@@ -763,7 +763,7 @@
763763
"\n",
764764
"\n",
765765
"\n",
766-
"The following Python code uses the vertex formula and the quadtratic formula to calculate the vertex and the -x and +x for y = 0, and then plots the resulting parabola:"
766+
"The following R code uses the vertex formula and the quadratic formula to calculate the vertex and the -x and +x for y = 0, and then plots the resulting parabola:"
767767
]
768768
},
769769
{
@@ -909,7 +909,7 @@
909909
"mimetype": "text/x-r-source",
910910
"name": "R",
911911
"pygments_lexer": "r",
912-
"version": "3.4.1"
912+
"version": "3.5.0"
913913
}
914914
},
915915
"nbformat": 4,

0 commit comments

Comments
 (0)