diff --git a/doc/pub/week39/html/week39-reveal.html b/doc/pub/week39/html/week39-reveal.html index 31fd0418e..c5d92e266 100644 --- a/doc/pub/week39/html/week39-reveal.html +++ b/doc/pub/week39/html/week39-reveal.html @@ -3495,7 +3495,7 @@ delta_momentum = 0.3
# Using Autograd to calculate gradients using SGD
-# OLS example
+# OLS example with AdaGrad
 from random import random, seed
 import numpy as np
 import autograd.numpy as np
@@ -3539,9 +3539,9 @@ M = 5   #size o
 m = int(n/M) #number of minibatches
 theta = np.random.randn(2,1)
 
-
 # Including AdaGrad
 delta  = 0.000001
+r = [0.0 for _ in range(gradients.shape[0])]
 for epoch in range(n_epochs):
     for i in range(m):
         random_index = M*np.random.randint(m)
@@ -3551,8 +3551,8 @@ delta  = 0.000001
         # calculate squared gradient by Hadamard multiplication
         r -= gradients*gradients
         # compute update
-        update = (1.0/delta+np.sqrt(r))*gradients
-        theta = eta*update
+        update = 1.0/(delta+np.sqrt(r))*gradients
+        theta -= eta*update
 print("theta from own AdaGrad")
 print(theta)
 
diff --git a/doc/pub/week39/html/week39-solarized.html b/doc/pub/week39/html/week39-solarized.html index 76bc2d149..d6d819d95 100644 --- a/doc/pub/week39/html/week39-solarized.html +++ b/doc/pub/week39/html/week39-solarized.html @@ -3422,7 +3422,7 @@ delta_momentum = 0.3
# Using Autograd to calculate gradients using SGD
-# OLS example
+# OLS example with AdaGrad
 from random import random, seed
 import numpy as np
 import autograd.numpy as np
@@ -3466,9 +3466,9 @@ M = 5   #size o
 m = int(n/M) #number of minibatches
 theta = np.random.randn(2,1)
 
-
 # Including AdaGrad
 delta  = 0.000001
+r = [0.0 for _ in range(gradients.shape[0])]
 for epoch in range(n_epochs):
     for i in range(m):
         random_index = M*np.random.randint(m)
@@ -3478,8 +3478,8 @@ delta  = 0.000001
         # calculate squared gradient by Hadamard multiplication
         r -= gradients*gradients
         # compute update
-        update = (1.0/delta+np.sqrt(r))*gradients
-        theta = eta*update
+        update = 1.0/(delta+np.sqrt(r))*gradients
+        theta -= eta*update
 print("theta from own AdaGrad")
 print(theta)
 
diff --git a/doc/pub/week39/html/week39.html b/doc/pub/week39/html/week39.html index 953335216..2d7932742 100644 --- a/doc/pub/week39/html/week39.html +++ b/doc/pub/week39/html/week39.html @@ -3499,7 +3499,7 @@ delta_momentum =
# Using Autograd to calculate gradients using SGD
-# OLS example
+# OLS example with AdaGrad
 from random import random, seed
 import numpy as np
 import autograd.numpy as np
@@ -3543,9 +3543,9 @@ M = 5
 m = int(n/M) #number of minibatches
 theta = np.random.randn(2,1)
 
-
 # Including AdaGrad
 delta  = 0.000001
+r = [0.0 for _ in range(gradients.shape[0])]
 for epoch in range(n_epochs):
     for i in range(m):
         random_index = M*np.random.randint(m)
@@ -3555,8 +3555,8 @@ delta  = 0.0000
         # calculate squared gradient by Hadamard multiplication
         r -= gradients*gradients
         # compute update
-        update = (1.0/delta+np.sqrt(r))*gradients
-        theta = eta*update
+        update = 1.0/(delta+np.sqrt(r))*gradients
+        theta -= eta*update
 print("theta from own AdaGrad")
 print(theta)
 
