Skip to content

pull #6

Merged
merged 2 commits into from
Mar 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 22 additions & 7 deletions lecture_16/lecture_16.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -20644,7 +20644,7 @@
},
{
"cell_type": "code",
"execution_count": 123,
"execution_count": 200,
"metadata": {
"collapsed": false
},
Expand Down Expand Up @@ -20793,24 +20793,38 @@
"</g>\n",
"<g color=\"black\" fill=\"none\" stroke=\"currentColor\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-width=\"0.50\">\n",
"</g>\n",
"\t<g id=\"gnuplot_plot_1a\"><title>gnuplot_plot_1a</title>\n",
"<g color=\"white\" fill=\"none\" stroke=\"currentColor\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-width=\"3.00\">\n",
"<g color=\"black\" fill=\"none\" stroke=\"currentColor\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-width=\"1.00\">\n",
"</g>\n",
"<g color=\"black\" fill=\"none\" stroke=\"currentColor\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-width=\"1.00\">\n",
"\t<path d=\"M80.2,121.7 L80.2,25.7 L246.0,25.7 L246.0,121.7 L80.2,121.7 Z \" stroke=\"black\"/></g>\n",
"\t<g id=\"gnuplot_plot_1a\"><title>data</title>\n",
"<g color=\"white\" fill=\"none\" stroke=\"black\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-width=\"3.00\">\n",
"</g>\n",
"<g color=\"black\" fill=\"none\" stroke=\"currentColor\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-width=\"3.00\">\n",
"\t<g onmousemove=\"gnuplot_svg.showHypertext(evt,'')\" onmouseout=\"gnuplot_svg.hideHypertext()\"><title> </title>\n",
"\t<use color=\"rgb( 0, 0, 255)\" transform=\"translate(71.9,289.8) scale(12.00)\" xlink:href=\"#gpPt5\"/></g>\n",
"\t<g fill=\"rgb(0,0,0)\" font-family=\"{}\" font-size=\"16.00\" stroke=\"none\" text-anchor=\"end\" transform=\"translate(246.0,55.7)\">\n",
"\t\t<text><tspan font-family=\"{}\">data</tspan></text>\n",
"\t</g>\n",
"</g>\n",
"<g color=\"black\" fill=\"none\" stroke=\"currentColor\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-width=\"3.00\">\n",
"\t<use color=\"rgb( 0, 0, 255)\" transform=\"translate(71.9,289.8) scale(12.00)\" xlink:href=\"#gpPt5\"/>\n",
"\t<use color=\"rgb( 0, 0, 255)\" transform=\"translate(138.1,283.6) scale(12.00)\" xlink:href=\"#gpPt5\"/>\n",
"\t<use color=\"rgb( 0, 0, 255)\" transform=\"translate(204.2,240.7) scale(12.00)\" xlink:href=\"#gpPt5\"/>\n",
"\t<use color=\"rgb( 0, 0, 255)\" transform=\"translate(270.4,217.2) scale(12.00)\" xlink:href=\"#gpPt5\"/>\n",
"\t<use color=\"rgb( 0, 0, 255)\" transform=\"translate(336.5,208.9) scale(12.00)\" xlink:href=\"#gpPt5\"/>\n",
"\t<use color=\"rgb( 0, 0, 255)\" transform=\"translate(402.7,124.6) scale(12.00)\" xlink:href=\"#gpPt5\"/>\n",
"\t<use color=\"rgb( 0, 0, 255)\" transform=\"translate(468.8,178.5) scale(12.00)\" xlink:href=\"#gpPt5\"/>\n",
"\t<use color=\"rgb( 0, 0, 255)\" transform=\"translate(535.0,92.8) scale(12.00)\" xlink:href=\"#gpPt5\"/>\n",
"\t<use color=\"rgb( 0, 0, 255)\" transform=\"translate(118.3,49.7) scale(12.00)\" xlink:href=\"#gpPt5\"/>\n",
"</g>\n",
"\t</g>\n",
"\t<g id=\"gnuplot_plot_2a\"><title>gnuplot_plot_2a</title>\n",
"\t<g id=\"gnuplot_plot_2a\"><title>best-fit</title>\n",
"<g color=\"black\" fill=\"none\" stroke=\"currentColor\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-width=\"3.00\">\n",
"\t<g fill=\"rgb(0,0,0)\" font-family=\"{}\" font-size=\"16.00\" stroke=\"none\" text-anchor=\"end\" transform=\"translate(246.0,103.7)\">\n",
"\t\t<text><tspan font-family=\"{}\">best-fit</tspan></text>\n",
"\t</g>\n",
"</g>\n",
"<g color=\"black\" fill=\"none\" stroke=\"currentColor\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-width=\"3.00\">\n",
"\t<path d=\"M71.9,298.7 L138.1,271.8 L204.2,244.9 L270.4,218.0 L336.5,191.0 L402.7,164.1 L468.8,137.2 L535.0,110.3 \" stroke=\"rgb( 0, 128, 0)\"/></g>\n",
"\t<path d=\"M91.4,97.7 L145.2,97.7 M71.9,298.7 L138.1,271.8 L204.2,244.9 L270.4,218.0 L336.5,191.0 L402.7,164.1 L468.8,137.2 L535.0,110.3 \" stroke=\"rgb( 0, 128, 0)\"/></g>\n",
"\t</g>\n",
"<g color=\"white\" fill=\"none\" stroke=\"rgb( 0, 128, 0)\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-width=\"2.00\">\n",
"</g>\n",
Expand Down Expand Up @@ -20851,6 +20865,7 @@
"a=A\\b\n",
"\n",
"plot(x,y,'o',x,a(1)+a(2)*x)\n",
"legend('data','best-fit','Location','NorthWest')\n",
"xlabel('Force (N)')\n",
"ylabel('velocity (m/s)')"
]
Expand Down