From 2b693f2d35ec4751a6301c23b51aeb57ee9f3d05 Mon Sep 17 00:00:00 2001 From: TerenceLiu98 Date: Mon, 22 Aug 2022 07:46:17 +0000 Subject: [PATCH] update --- .../interactive-checkpoint.ipynb | 88 ++++++++++++------ algorithm/interactive.ipynb | 62 +++--------- .../.ipynb_checkpoints/gd-checkpoint.py | 7 +- algorithm/optimization/__init__.py | 0 .../__pycache__/gd.cpython-310.pyc | Bin 7311 -> 7394 bytes algorithm/optimization/gd.py | 7 +- 6 files changed, 80 insertions(+), 84 deletions(-) create mode 100644 algorithm/optimization/__init__.py diff --git a/algorithm/.ipynb_checkpoints/interactive-checkpoint.ipynb b/algorithm/.ipynb_checkpoints/interactive-checkpoint.ipynb index 9167237..fe13a87 100644 --- a/algorithm/.ipynb_checkpoints/interactive-checkpoint.ipynb +++ b/algorithm/.ipynb_checkpoints/interactive-checkpoint.ipynb @@ -2,53 +2,87 @@ "cells": [ { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "id": "af1d5646-4b13-4039-9f76-8042bc9dbda3", "metadata": {}, "outputs": [], "source": [ - "from optimization.gd import gradient_descent_1d, gradient_descent_2d" + "from optimization.gd import *" + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "id": "0a5c51d2-8b18-4143-b6f1-73a909ccb623", + "metadata": {}, + "outputs": [ + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "6da434bb5623479ea2b213b20390410a", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "VBox(children=(HBox(children=(VBox(children=(Text(value='x**3 - x**(1/2)', description='Expression:', style=De…" + ] + }, + "metadata": {}, + "output_type": "display_data" + }, + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "603367462f0f463ea4594c07f3a20bdd", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "Output()" + ] + }, + "metadata": {}, + "output_type": "display_data" + }, + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "90dd308b94f547c3805ff23d5ad62c6f", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "Output()" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "gd1 = gradient_descent_1d(environ=\"jupyterlab\")" ] }, { "cell_type": "code", "execution_count": null, - "id": "0a5c51d2-8b18-4143-b6f1-73a909ccb623", + "id": "15c6e757-cde3-422b-be7e-3f55b7752142", "metadata": {}, "outputs": [], "source": [ "gd2 = gradient_descent_2d()" ] }, - { - "cell_type": "code", - "execution_count": 3, - "id": "f254549d-d9b0-43ac-a502-e65b7c462d05", - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "plotly.graph_objs._scatter3d.Scatter3d" - ] - }, - "execution_count": 3, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "import plotly.graph_objects as go\n", - "go.Scatter3d" - ] - }, { "cell_type": "code", "execution_count": null, - "id": "8c0f6766-4f41-419b-94a0-916a379ebcd1", + "id": "120ecde5-cee1-47c0-b1bc-c99b0cb1098e", "metadata": {}, "outputs": [], - "source": [] + "source": [ + "import os\n", + "running_in_voila = os.environ.get('SERVER_SOFTWARE','jupyterlab').startswith('voila')" + ] } ], "metadata": { diff --git a/algorithm/interactive.ipynb b/algorithm/interactive.ipynb index 8a6b827..fe13a87 100644 --- a/algorithm/interactive.ipynb +++ b/algorithm/interactive.ipynb @@ -7,7 +7,7 @@ "metadata": {}, "outputs": [], "source": [ - "from optimization.gd import gradient_descent_1d, gradient_descent_2d" + "from optimization.gd import *" ] }, { @@ -19,7 +19,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "7a9a1093220546d3b7e4cd7606a7c704", + "model_id": "6da434bb5623479ea2b213b20390410a", "version_major": 2, "version_minor": 0 }, @@ -33,7 +33,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "11824eb29354454eb05a41c4fd7e6539", + "model_id": "603367462f0f463ea4594c07f3a20bdd", "version_major": 2, "version_minor": 0 }, @@ -47,7 +47,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "23bd6107b7ea4f8280ab57d100ab4619", + "model_id": "90dd308b94f547c3805ff23d5ad62c6f", "version_major": 2, "version_minor": 0 }, @@ -60,58 +60,15 @@ } ], "source": [ - "gd1 = gradient_descent_1d()" + "gd1 = gradient_descent_1d(environ=\"jupyterlab\")" ] }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "id": "15c6e757-cde3-422b-be7e-3f55b7752142", "metadata": {}, - "outputs": [ - { - "data": { - "application/vnd.jupyter.widget-view+json": { - "model_id": "f3cbcf4a398647d787391f02fea55a8e", - "version_major": 2, - "version_minor": 0 - }, - "text/plain": [ - "VBox(children=(HBox(children=(VBox(children=(Text(value='(sin(x1) - 2) ** 2 + (sin(x2) - 2) ** 2', description…" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "application/vnd.jupyter.widget-view+json": { - "model_id": "c12e073565ee4053b890cd4dcded4610", - "version_major": 2, - "version_minor": 0 - }, - "text/plain": [ - "Output()" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "application/vnd.jupyter.widget-view+json": { - "model_id": "3be9b459745d48dd9c367b5a7866c2bc", - "version_major": 2, - "version_minor": 0 - }, - "text/plain": [ - "Output()" - ] - }, - "metadata": {}, - "output_type": "display_data" - } - ], + "outputs": [], "source": [ "gd2 = gradient_descent_2d()" ] @@ -122,7 +79,10 @@ "id": "120ecde5-cee1-47c0-b1bc-c99b0cb1098e", "metadata": {}, "outputs": [], - "source": [] + "source": [ + "import os\n", + "running_in_voila = os.environ.get('SERVER_SOFTWARE','jupyterlab').startswith('voila')" + ] } ], "metadata": { diff --git a/algorithm/optimization/.ipynb_checkpoints/gd-checkpoint.py b/algorithm/optimization/.ipynb_checkpoints/gd-checkpoint.py index 3ac8420..a3f858a 100644 --- a/algorithm/optimization/.ipynb_checkpoints/gd-checkpoint.py +++ b/algorithm/optimization/.ipynb_checkpoints/gd-checkpoint.py @@ -12,13 +12,13 @@ from tqdm import tqdm import plotly.graph_objects as go import plotly.io as pio -pio.renderers.default = 'iframe' # or 'notebook' or 'colab' or 'jupyterlab' import warnings warnings.filterwarnings("ignore") class gradient_descent_1d(object): - def __init__(self): + def __init__(self, environ:str="jupyterlab"): + pio.renderers.default = environ # 'notebook' or 'colab' or 'jupyterlab' self.wg_expr = widgets.Text(value="x**3 - x**(1/2)", description="Expression:", style={'description_width': 'initial'}) @@ -101,7 +101,8 @@ class gradient_descent_1d(object): class gradient_descent_2d(object): - def __init__(self): + def __init__(self, environ:str="jupyterlab"): + pio.renderers.default = environ # 'notebook' or 'colab' or 'jupyterlab' self.wg_expr = widgets.Text(value="(sin(x1) - 2) ** 2 + (sin(x2) - 2) ** 2", description="Expression:") #style={'description_width': 'initial'}) diff --git a/algorithm/optimization/__init__.py b/algorithm/optimization/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/algorithm/optimization/__pycache__/gd.cpython-310.pyc b/algorithm/optimization/__pycache__/gd.cpython-310.pyc index 7b5f97c9affeb17970afe97d137b375e09d18ae6..7e33b9b29ba4eeb1979aaaa55d0fac1540971b53 100644 GIT binary patch delta 2726 zcmai0TWl0n7@o`S>~y!=ZfRlLQV_YxNu?7C%d{4>=StJPQ) zF9`LhFKR4CF*W)`G%-H;h|%Z+iDusL4PxX$O@3T zSRz1*5)U;k+lPJn1kaYaT8s~ z!Et_>9jY()yx2Vm$1ec@`_1C-^$% z61hEwB3n4!bS9d4wB!uY#EA_Ko-x5EnQvfz+614TNHT-@bgr7Cbx0d)lUIyy^l9>( zIk&w%G%NXXSVvw-c;t~E#)Ox3`wM}*VE&ad!iet`vedxaI+6iu>x{?J)eZUkXWGal2;Sc6SXZ^FB|KJh7TZ~w>KE9c=QY$ z-AVLU_|9I@EA{)CS!(kp-ZWb%^BYdNO}vy)`9uu7Rpgd(e2!ptfia8u5`#NHWfib3 zpX(=2#*+>DUfGtMV;x869=Rd8bfbDmJQ?rWGEy)52xbp~G6x2hhemcFG_&~}odB

+8Kj?nZ2q74XH4M2a=7C`MZl%*2X^F%WbA8KT4Dc!!q zj@73LeD7#e>o6tQf-L076?v}|^a#)I#c!8Tw^fyTdu51BsSK)%pa~HHJu;PVu^+2y zgz{Mj`i5EkAP(^qT?4mvwCYrG`cLxk@f~2z_%YQgFQxV^*~l(E0N4cB3b0JRKU(;7Vvcmi-3pf>6;wsJpwkL$M$nP|14kH|ym zMfw@}e0ud37om_Z>IHa!EFi~lBFV4m`HPD#9b-Y6T#xyW0eygD@}Klcf!neARpoIq zKxM{hQHddADFvbm+hN`QUN_(m`n^KwR!y%cK)livwH2y@2AKO=UTIymW)QQGOBw<^ z3wREos^mqs9IF)Mdyn~-TiCfA0bJ*cK9Psp9yrp4SQ{`!anMJYn5r~h!i1`imtnoa z5ZXo0e=Jg1xQ{6nY*A~m7zu>J$LHo01p`$%!#PyWXa^PQgepw3u delta 2756 zcmb7GTWl0n7@pfsXS>~YE7e{oq?DpvC`2#?%B>ZVYXlYXGF8`U&+M}8-u!1)TPUs< zR1^`(sL>Dw9!Y%TMMGku4?bz)qZwl~MopUdX7t7D|D9Rc6w8B?oNxZ~{pb99F8}|{ zem`<{q_vz(HY@y;zWZ_Fvw?H1z3Rv3)|?zQ-CL$QGhIRvYN6ZicDpb3h^9-bs_apO zCE_O)5qFoqpxeFNZx#veCuDz_P!B8VmUBPZajR7J-HCE}Iv7>EYa0K?7`I=B7+l3x zg<@+$71~L~)`cz%ej6etOn%2ild$-0iZ};r4wvM}5qY=dXN2ob;=Nu>svPIv2X>6x zUEI7L?)l1;ir@&GS4HehO`lUT8q>NkIr_geSVOYBsRe9Ivb?ngtjTPXXc5T;ti^0x zw2HPfD#vSD>DpW0QmJ@`oPS384W_1_X| zXn1ZRds(58;CJIl{AL{AHilq4_Q{@MHfS}2ZIw%z$wGc|I&7LO7b{iYrL}ObVF-;% zq3qK-^fv)UuE7>q8?U(LyxJqj4}eGkbbtZq4~|+xdj{DIO{Y?EOCr>r36E}t(*hl< zP`>1cX0}X4$EQ_rG%=*(v>ATGp_~_LGbP#?d~GdHUAKVIEAjZ3s)^L#0pB(cF58J& z>TGBT$9KY5mYkwXNTJIbJsJ!owwf40rp27 zE3sqYQtx;?h&-sCJ@S;gz^Ww^a4g z%c7%2+7xVV9mvsE&>I1xfH6ShZlonACE3xz&4UhEilti1t)`Yv0zb)Z!GrT3<3=qE zkcPl%UsAiV82rJ*xKQe1APWa7pbBV>F8ez7jYt(_AC+%FV*qwX@*-uWE1OxQkVLs?N)5@8F;d%N^DJciV7JD^5v^YObB_WBTyWFyXX= zeW^`D=}zinn^pk&0W#NC!jg3+tME2-2ZIk%hk6_LC$A1ye3YBFfgxDiKD7brLE8a4 z0E;RDJD!E}PKIOse1RQTzG=Uz)^Z>bF0F=onZyGmi}r5NyD>I7v$}74-}vzpLw(0j zJVtvkv?r1xR6&&e*QzCqd6h!mry5*3zyQc?qC{vPAP(3Ms0{*52A0JtOV9x}ZL^Rs zIfa~UlvsWmszmo-@Ik=!f<&kvdJS+d;2prb09i^8z&ZlB?l5C0lb5fY@AyjFD>wcY z2E7evgpf+~5V(f{j{xMkJ;+w>i_h`=JerP0wL2bM?Hp832S0Rf*#*gx8b*)9dII18 zCK!$-d7G}crs&YLOWw8l@V^Ie0oh=p>y*IHu>|e}GY*ggppNqLD9={fl(Iw9Y=`l~ zk=)!Nq*ygXiprQIdL0wb0wBqD0ymlAi|pc?{EtBMhzmjY(!#xOU_v7U8|VKfJ8;DfIqqUP?jrE% z<#H#X;pdC49rI?3m03dOQ85UY4y%1Zs(0TIPREYpZ$V*pUA`P@-1JJmY{!W|?=EqI xg-ycEI@N+7JlVT)Z4wa>f3XFH*0y3