diff --git a/doc/pub/week39/ipynb/ipynb-week39-src.tar.gz b/doc/pub/week39/ipynb/ipynb-week39-src.tar.gz index 9b9d1c2cb..a6ec70f87 100644 Binary files a/doc/pub/week39/ipynb/ipynb-week39-src.tar.gz and b/doc/pub/week39/ipynb/ipynb-week39-src.tar.gz differ diff --git a/doc/pub/week39/ipynb/week39.ipynb b/doc/pub/week39/ipynb/week39.ipynb index 1e8f64dce..0503b55c1 100644 --- a/doc/pub/week39/ipynb/week39.ipynb +++ b/doc/pub/week39/ipynb/week39.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "markdown", - "id": "3090dab9", + "id": "70c42524", "metadata": { "editable": true }, @@ -14,7 +14,7 @@ }, { "cell_type": "markdown", - "id": "ab0dea94", + "id": "cffad5f6", "metadata": { "editable": true }, @@ -29,7 +29,7 @@ }, { "cell_type": "markdown", - "id": "9db200b9", + "id": "34c8fbcd", "metadata": { "editable": true }, @@ -55,7 +55,7 @@ }, { "cell_type": "markdown", - "id": "daa1efbf", + "id": "9e3863c0", "metadata": { "editable": true }, @@ -76,7 +76,7 @@ }, { "cell_type": "markdown", - "id": "d67302c7", + "id": "aac1849d", "metadata": { "editable": true }, @@ -93,7 +93,7 @@ }, { "cell_type": "markdown", - "id": "6cffc694", + "id": "eda84591", "metadata": { "editable": true }, @@ -108,7 +108,7 @@ }, { "cell_type": "markdown", - "id": "7c0e4b41", + "id": "e5e6a3fc", "metadata": { "editable": true }, @@ -118,7 +118,7 @@ }, { "cell_type": "markdown", - "id": "a4d042c9", + "id": "f5a2093d", "metadata": { "editable": true }, @@ -134,7 +134,7 @@ }, { "cell_type": "markdown", - "id": "a2e6e6ca", + "id": "ababb255", "metadata": { "editable": true }, @@ -146,7 +146,7 @@ }, { "cell_type": "markdown", - "id": "44ba6d7f", + "id": "81ee053a", "metadata": { "editable": true }, @@ -157,7 +157,7 @@ }, { "cell_type": "markdown", - "id": "f83dfe9e", + "id": "22359c61", "metadata": { "editable": true }, @@ -169,7 +169,7 @@ }, { "cell_type": "markdown", - "id": "36ae9e1f", + "id": "f41b1042", "metadata": { "editable": true }, @@ -179,7 +179,7 @@ }, { "cell_type": "markdown", - "id": "f68dff87", + "id": "e7ff9f7e", "metadata": { "editable": true }, @@ -193,7 +193,7 @@ }, { "cell_type": "markdown", - "id": "1c04ada4", + "id": "488f1674", "metadata": { "editable": true }, @@ -205,7 +205,7 @@ }, { "cell_type": "markdown", - "id": "57d59ede", + "id": "fc58bce3", "metadata": { "editable": true }, @@ -215,7 +215,7 @@ }, { "cell_type": "markdown", - "id": "6731c775", + "id": "9063bdf3", "metadata": { "editable": true }, @@ -227,7 +227,7 @@ }, { "cell_type": "markdown", - "id": "344395d0", + "id": "b60c1a1e", "metadata": { "editable": true }, @@ -239,7 +239,7 @@ }, { "cell_type": "markdown", - "id": "030a7dd9", + "id": "1836b157", "metadata": { "editable": true }, @@ -259,7 +259,7 @@ }, { "cell_type": "markdown", - "id": "f714706e", + "id": "e1ecf421", "metadata": { "editable": true }, @@ -275,7 +275,7 @@ }, { "cell_type": "markdown", - "id": "bc0a90df", + "id": "d1696b80", "metadata": { "editable": true }, @@ -291,7 +291,7 @@ }, { "cell_type": "markdown", - "id": "2ced70dc", + "id": "a9018f84", "metadata": { "editable": true }, @@ -302,7 +302,7 @@ }, { "cell_type": "markdown", - "id": "f69cd4d8", + "id": "d8f2841f", "metadata": { "editable": true }, @@ -314,7 +314,7 @@ }, { "cell_type": "markdown", - "id": "9478068d", + "id": "9623e5a1", "metadata": { "editable": true }, @@ -324,7 +324,7 @@ }, { "cell_type": "markdown", - "id": "66e95761", + "id": "624339a9", "metadata": { "editable": true }, @@ -336,7 +336,7 @@ }, { "cell_type": "markdown", - "id": "3b1f9fb4", + "id": "642946f7", "metadata": { "editable": true }, @@ -346,7 +346,7 @@ }, { "cell_type": "markdown", - "id": "26695601", + "id": "6c05a90c", "metadata": { "editable": true }, @@ -358,7 +358,7 @@ }, { "cell_type": "markdown", - "id": "1951019b", + "id": "edcd1d95", "metadata": { "editable": true }, @@ -380,7 +380,7 @@ }, { "cell_type": "markdown", - "id": "b38f86e5", + "id": "2928dbd1", "metadata": { "editable": true }, @@ -393,7 +393,7 @@ }, { "cell_type": "markdown", - "id": "81a4e8bd", + "id": "14edc1f1", "metadata": { "editable": true }, @@ -406,7 +406,7 @@ }, { "cell_type": "markdown", - "id": "12f207a8", + "id": "c6fcded8", "metadata": { "editable": true }, @@ -416,7 +416,7 @@ }, { "cell_type": "markdown", - "id": "440c1a73", + "id": "5d46ef00", "metadata": { "editable": true }, @@ -434,7 +434,7 @@ }, { "cell_type": "markdown", - "id": "9e301758", + "id": "29230b7d", "metadata": { "editable": true }, @@ -444,7 +444,7 @@ }, { "cell_type": "markdown", - "id": "714caf32", + "id": "4050e8df", "metadata": { "editable": true }, @@ -459,7 +459,7 @@ }, { "cell_type": "markdown", - "id": "79945812", + "id": "b9acd139", "metadata": { "editable": true }, @@ -469,7 +469,7 @@ }, { "cell_type": "markdown", - "id": "821bfe43", + "id": "378b9253", "metadata": { "editable": true }, @@ -483,7 +483,7 @@ }, { "cell_type": "markdown", - "id": "7a329d62", + "id": "0f5c3c0d", "metadata": { "editable": true }, @@ -493,7 +493,7 @@ }, { "cell_type": "markdown", - "id": "a759ca7a", + "id": "bb12d0e0", "metadata": { "editable": true }, @@ -507,7 +507,7 @@ }, { "cell_type": "markdown", - "id": "37bd514e", + "id": "93274086", "metadata": { "editable": true }, @@ -522,7 +522,7 @@ }, { "cell_type": "markdown", - "id": "aa97f992", + "id": "122ee26a", "metadata": { "editable": true }, @@ -539,7 +539,7 @@ }, { "cell_type": "markdown", - "id": "67fa21b3", + "id": "4235ab9d", "metadata": { "editable": true }, @@ -551,7 +551,7 @@ }, { "cell_type": "markdown", - "id": "f8f33cfa", + "id": "4fc1a870", "metadata": { "editable": true }, @@ -565,7 +565,7 @@ }, { "cell_type": "markdown", - "id": "12fcbcb4", + "id": "57d01841", "metadata": { "editable": true }, @@ -580,7 +580,7 @@ }, { "cell_type": "markdown", - "id": "247f240a", + "id": "1d84085f", "metadata": { "editable": true }, @@ -592,7 +592,7 @@ }, { "cell_type": "markdown", - "id": "a7f4feb0", + "id": "a2a841e7", "metadata": { "editable": true }, @@ -603,7 +603,7 @@ }, { "cell_type": "markdown", - "id": "581dc6c7", + "id": "cfe42a8d", "metadata": { "editable": true }, @@ -631,7 +631,7 @@ }, { "cell_type": "markdown", - "id": "115cc2f5", + "id": "37e43c57", "metadata": { "editable": true }, @@ -653,7 +653,7 @@ }, { "cell_type": "markdown", - "id": "981820fd", + "id": "d73f9ec1", "metadata": { "editable": true }, @@ -675,7 +675,7 @@ }, { "cell_type": "markdown", - "id": "71769268", + "id": "9ef05d17", "metadata": { "editable": true }, @@ -687,7 +687,7 @@ }, { "cell_type": "markdown", - "id": "7236d516", + "id": "84ad8b8f", "metadata": { "editable": true }, @@ -724,7 +724,7 @@ }, { "cell_type": "markdown", - "id": "1be5600b", + "id": "b73096ec", "metadata": { "editable": true }, @@ -752,7 +752,7 @@ }, { "cell_type": "markdown", - "id": "bc9479dd", + "id": "01363dd6", "metadata": { "editable": true }, @@ -782,7 +782,7 @@ }, { "cell_type": "markdown", - "id": "b287dc6b", + "id": "3035712a", "metadata": { "editable": true }, @@ -802,7 +802,7 @@ }, { "cell_type": "markdown", - "id": "f3b051c9", + "id": "5499b54c", "metadata": { "editable": true }, @@ -814,7 +814,7 @@ }, { "cell_type": "markdown", - "id": "1d60b0bb", + "id": "c564beea", "metadata": { "editable": true }, @@ -824,7 +824,7 @@ }, { "cell_type": "markdown", - "id": "cee9ebc6", + "id": "2d78636b", "metadata": { "editable": true }, @@ -836,7 +836,7 @@ }, { "cell_type": "markdown", - "id": "c069bba3", + "id": "ae1fa6c3", "metadata": { "editable": true }, @@ -848,7 +848,7 @@ }, { "cell_type": "markdown", - "id": "7c83fe7f", + "id": "a4f97f65", "metadata": { "editable": true }, @@ -860,7 +860,7 @@ }, { "cell_type": "markdown", - "id": "cda7891d", + "id": "a3990eaa", "metadata": { "editable": true }, @@ -872,7 +872,7 @@ }, { "cell_type": "markdown", - "id": "7edb97a2", + "id": "c0d95c8a", "metadata": { "editable": true }, @@ -883,7 +883,7 @@ }, { "cell_type": "markdown", - "id": "aab86b4c", + "id": "da0edbb9", "metadata": { "editable": true }, @@ -896,7 +896,7 @@ }, { "cell_type": "markdown", - "id": "6d5fa655", + "id": "6129f857", "metadata": { "editable": true }, @@ -908,7 +908,7 @@ }, { "cell_type": "markdown", - "id": "551ffdae", + "id": "7ddc7a65", "metadata": { "editable": true }, @@ -918,7 +918,7 @@ }, { "cell_type": "markdown", - "id": "697ac0c7", + "id": "bad0a0c3", "metadata": { "editable": true }, @@ -930,7 +930,7 @@ }, { "cell_type": "markdown", - "id": "2501fd5b", + "id": "ac85206a", "metadata": { "editable": true }, @@ -940,7 +940,7 @@ }, { "cell_type": "markdown", - "id": "3ef8cf2e", + "id": "52646ec0", "metadata": { "editable": true }, @@ -951,7 +951,7 @@ }, { "cell_type": "markdown", - "id": "2cb81217", + "id": "c88c7f41", "metadata": { "editable": true }, @@ -963,7 +963,7 @@ }, { "cell_type": "markdown", - "id": "3f57e6c0", + "id": "b817b6a2", "metadata": { "editable": true }, @@ -975,7 +975,7 @@ }, { "cell_type": "markdown", - "id": "e4f4feb2", + "id": "999b8908", "metadata": { "editable": true }, @@ -987,7 +987,7 @@ }, { "cell_type": "markdown", - "id": "e311ea5a", + "id": "a86f550e", "metadata": { "editable": true }, @@ -998,7 +998,7 @@ }, { "cell_type": "markdown", - "id": "ccdf1d1f", + "id": "c6fad45a", "metadata": { "editable": true }, @@ -1009,7 +1009,7 @@ }, { "cell_type": "markdown", - "id": "032554f8", + "id": "d90ca11a", "metadata": { "editable": true }, @@ -1021,7 +1021,7 @@ }, { "cell_type": "markdown", - "id": "e5278ef0", + "id": "0771db2b", "metadata": { "editable": true }, @@ -1031,7 +1031,7 @@ }, { "cell_type": "markdown", - "id": "0abff66a", + "id": "6c2d2fb6", "metadata": { "editable": true }, @@ -1043,7 +1043,7 @@ }, { "cell_type": "markdown", - "id": "aaa20c9f", + "id": "528ce8f1", "metadata": { "editable": true }, @@ -1053,7 +1053,7 @@ }, { "cell_type": "markdown", - "id": "88de1b2c", + "id": "03f1a1a7", "metadata": { "editable": true }, @@ -1065,7 +1065,7 @@ }, { "cell_type": "markdown", - "id": "a6b7e7eb", + "id": "1c963f61", "metadata": { "editable": true }, @@ -1075,7 +1075,7 @@ }, { "cell_type": "markdown", - "id": "f48a1322", + "id": "3b341cb6", "metadata": { "editable": true }, @@ -1087,7 +1087,7 @@ }, { "cell_type": "markdown", - "id": "fde12a28", + "id": "24a25a5b", "metadata": { "editable": true }, @@ -1097,7 +1097,7 @@ }, { "cell_type": "markdown", - "id": "47d4f0f8", + "id": "e1f575b2", "metadata": { "editable": true }, @@ -1109,7 +1109,7 @@ }, { "cell_type": "markdown", - "id": "1571831b", + "id": "733353ab", "metadata": { "editable": true }, @@ -1120,7 +1120,7 @@ { "cell_type": "code", "execution_count": 1, - "id": "dcc70cc9", + "id": "29e79c22", "metadata": { "collapsed": false, "editable": true @@ -1153,7 +1153,7 @@ }, { "cell_type": "markdown", - "id": "91654b7a", + "id": "9f0b7abf", "metadata": { "editable": true }, @@ -1164,7 +1164,7 @@ { "cell_type": "code", "execution_count": 2, - "id": "43f2a763", + "id": "d9b290ba", "metadata": { "collapsed": false, "editable": true @@ -1178,7 +1178,7 @@ }, { "cell_type": "markdown", - "id": "f6ad5e15", + "id": "16c54be4", "metadata": { "editable": true }, @@ -1189,7 +1189,7 @@ { "cell_type": "code", "execution_count": 3, - "id": "be373c58", + "id": "3afefbb0", "metadata": { "collapsed": false, "editable": true @@ -1202,7 +1202,7 @@ }, { "cell_type": "markdown", - "id": "e48b0f67", + "id": "623773d6", "metadata": { "editable": true }, @@ -1213,7 +1213,7 @@ { "cell_type": "code", "execution_count": 4, - "id": "bc6ae2a9", + "id": "14404bfb", "metadata": { "collapsed": false, "editable": true @@ -1231,7 +1231,7 @@ }, { "cell_type": "markdown", - "id": "5618d37d", + "id": "938e1614", "metadata": { "editable": true }, @@ -1242,7 +1242,7 @@ { "cell_type": "code", "execution_count": 5, - "id": "0d22b148", + "id": "03906b76", "metadata": { "collapsed": false, "editable": true @@ -1257,7 +1257,7 @@ }, { "cell_type": "markdown", - "id": "98c2a710", + "id": "bef38425", "metadata": { "editable": true }, @@ -1267,7 +1267,7 @@ }, { "cell_type": "markdown", - "id": "2b589600", + "id": "974eb8f3", "metadata": { "editable": true }, @@ -1281,7 +1281,7 @@ }, { "cell_type": "markdown", - "id": "8cb6ed9e", + "id": "93e05093", "metadata": { "editable": true }, @@ -1293,7 +1293,7 @@ }, { "cell_type": "markdown", - "id": "d05dc72f", + "id": "a7b2c6eb", "metadata": { "editable": true }, @@ -1304,7 +1304,7 @@ }, { "cell_type": "markdown", - "id": "612657ad", + "id": "1be3929c", "metadata": { "editable": true }, @@ -1316,7 +1316,7 @@ }, { "cell_type": "markdown", - "id": "c14e7863", + "id": "9436c590", "metadata": { "editable": true }, @@ -1327,7 +1327,7 @@ }, { "cell_type": "markdown", - "id": "54f184de", + "id": "c41bb077", "metadata": { "editable": true }, @@ -1338,7 +1338,7 @@ }, { "cell_type": "markdown", - "id": "acd6d248", + "id": "3aa89379", "metadata": { "editable": true }, @@ -1350,7 +1350,7 @@ }, { "cell_type": "markdown", - "id": "24083680", + "id": "f930e2c1", "metadata": { "editable": true }, @@ -1360,7 +1360,7 @@ }, { "cell_type": "markdown", - "id": "b41beb62", + "id": "9fd91284", "metadata": { "editable": true }, @@ -1372,7 +1372,7 @@ }, { "cell_type": "markdown", - "id": "2626b306", + "id": "9d942a7d", "metadata": { "editable": true }, @@ -1384,7 +1384,7 @@ }, { "cell_type": "markdown", - "id": "9c485499", + "id": "302a3c2c", "metadata": { "editable": true }, @@ -1396,7 +1396,7 @@ }, { "cell_type": "markdown", - "id": "d35c34d6", + "id": "b3fbd072", "metadata": { "editable": true }, @@ -1408,7 +1408,7 @@ }, { "cell_type": "markdown", - "id": "4ed23f34", + "id": "be71d25b", "metadata": { "editable": true }, @@ -1419,7 +1419,7 @@ }, { "cell_type": "markdown", - "id": "f9a65949", + "id": "c4fd737f", "metadata": { "editable": true }, @@ -1431,7 +1431,7 @@ }, { "cell_type": "markdown", - "id": "41497653", + "id": "8d649170", "metadata": { "editable": true }, @@ -1441,7 +1441,7 @@ }, { "cell_type": "markdown", - "id": "218bf4a2", + "id": "6b329c10", "metadata": { "editable": true }, @@ -1453,7 +1453,7 @@ }, { "cell_type": "markdown", - "id": "f903700f", + "id": "bc1420b8", "metadata": { "editable": true }, @@ -1463,7 +1463,7 @@ }, { "cell_type": "markdown", - "id": "05bf8370", + "id": "3d65e7db", "metadata": { "editable": true }, @@ -1475,7 +1475,7 @@ }, { "cell_type": "markdown", - "id": "afea8ad1", + "id": "bfb356ea", "metadata": { "editable": true }, @@ -1495,7 +1495,7 @@ }, { "cell_type": "markdown", - "id": "0605b9e9", + "id": "0123ff7d", "metadata": { "editable": true }, @@ -1507,7 +1507,7 @@ }, { "cell_type": "markdown", - "id": "ca8bc8e7", + "id": "1b4d83fe", "metadata": { "editable": true }, @@ -1517,7 +1517,7 @@ }, { "cell_type": "markdown", - "id": "2a752ed8", + "id": "6e66acbd", "metadata": { "editable": true }, @@ -1529,7 +1529,7 @@ }, { "cell_type": "markdown", - "id": "64932658", + "id": "9786cafd", "metadata": { "editable": true }, @@ -1539,7 +1539,7 @@ }, { "cell_type": "markdown", - "id": "1e8db58a", + "id": "47cba065", "metadata": { "editable": true }, @@ -1550,7 +1550,7 @@ }, { "cell_type": "markdown", - "id": "417388f7", + "id": "a2ac921c", "metadata": { "editable": true }, @@ -1562,7 +1562,7 @@ }, { "cell_type": "markdown", - "id": "a2884ba6", + "id": "6aad75d4", "metadata": { "editable": true }, @@ -1574,7 +1574,7 @@ }, { "cell_type": "markdown", - "id": "bafbb7bc", + "id": "040738cc", "metadata": { "editable": true }, @@ -1586,7 +1586,7 @@ }, { "cell_type": "markdown", - "id": "335831d3", + "id": "956aa919", "metadata": { "editable": true }, @@ -1599,7 +1599,7 @@ }, { "cell_type": "markdown", - "id": "ca8f091c", + "id": "ca75dc60", "metadata": { "editable": true }, @@ -1610,7 +1610,7 @@ }, { "cell_type": "markdown", - "id": "d353c7de", + "id": "dfc34c66", "metadata": { "editable": true }, @@ -1622,7 +1622,7 @@ }, { "cell_type": "markdown", - "id": "97ad2759", + "id": "4403d672", "metadata": { "editable": true }, @@ -1638,7 +1638,7 @@ }, { "cell_type": "markdown", - "id": "8e37f2a6", + "id": "4b9213fd", "metadata": { "editable": true }, @@ -1650,7 +1650,7 @@ }, { "cell_type": "markdown", - "id": "988d5180", + "id": "e05d442d", "metadata": { "editable": true }, @@ -1661,7 +1661,7 @@ }, { "cell_type": "markdown", - "id": "40dddf68", + "id": "3b5b19e7", "metadata": { "editable": true }, @@ -1673,7 +1673,7 @@ }, { "cell_type": "markdown", - "id": "6e30b8e8", + "id": "41c98480", "metadata": { "editable": true }, @@ -1683,7 +1683,7 @@ }, { "cell_type": "markdown", - "id": "6f9375f6", + "id": "500ef35c", "metadata": { "editable": true }, @@ -1695,7 +1695,7 @@ }, { "cell_type": "markdown", - "id": "429f93b7", + "id": "019056be", "metadata": { "editable": true }, @@ -1705,7 +1705,7 @@ }, { "cell_type": "markdown", - "id": "50a29c3f", + "id": "4eeba33e", "metadata": { "editable": true }, @@ -1717,7 +1717,7 @@ }, { "cell_type": "markdown", - "id": "54b74e4b", + "id": "f558af91", "metadata": { "editable": true }, @@ -1727,7 +1727,7 @@ }, { "cell_type": "markdown", - "id": "22278fd2", + "id": "1b906f66", "metadata": { "editable": true }, @@ -1739,7 +1739,7 @@ }, { "cell_type": "markdown", - "id": "4ef8149e", + "id": "c802c90e", "metadata": { "editable": true }, @@ -1763,7 +1763,7 @@ { "cell_type": "code", "execution_count": 6, - "id": "9ab0e233", + "id": "f3f4306e", "metadata": { "collapsed": false, "editable": true @@ -1776,7 +1776,7 @@ }, { "cell_type": "markdown", - "id": "c4160ae4", + "id": "d617011d", "metadata": { "editable": true }, @@ -1787,7 +1787,7 @@ }, { "cell_type": "markdown", - "id": "89a9d484", + "id": "bf98c067", "metadata": { "editable": true }, @@ -1799,7 +1799,7 @@ }, { "cell_type": "markdown", - "id": "bca24c47", + "id": "28cc86a9", "metadata": { "editable": true }, @@ -1809,7 +1809,7 @@ }, { "cell_type": "markdown", - "id": "9218a2d9", + "id": "c015617b", "metadata": { "editable": true }, @@ -1821,7 +1821,7 @@ }, { "cell_type": "markdown", - "id": "527cbe33", + "id": "f2eca32c", "metadata": { "editable": true }, @@ -1835,7 +1835,7 @@ }, { "cell_type": "markdown", - "id": "a98916d2", + "id": "479ef1b2", "metadata": { "editable": true }, @@ -1851,7 +1851,7 @@ }, { "cell_type": "markdown", - "id": "511077bb", + "id": "b562c596", "metadata": { "editable": true }, @@ -1861,7 +1861,7 @@ }, { "cell_type": "markdown", - "id": "93fcdfde", + "id": "391bf862", "metadata": { "editable": true }, @@ -1873,7 +1873,7 @@ }, { "cell_type": "markdown", - "id": "0e01b869", + "id": "f4a16fba", "metadata": { "editable": true }, @@ -1883,7 +1883,7 @@ }, { "cell_type": "markdown", - "id": "881fedf9", + "id": "f3add448", "metadata": { "editable": true }, @@ -1895,7 +1895,7 @@ }, { "cell_type": "markdown", - "id": "3fd08058", + "id": "002e739c", "metadata": { "editable": true }, @@ -1909,7 +1909,7 @@ }, { "cell_type": "markdown", - "id": "90d9a9f3", + "id": "c5d0ba0a", "metadata": { "editable": true }, @@ -1919,7 +1919,7 @@ }, { "cell_type": "markdown", - "id": "f52a1b2f", + "id": "0d3f481d", "metadata": { "editable": true }, @@ -1930,7 +1930,7 @@ }, { "cell_type": "markdown", - "id": "9c636475", + "id": "77136fc8", "metadata": { "editable": true }, @@ -1945,7 +1945,7 @@ }, { "cell_type": "markdown", - "id": "1efbe493", + "id": "84130614", "metadata": { "editable": true }, @@ -1955,7 +1955,7 @@ }, { "cell_type": "markdown", - "id": "6f68a417", + "id": "2cb8e687", "metadata": { "editable": true }, @@ -1967,7 +1967,7 @@ }, { "cell_type": "markdown", - "id": "ceed79ec", + "id": "38e7d2b8", "metadata": { "editable": true }, @@ -1979,7 +1979,7 @@ }, { "cell_type": "markdown", - "id": "9a16d440", + "id": "365c99d5", "metadata": { "editable": true }, @@ -1994,7 +1994,7 @@ }, { "cell_type": "markdown", - "id": "1d6881a7", + "id": "54fe7054", "metadata": { "editable": true }, @@ -2007,7 +2007,7 @@ { "cell_type": "code", "execution_count": 7, - "id": "70a26a35", + "id": "457e4af8", "metadata": { "collapsed": false, "editable": true @@ -2064,7 +2064,7 @@ }, { "cell_type": "markdown", - "id": "f6e097fa", + "id": "97c93fc7", "metadata": { "editable": true }, @@ -2075,7 +2075,7 @@ { "cell_type": "code", "execution_count": 8, - "id": "5f932e9e", + "id": "ef498ea5", "metadata": { "collapsed": false, "editable": true @@ -2102,7 +2102,7 @@ }, { "cell_type": "markdown", - "id": "23a2fcd9", + "id": "9275952a", "metadata": { "editable": true }, @@ -2114,7 +2114,7 @@ }, { "cell_type": "markdown", - "id": "37e42d79", + "id": "5645bcc8", "metadata": { "editable": true }, @@ -2126,7 +2126,7 @@ }, { "cell_type": "markdown", - "id": "6f372e4c", + "id": "8b2a9206", "metadata": { "editable": true }, @@ -2136,7 +2136,7 @@ }, { "cell_type": "markdown", - "id": "a6216267", + "id": "f9078f32", "metadata": { "editable": true }, @@ -2150,7 +2150,7 @@ }, { "cell_type": "markdown", - "id": "97566e5a", + "id": "6e817a7b", "metadata": { "editable": true }, @@ -2160,7 +2160,7 @@ }, { "cell_type": "markdown", - "id": "c4ddee5f", + "id": "ae8fee07", "metadata": { "editable": true }, @@ -2172,7 +2172,7 @@ }, { "cell_type": "markdown", - "id": "eeefaf91", + "id": "d9b0fe0f", "metadata": { "editable": true }, @@ -2183,7 +2183,7 @@ }, { "cell_type": "markdown", - "id": "5573b029", + "id": "1ac722e2", "metadata": { "editable": true }, @@ -2198,7 +2198,7 @@ }, { "cell_type": "markdown", - "id": "4b23842f", + "id": "e25866ff", "metadata": { "editable": true }, @@ -2212,7 +2212,7 @@ }, { "cell_type": "markdown", - "id": "dd0076b0", + "id": "564ee0e6", "metadata": { "editable": true }, @@ -2223,7 +2223,7 @@ { "cell_type": "code", "execution_count": 9, - "id": "7efda7c7", + "id": "e19e3034", "metadata": { "collapsed": false, "editable": true @@ -2284,7 +2284,7 @@ }, { "cell_type": "markdown", - "id": "3fbe8c78", + "id": "519c3099", "metadata": { "editable": true }, @@ -2306,7 +2306,7 @@ }, { "cell_type": "markdown", - "id": "c19e4fc9", + "id": "c0224a76", "metadata": { "editable": true }, @@ -2319,7 +2319,7 @@ { "cell_type": "code", "execution_count": 10, - "id": "a6152435", + "id": "3ec96499", "metadata": { "collapsed": false, "editable": true @@ -2385,7 +2385,7 @@ }, { "cell_type": "markdown", - "id": "e09ac4c8", + "id": "013518f9", "metadata": { "editable": true }, @@ -2396,7 +2396,7 @@ { "cell_type": "code", "execution_count": 11, - "id": "bbe6496f", + "id": "1177cebe", "metadata": { "collapsed": false, "editable": true @@ -2470,7 +2470,7 @@ }, { "cell_type": "markdown", - "id": "c5da561f", + "id": "aa3e42e1", "metadata": { "editable": true }, @@ -2482,7 +2482,7 @@ }, { "cell_type": "markdown", - "id": "8a534cf4", + "id": "d2804e9d", "metadata": { "editable": true }, @@ -2503,7 +2503,7 @@ }, { "cell_type": "markdown", - "id": "92d7a080", + "id": "0cb1f030", "metadata": { "editable": true }, @@ -2535,7 +2535,7 @@ }, { "cell_type": "markdown", - "id": "ee681442", + "id": "07c69389", "metadata": { "editable": true }, @@ -2552,7 +2552,7 @@ }, { "cell_type": "markdown", - "id": "72c1fa11", + "id": "ceb4ddeb", "metadata": { "editable": true }, @@ -2565,7 +2565,7 @@ }, { "cell_type": "markdown", - "id": "71d38dd0", + "id": "b74d079f", "metadata": { "editable": true }, @@ -2578,7 +2578,7 @@ }, { "cell_type": "markdown", - "id": "b7bb3ead", + "id": "123b53cc", "metadata": { "editable": true }, @@ -2591,7 +2591,7 @@ }, { "cell_type": "markdown", - "id": "97d8d740", + "id": "3960f61f", "metadata": { "editable": true }, @@ -2605,7 +2605,7 @@ }, { "cell_type": "markdown", - "id": "bc0338a7", + "id": "0d84e11d", "metadata": { "editable": true }, @@ -2627,7 +2627,7 @@ }, { "cell_type": "markdown", - "id": "37958c74", + "id": "a23014d3", "metadata": { "editable": true }, @@ -2642,7 +2642,7 @@ }, { "cell_type": "markdown", - "id": "3ccbe5c6", + "id": "51163212", "metadata": { "editable": true }, @@ -2654,7 +2654,7 @@ }, { "cell_type": "markdown", - "id": "30f2e7f5", + "id": "1ac440c6", "metadata": { "editable": true }, @@ -2667,7 +2667,7 @@ }, { "cell_type": "markdown", - "id": "7907627a", + "id": "271fd2f1", "metadata": { "editable": true }, @@ -2681,7 +2681,7 @@ }, { "cell_type": "markdown", - "id": "1548f978", + "id": "1bdeb533", "metadata": { "editable": true }, @@ -2692,7 +2692,7 @@ { "cell_type": "code", "execution_count": 12, - "id": "1ff042d7", + "id": "4ee8002d", "metadata": { "collapsed": false, "editable": true @@ -2717,7 +2717,7 @@ }, { "cell_type": "markdown", - "id": "6432d4b2", + "id": "41a7a26d", "metadata": { "editable": true }, @@ -2733,7 +2733,7 @@ }, { "cell_type": "markdown", - "id": "10ab1703", + "id": "ab92166f", "metadata": { "editable": true }, @@ -2754,7 +2754,7 @@ }, { "cell_type": "markdown", - "id": "dcd27ba0", + "id": "a20c6717", "metadata": { "editable": true }, @@ -2774,7 +2774,7 @@ }, { "cell_type": "markdown", - "id": "7821fa5c", + "id": "d25cf8bd", "metadata": { "editable": true }, @@ -2793,7 +2793,7 @@ { "cell_type": "code", "execution_count": 13, - "id": "614e2a05", + "id": "2dc23da5", "metadata": { "collapsed": false, "editable": true @@ -2828,7 +2828,7 @@ }, { "cell_type": "markdown", - "id": "a6ddafd4", + "id": "068ff42b", "metadata": { "editable": true }, @@ -2841,7 +2841,7 @@ { "cell_type": "code", "execution_count": 14, - "id": "7dcb30ce", + "id": "1d9d8857", "metadata": { "collapsed": false, "editable": true @@ -2918,7 +2918,7 @@ }, { "cell_type": "markdown", - "id": "b6da28d8", + "id": "9e64e8f4", "metadata": { "editable": true }, @@ -2933,7 +2933,7 @@ }, { "cell_type": "markdown", - "id": "78015cb6", + "id": "4a9ac2cb", "metadata": { "editable": true }, @@ -2948,7 +2948,7 @@ }, { "cell_type": "markdown", - "id": "ffc08e68", + "id": "7f63c4a3", "metadata": { "editable": true }, @@ -2960,7 +2960,7 @@ }, { "cell_type": "markdown", - "id": "87a46d34", + "id": "6b126246", "metadata": { "editable": true }, @@ -2978,7 +2978,7 @@ }, { "cell_type": "markdown", - "id": "bc9a6e62", + "id": "98cdbb32", "metadata": { "editable": true }, @@ -2997,7 +2997,7 @@ }, { "cell_type": "markdown", - "id": "4b91b7f6", + "id": "9da9b8d8", "metadata": { "editable": true }, @@ -3009,7 +3009,7 @@ }, { "cell_type": "markdown", - "id": "7d7bad0b", + "id": "9926b3c4", "metadata": { "editable": true }, @@ -3019,7 +3019,7 @@ }, { "cell_type": "markdown", - "id": "af03f313", + "id": "57779254", "metadata": { "editable": true }, @@ -3035,7 +3035,7 @@ }, { "cell_type": "markdown", - "id": "3217e5f7", + "id": "348a6e95", "metadata": { "editable": true }, @@ -3047,7 +3047,7 @@ }, { "cell_type": "markdown", - "id": "fb12bd4a", + "id": "87aae119", "metadata": { "editable": true }, @@ -3057,7 +3057,7 @@ }, { "cell_type": "markdown", - "id": "8d417735", + "id": "a4669289", "metadata": { "editable": true }, @@ -3069,7 +3069,7 @@ }, { "cell_type": "markdown", - "id": "7d6b3895", + "id": "8554a357", "metadata": { "editable": true }, @@ -3079,7 +3079,7 @@ }, { "cell_type": "markdown", - "id": "691a6f0f", + "id": "1fa72611", "metadata": { "editable": true }, @@ -3091,7 +3091,7 @@ }, { "cell_type": "markdown", - "id": "6a5b7108", + "id": "8a825fb9", "metadata": { "editable": true }, @@ -3107,7 +3107,7 @@ }, { "cell_type": "markdown", - "id": "3cd05aba", + "id": "36b5f3de", "metadata": { "editable": true }, @@ -3119,7 +3119,7 @@ }, { "cell_type": "markdown", - "id": "d4792e11", + "id": "49c47929", "metadata": { "editable": true }, @@ -3152,7 +3152,7 @@ }, { "cell_type": "markdown", - "id": "a4814aed", + "id": "cfd6472d", "metadata": { "editable": true }, @@ -3164,7 +3164,7 @@ }, { "cell_type": "markdown", - "id": "9f289fcc", + "id": "ccb3b789", "metadata": { "editable": true }, @@ -3182,7 +3182,7 @@ }, { "cell_type": "markdown", - "id": "78417908", + "id": "52a50fee", "metadata": { "editable": true }, @@ -3192,7 +3192,7 @@ }, { "cell_type": "markdown", - "id": "876f9f5e", + "id": "60b98b21", "metadata": { "editable": true }, @@ -3223,7 +3223,7 @@ }, { "cell_type": "markdown", - "id": "453c1007", + "id": "a3f65369", "metadata": { "editable": true }, @@ -3238,7 +3238,7 @@ }, { "cell_type": "markdown", - "id": "4fe0ca27", + "id": "36e483ff", "metadata": { "editable": true }, @@ -3256,7 +3256,7 @@ }, { "cell_type": "markdown", - "id": "b951e0f4", + "id": "c565ac54", "metadata": { "editable": true }, @@ -3268,7 +3268,7 @@ }, { "cell_type": "markdown", - "id": "b54a1702", + "id": "da98e855", "metadata": { "editable": true }, @@ -3280,7 +3280,7 @@ }, { "cell_type": "markdown", - "id": "24ec5c11", + "id": "3f14f027", "metadata": { "editable": true }, @@ -3298,7 +3298,7 @@ }, { "cell_type": "markdown", - "id": "78f1652f", + "id": "2717fec0", "metadata": { "editable": true }, @@ -3321,7 +3321,7 @@ }, { "cell_type": "markdown", - "id": "52633dca", + "id": "170fb635", "metadata": { "editable": true }, @@ -3339,7 +3339,7 @@ }, { "cell_type": "markdown", - "id": "37968950", + "id": "faa2bccc", "metadata": { "editable": true }, @@ -3351,7 +3351,7 @@ }, { "cell_type": "markdown", - "id": "51ab2eb9", + "id": "9ea53bf7", "metadata": { "editable": true }, @@ -3363,7 +3363,7 @@ }, { "cell_type": "markdown", - "id": "eebe09f7", + "id": "7338ddf3", "metadata": { "editable": true }, @@ -3375,7 +3375,7 @@ }, { "cell_type": "markdown", - "id": "0cccbdd6", + "id": "b585e12c", "metadata": { "editable": true }, @@ -3387,7 +3387,7 @@ }, { "cell_type": "markdown", - "id": "9662f3cc", + "id": "d1fe61e6", "metadata": { "editable": true }, @@ -3399,7 +3399,7 @@ }, { "cell_type": "markdown", - "id": "1aa8631f", + "id": "4b64f46a", "metadata": { "editable": true }, @@ -3416,7 +3416,7 @@ }, { "cell_type": "markdown", - "id": "e521cfb6", + "id": "69212d81", "metadata": { "editable": true }, @@ -3435,7 +3435,7 @@ }, { "cell_type": "markdown", - "id": "20fb3297", + "id": "e4ec2ca8", "metadata": { "editable": true }, @@ -3447,7 +3447,7 @@ }, { "cell_type": "markdown", - "id": "a182d872", + "id": "13ebaeaa", "metadata": { "editable": true }, @@ -3467,7 +3467,7 @@ }, { "cell_type": "markdown", - "id": "a58a5b9c", + "id": "cc132324", "metadata": { "editable": true }, @@ -3505,7 +3505,7 @@ }, { "cell_type": "markdown", - "id": "4fb66616", + "id": "47ad5167", "metadata": { "editable": true }, @@ -3517,7 +3517,7 @@ }, { "cell_type": "markdown", - "id": "a82f419d", + "id": "9ee6225f", "metadata": { "editable": true }, @@ -3527,7 +3527,7 @@ }, { "cell_type": "markdown", - "id": "223e7cf3", + "id": "cc49c1e1", "metadata": { "editable": true }, @@ -3539,7 +3539,7 @@ }, { "cell_type": "markdown", - "id": "871dd59d", + "id": "ea0c79f1", "metadata": { "editable": true }, @@ -3550,7 +3550,7 @@ { "cell_type": "code", "execution_count": 15, - "id": "0a5f00f5", + "id": "aba1be09", "metadata": { "collapsed": false, "editable": true @@ -3595,7 +3595,7 @@ }, { "cell_type": "markdown", - "id": "327a951f", + "id": "b692e704", "metadata": { "editable": true }, @@ -3612,7 +3612,7 @@ { "cell_type": "code", "execution_count": 16, - "id": "a7fb499f", + "id": "85444dae", "metadata": { "collapsed": false, "editable": true @@ -3640,7 +3640,7 @@ }, { "cell_type": "markdown", - "id": "f3c96428", + "id": "70e49fb6", "metadata": { "editable": true }, @@ -3655,7 +3655,7 @@ { "cell_type": "code", "execution_count": 17, - "id": "c9b33438", + "id": "94bfdf53", "metadata": { "collapsed": false, "editable": true @@ -3699,7 +3699,7 @@ }, { "cell_type": "markdown", - "id": "564db542", + "id": "b4686bc1", "metadata": { "editable": true }, @@ -3709,7 +3709,7 @@ }, { "cell_type": "markdown", - "id": "4438a690", + "id": "de9bbb0b", "metadata": { "editable": true }, @@ -3720,7 +3720,7 @@ { "cell_type": "code", "execution_count": 18, - "id": "d23e4aba", + "id": "3e932adf", "metadata": { "collapsed": false, "editable": true @@ -3748,7 +3748,7 @@ }, { "cell_type": "markdown", - "id": "f8ab8d5a", + "id": "53c2fedf", "metadata": { "editable": true }, @@ -3763,7 +3763,7 @@ }, { "cell_type": "markdown", - "id": "baa23ffa", + "id": "afa8f89f", "metadata": { "editable": true }, @@ -3774,7 +3774,7 @@ { "cell_type": "code", "execution_count": 19, - "id": "319def2d", + "id": "bc6756d2", "metadata": { "collapsed": false, "editable": true @@ -3802,7 +3802,7 @@ }, { "cell_type": "markdown", - "id": "e1dd86c6", + "id": "80e3c79f", "metadata": { "editable": true }, @@ -3813,7 +3813,7 @@ { "cell_type": "code", "execution_count": 20, - "id": "e757e084", + "id": "af4ac652", "metadata": { "collapsed": false, "editable": true @@ -3838,7 +3838,7 @@ }, { "cell_type": "markdown", - "id": "eebfe3dd", + "id": "85d76920", "metadata": { "editable": true }, @@ -3849,7 +3849,7 @@ { "cell_type": "code", "execution_count": 21, - "id": "c4830d3a", + "id": "aa71a6e5", "metadata": { "collapsed": false, "editable": true @@ -3885,7 +3885,7 @@ { "cell_type": "code", "execution_count": 22, - "id": "dc55ee7b", + "id": "00f338d9", "metadata": { "collapsed": false, "editable": true @@ -3905,7 +3905,7 @@ }, { "cell_type": "markdown", - "id": "6cb061b0", + "id": "514775dc", "metadata": { "editable": true }, @@ -3916,7 +3916,7 @@ { "cell_type": "code", "execution_count": 23, - "id": "e468cdc4", + "id": "56292f34", "metadata": { "collapsed": false, "editable": true @@ -3954,7 +3954,7 @@ }, { "cell_type": "markdown", - "id": "679da7ef", + "id": "0821aef0", "metadata": { "editable": true }, @@ -3964,7 +3964,7 @@ }, { "cell_type": "markdown", - "id": "0ce4bd6b", + "id": "07bccded", "metadata": { "editable": true }, @@ -3978,7 +3978,7 @@ { "cell_type": "code", "execution_count": 24, - "id": "9838c269", + "id": "7e1c00c8", "metadata": { "collapsed": false, "editable": true @@ -4000,7 +4000,7 @@ }, { "cell_type": "markdown", - "id": "4457eba3", + "id": "91b32000", "metadata": { "editable": true }, @@ -4010,7 +4010,7 @@ }, { "cell_type": "markdown", - "id": "d6303490", + "id": "5bb6505b", "metadata": { "editable": true }, @@ -4021,7 +4021,7 @@ { "cell_type": "code", "execution_count": 25, - "id": "7dd580f0", + "id": "b698d800", "metadata": { "collapsed": false, "editable": true @@ -4043,7 +4043,7 @@ }, { "cell_type": "markdown", - "id": "27629408", + "id": "7daefc20", "metadata": { "editable": true }, @@ -4056,7 +4056,7 @@ { "cell_type": "code", "execution_count": 26, - "id": "30c2ae6c", + "id": "f4db3939", "metadata": { "collapsed": false, "editable": true @@ -4081,7 +4081,7 @@ }, { "cell_type": "markdown", - "id": "106e6e20", + "id": "63911856", "metadata": { "editable": true }, @@ -4093,7 +4093,7 @@ { "cell_type": "code", "execution_count": 27, - "id": "4aa28359", + "id": "fc661b03", "metadata": { "collapsed": false, "editable": true @@ -4108,7 +4108,7 @@ }, { "cell_type": "markdown", - "id": "0b41db61", + "id": "a873728b", "metadata": { "editable": true }, @@ -4123,7 +4123,7 @@ { "cell_type": "code", "execution_count": 28, - "id": "0a3e77af", + "id": "68ec2659", "metadata": { "collapsed": false, "editable": true @@ -4183,7 +4183,7 @@ }, { "cell_type": "markdown", - "id": "d66b1248", + "id": "7a2e9992", "metadata": { "editable": true }, @@ -4194,7 +4194,7 @@ { "cell_type": "code", "execution_count": 29, - "id": "62fd741e", + "id": "b03e6d68", "metadata": { "collapsed": false, "editable": true @@ -4258,7 +4258,7 @@ }, { "cell_type": "markdown", - "id": "ea73ead4", + "id": "d518ed04", "metadata": { "editable": true }, @@ -4269,7 +4269,7 @@ { "cell_type": "code", "execution_count": 30, - "id": "85769e6a", + "id": "4f365ef3", "metadata": { "collapsed": false, "editable": true @@ -4318,7 +4318,7 @@ }, { "cell_type": "markdown", - "id": "c72ceec5", + "id": "bb7a2b23", "metadata": { "editable": true }, @@ -4330,7 +4330,7 @@ { "cell_type": "code", "execution_count": 31, - "id": "03605486", + "id": "7be1bad2", "metadata": { "collapsed": false, "editable": true @@ -4414,7 +4414,7 @@ }, { "cell_type": "markdown", - "id": "44a2e49e", + "id": "998c490d", "metadata": { "editable": true }, @@ -4425,7 +4425,7 @@ { "cell_type": "code", "execution_count": 32, - "id": "605503fb", + "id": "8c8323d7", "metadata": { "collapsed": false, "editable": true @@ -4503,7 +4503,7 @@ }, { "cell_type": "markdown", - "id": "423148e4", + "id": "e8e20118", "metadata": { "editable": true }, @@ -4514,7 +4514,7 @@ { "cell_type": "code", "execution_count": 33, - "id": "b025c34c", + "id": "38b88401", "metadata": { "collapsed": false, "editable": true @@ -4522,7 +4522,7 @@ "outputs": [], "source": [ "# Using Autograd to calculate gradients using SGD\n", - "# OLS example\n", + "# OLS example with AdaGrad\n", "from random import random, seed\n", "import numpy as np\n", "import autograd.numpy as np\n", @@ -4566,9 +4566,9 @@ "m = int(n/M) #number of minibatches\n", "theta = np.random.randn(2,1)\n", "\n", - "\n", "# Including AdaGrad\n", "delta = 0.000001\n", + "r = [0.0 for _ in range(gradients.shape[0])]\n", "for epoch in range(n_epochs):\n", " for i in range(m):\n", " random_index = M*np.random.randint(m)\n", @@ -4578,15 +4578,15 @@ " # calculate squared gradient by Hadamard multiplication\n", " r -= gradients*gradients\n", " # compute update\n", - " update = (1.0/delta+np.sqrt(r))*gradients\n", - " theta = eta*update\n", + " update = 1.0/(delta+np.sqrt(r))*gradients\n", + " theta -= eta*update\n", "print(\"theta from own AdaGrad\")\n", "print(theta)" ] }, { "cell_type": "markdown", - "id": "a1aebdad", + "id": "0989e18a", "metadata": { "editable": true }, @@ -4597,7 +4597,7 @@ { "cell_type": "code", "execution_count": 34, - "id": "1091d4ae", + "id": "c6622d90", "metadata": { "collapsed": false, "editable": true @@ -4641,7 +4641,7 @@ }, { "cell_type": "markdown", - "id": "f08388a7", + "id": "442a319f", "metadata": { "editable": true }, @@ -4660,7 +4660,7 @@ { "cell_type": "code", "execution_count": 35, - "id": "131b959a", + "id": "8c6259ef", "metadata": { "collapsed": false, "editable": true @@ -4680,7 +4680,7 @@ }, { "cell_type": "markdown", - "id": "426864d6", + "id": "4495aa58", "metadata": { "editable": true }, diff --git a/doc/src/week39/adagrad.py b/doc/src/week39/adagrad.py index 783124245..dbee993c6 100644 --- a/doc/src/week39/adagrad.py +++ b/doc/src/week39/adagrad.py @@ -43,9 +43,9 @@ M = 5 #size of each minibatch m = int(n/M) #number of minibatches theta = np.random.randn(2,1) - # Including AdaGrad delta = 0.000001 +r = [0.0 for _ in range(gradients.shape[0])] for epoch in range(n_epochs): for i in range(m): random_index = M*np.random.randint(m) @@ -55,8 +55,8 @@ for epoch in range(n_epochs): # calculate squared gradient by Hadamard multiplication r -= gradients*gradients # compute update - update = (1.0/delta+np.sqrt(r))*gradients - theta = eta*update + update = 1.0/(delta+np.sqrt(r))*gradients + theta -= eta*update print("theta from own AdaGrad") print(theta) diff --git a/doc/src/week39/week39.do.txt b/doc/src/week39/week39.do.txt index 26a1b4311..33d3d3cf3 100644 --- a/doc/src/week39/week39.do.txt +++ b/doc/src/week39/week39.do.txt @@ -2435,7 +2435,7 @@ print(theta) ===== Same problem but now with AdaGrad ===== !bc pycod # Using Autograd to calculate gradients using SGD -# OLS example +# OLS example with AdaGrad from random import random, seed import numpy as np import autograd.numpy as np @@ -2479,9 +2479,9 @@ M = 5 #size of each minibatch m = int(n/M) #number of minibatches theta = np.random.randn(2,1) - # Including AdaGrad delta = 0.000001 +r = [0.0 for _ in range(gradients.shape[0])] for epoch in range(n_epochs): for i in range(m): random_index = M*np.random.randint(m) @@ -2491,11 +2491,10 @@ for epoch in range(n_epochs): # calculate squared gradient by Hadamard multiplication r -= gradients*gradients # compute update - update = (1.0/delta+np.sqrt(r))*gradients - theta = eta*update + update = 1.0/(delta+np.sqrt(r))*gradients + theta -= eta*update print("theta from own AdaGrad") print(theta) - !ec