diff --git a/doc/pub/week45/ipynb/Results/FigureFiles/votingsimple.png b/doc/pub/week45/ipynb/Results/FigureFiles/votingsimple.png index f17c69ab5..0ac856c7f 100644 Binary files a/doc/pub/week45/ipynb/Results/FigureFiles/votingsimple.png and b/doc/pub/week45/ipynb/Results/FigureFiles/votingsimple.png differ diff --git a/doc/pub/week45/ipynb/week45.ipynb b/doc/pub/week45/ipynb/week45.ipynb index 96f69256d..6e4df27da 100644 --- a/doc/pub/week45/ipynb/week45.ipynb +++ b/doc/pub/week45/ipynb/week45.ipynb @@ -877,6 +877,70 @@ }, { "cell_type": "code", +<<<<<<< HEAD + "execution_count": 3, + "id": "6206aec1", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " (0, 2)\t1.0\n", + " (0, 5)\t1.0\n", + " (0, 8)\t1.0\n", + " (1, 1)\t1.0\n", + " (1, 3)\t1.0\n", + " (1, 6)\t1.0\n", + " (2, 0)\t1.0\n", + " (2, 4)\t1.0\n", + " (2, 6)\t1.0\n", + " (3, 1)\t1.0\n", + " (3, 3)\t1.0\n", + " (3, 7)\t1.0\n", + " (4, 1)\t1.0\n", + " (4, 4)\t1.0\n", + " (4, 7)\t1.0\n", + " (5, 0)\t1.0\n", + " (5, 3)\t1.0\n", + " (5, 7)\t1.0\n", + " (6, 1)\t1.0\n", + " (6, 3)\t1.0\n", + " (6, 6)\t1.0\n", + " (7, 0)\t1.0\n", + " (7, 4)\t1.0\n", + " (7, 7)\t1.0\n", + " (8, 0)\t1.0\n", + " (8, 3)\t1.0\n", + " (8, 7)\t1.0\n", + " (9, 1)\t1.0\n", + " (9, 3)\t1.0\n", + " (9, 6)\t1.0\n", + " (10, 1)\t1.0\n", + " (10, 4)\t1.0\n", + " (10, 7)\t1.0\n", + "Train set accuracy with Decision Tree: 0.82\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "sh: dot: command not found\n" + ] + }, + { + "data": { + "text/plain": [ + "32512" + ] + }, + "execution_count": 3, + "metadata": {}, + "output_type": "execute_result" + } + ], +======= "execution_count": 2, "id": "ab9c3c9e", "metadata": { @@ -884,6 +948,7 @@ "editable": true }, "outputs": [], +>>>>>>> 6e6a5c152c3f30dc18b12384198cdca878013a84 "source": [ "# Common imports\n", "import numpy as np\n", @@ -3907,7 +3972,29 @@ ] } ], +<<<<<<< HEAD + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.8.12" + } + }, +======= "metadata": {}, +>>>>>>> 6e6a5c152c3f30dc18b12384198cdca878013a84 "nbformat": 4, "nbformat_minor": 5 }