-
diff --git a/doc/pub/week40/html/._week40-bs001.html b/doc/pub/week40/html/._week40-bs001.html index e8fe5139d..82a638996 100644 --- a/doc/pub/week40/html/._week40-bs001.html +++ b/doc/pub/week40/html/._week40-bs001.html @@ -238,8 +238,8 @@ MathJax.Hub.Config({
-Overview Video, from Stochastic Gradient methods to Neural Networks +Overview Video, from Stochastic Gradient methods to Neural Networks
diff --git a/doc/pub/week40/html/week40-bs.html b/doc/pub/week40/html/week40-bs.html index 5fad2ea31..a039a7b8e 100644 --- a/doc/pub/week40/html/week40-bs.html +++ b/doc/pub/week40/html/week40-bs.html @@ -254,7 +254,7 @@ MathJax.Hub.Config({
-
diff --git a/doc/pub/week40/html/week40-reveal.html b/doc/pub/week40/html/week40-reveal.html index 5884af6ff..6ef3fc8e5 100644 --- a/doc/pub/week40/html/week40-reveal.html +++ b/doc/pub/week40/html/week40-reveal.html @@ -148,7 +148,7 @@ MathJax.Hub.Config({
-
@@ -162,8 +162,8 @@ MathJax.Hub.Config({
@@ -176,7 +176,7 @@ For Stochastic Gradient Descent, we recommend chapter 4 of Geron's text.
-Overview Video, from Stochastic Gradient methods to Neural Networks +Overview Video, from Stochastic Gradient methods to Neural Networks diff --git a/doc/pub/week40/html/week40-solarized.html b/doc/pub/week40/html/week40-solarized.html index c067e1c4c..a2f6bcbfc 100644 --- a/doc/pub/week40/html/week40-solarized.html +++ b/doc/pub/week40/html/week40-solarized.html @@ -186,7 +186,7 @@ MathJax.Hub.Config({
-
@@ -194,8 +194,8 @@ MathJax.Hub.Config({
-Overview Video, from Stochastic Gradient methods to Neural Networks +Overview Video, from Stochastic Gradient methods to Neural Networks
diff --git a/doc/pub/week40/html/week40.html b/doc/pub/week40/html/week40.html
index 7a3e10527..719a696a9 100644
--- a/doc/pub/week40/html/week40.html
+++ b/doc/pub/week40/html/week40.html
@@ -191,7 +191,7 @@ MathJax.Hub.Config({
-
@@ -199,8 +199,8 @@ MathJax.Hub.Config({
-Overview Video, from Stochastic Gradient methods to Neural Networks +Overview Video, from Stochastic Gradient methods to Neural Networks
diff --git a/doc/pub/week40/ipynb/ipynb-week40-src.tar.gz b/doc/pub/week40/ipynb/ipynb-week40-src.tar.gz
index 79d45e377..7b19b1487 100644
Binary files a/doc/pub/week40/ipynb/ipynb-week40-src.tar.gz and b/doc/pub/week40/ipynb/ipynb-week40-src.tar.gz differ
diff --git a/doc/pub/week40/ipynb/week40.ipynb b/doc/pub/week40/ipynb/week40.ipynb
index 40cdaefca..5c6bd06f8 100644
--- a/doc/pub/week40/ipynb/week40.ipynb
+++ b/doc/pub/week40/ipynb/week40.ipynb
@@ -10,7 +10,7 @@
" \n",
"**Morten Hjorth-Jensen**, Department of Physics, University of Oslo and Department of Physics and Astronomy and National Superconducting Cyclotron Laboratory, Michigan State University\n",
"\n",
- "Date: **Sep 29, 2020**\n",
+ "Date: **Sep 30, 2020**\n",
"\n",
"Copyright 1999-2020, Morten Hjorth-Jensen. Released under CC Attribution-NonCommercial 4.0 license\n",
"\n",
@@ -19,16 +19,16 @@
"\n",
"## Plan for week 40\n",
"\n",
- "* Thursday: Stochastic Gradient descent with examples and automatic differeantion and begin Neural Networks \n",
+ "* Thursday: Stochastic Gradient descent with examples and automatic differentiation and begin Neural Networks \n",
"\n",
- "* Friday: Neural Networks, setting up the basic steps\n",
+ "* Friday: Neural Networks, setting up the basic steps, from the simple perceptron model to the multi-layer perceptron model\n",
"\n",
"Reading suggestions for both days: [Aurelien Geron's chapter 10](https://github.com/CompPhysics/MachineLearning/blob/master/doc/Textbooks/TensorflowML.pdf) and Hastie et al chapter 11.\n",
"For Stochastic Gradient Descent, we recommend chapter 4 of Geron's text. \n",
"\n",
"## Overview video for week 40\n",
"\n",
- "[Overview Video, from Stochastic Gradient methods to Neural Networks](https://www.uio.no/studier/emner/matnat/fys/FYS-STK3155/h20/forelesningsvideoer/OverarchingAimsWeek40.mp4?vrtx=view-as-webpage)\n",
+ "[Overview Video, from Stochastic Gradient methods to Neural Networks](https://www.uio.no/studier/emner/matnat/fys/FYS-STK3155/h20/forelesningsvideoer/OverviewWeek40.mp4?vrtx=view-as-webpage)\n",
"\n",
"## Stochastic Gradient Descent\n",
"\n",
diff --git a/doc/src/week40/week40.do.txt b/doc/src/week40/week40.do.txt
index 071d080a9..3e2d8e91d 100644
--- a/doc/src/week40/week40.do.txt
+++ b/doc/src/week40/week40.do.txt
@@ -6,8 +6,8 @@ DATE: today
!split
===== Plan for week 40 =====
-* Thursday: Stochastic Gradient descent with examples and automatic differeantion and begin Neural Networks
-* Friday: Neural Networks, setting up the basic steps
+* Thursday: Stochastic Gradient descent with examples and automatic differentiation and begin Neural Networks
+* Friday: Neural Networks, setting up the basic steps, from the simple perceptron model to the multi-layer perceptron model
Reading suggestions for both days: "Aurelien Geron's chapter 10":"https://github.com/CompPhysics/MachineLearning/blob/master/doc/Textbooks/TensorflowML.pdf" and Hastie et al chapter 11.
For Stochastic Gradient Descent, we recommend chapter 4 of Geron's text.
@@ -15,7 +15,7 @@ For Stochastic Gradient Descent, we recommend chapter 4 of Geron's text.
!split
===== Overview video for week 40 =====
-"Overview Video, from Stochastic Gradient methods to Neural Networks":"https://www.uio.no/studier/emner/matnat/fys/FYS-STK3155/h20/forelesningsvideoer/OverarchingAimsWeek40.mp4?vrtx=view-as-webpage"
+"Overview Video, from Stochastic Gradient methods to Neural Networks":"https://www.uio.no/studier/emner/matnat/fys/FYS-STK3155/h20/forelesningsvideoer/OverviewWeek40.mp4?vrtx=view-as-webpage"
!split
===== Stochastic Gradient Descent =====
diff --git a/doc/web/course.dlog b/doc/web/course.dlog
index 5de727ac0..2611f59dd 100644
--- a/doc/web/course.dlog
+++ b/doc/web/course.dlog
@@ -147,3 +147,6 @@ output in course.html
running mako on course.do.txt to make tmp_mako__course.do.txt
translating doconce text in tmp_mako__course.do.txt to html
output in course.html
+running mako on course.do.txt to make tmp_mako__course.do.txt
+translating doconce text in tmp_mako__course.do.txt to html
+output in course.html
diff --git a/doc/web/course.do.txt b/doc/web/course.do.txt
index 92d7dd996..95ebcc092 100644
--- a/doc/web/course.do.txt
+++ b/doc/web/course.do.txt
@@ -10,9 +10,9 @@ chapters = {
'week36': 'Week 36 August 31- September 4: Resampling techniques, Cross-validation and Bootstrap and start discussion of Ridge regression',
'week37': 'Week 37 September 7-11: Ridge and Lasso Regression',
'week38': 'Week 38 September 14-18: Summary of linear regression methods and start Logistic Regression',
- 'week39': 'Week 39 September 21-25: Logistic Regression and Gradient methods. Start Neural Networks',
- 'week40': 'Week 40 September 28 - October 2: Neural Networks, building a multi-layer Perceptron model',
- 'week41': 'Week 41 October 5-9: Introduction to Tensorflow and deep learning (Convolutional Neural Networks and Recurrent Neural Networks)',
+ 'week39': 'Week 39 September 21-25: Logistic Regression and Gradient methods',
+ 'week40': 'Week 40 September 28 - October 2: Stochastic Gradient Descent and Neural Networks, starting to build a multi-layer Perceptron model',
+ 'week41': 'Week 41 October 5-9: Building a multi-layer perceptron code and introduction to Tensorflow',
'week42': 'Week 42 October 12-16: Deep learning (Convolutional Neural Networks and Recurrent Neural Networks',
'week43': 'Week 43 October 19-23: Dimesionality Reduction, Principal Component analysis',
'week44': 'Week 44 October 26-30: Decision Trees and Bagging',
diff --git a/doc/web/course.html b/doc/web/course.html
index 09af703a4..42c1d12d9 100644
--- a/doc/web/course.html
+++ b/doc/web/course.html
@@ -69,18 +69,18 @@ div { text-align: justify; text-justify: inter-word; }
None,
'___sec4'),
('Week 39 September 21-25: Logistic Regression and Gradient '
- 'methods. Start Neural Networks',
+ 'methods',
2,
None,
'___sec5'),
- ('Week 40 September 28 - October 2: Neural Networks, building a '
- 'multi-layer Perceptron model',
+ ('Week 40 September 28 - October 2: Stochastic Gradient Descent '
+ 'and Neural Networks, starting to build a multi-layer '
+ 'Perceptron model',
2,
None,
'___sec6'),
- ('Week 41 October 5-9: Introduction to Tensorflow and deep '
- 'learning (Convolutional Neural Networks and Recurrent Neural '
- 'Networks)',
+ ('Week 41 October 5-9: Building a multi-layer perceptron code '
+ 'and introduction to Tensorflow',
2,
None,
'___sec7'),
@@ -254,7 +254,7 @@ The teaching material is produced in various formats for running codes (jupyter
-