Merge branch 'master' of sissource.ethz.ch:sis/courses/machinelearning-introduction-workshop

data/line_separable_2d.csv

@@ -15,7 +15,7 @@ x,y,label
 -3.2755543746086,-1.10450073826831,0
 -2.6478562588586,-0.26576651766893,0
 -3.11195463821361,0.1783365770807,0
--2.15164553451274,0.60344845267556,0
+-2.15164553451274,0.90344845267556,0
 -2.43008979939689,-2.30014155569247,0
 -1.43926998866748,-0.783089609828009,0
 -2.52692871025929,-0.994583146194519,0
@@ -46,7 +46,7 @@ x,y,label
 -1.25983954602102,-1.27130801372315,0
 -3.00978541494178,-1.20693864955388,0
 -2.86297097460004,-0.284172930279694,0
--2.5575929802011,-3.91059431111588,0
+2.0575929802011,0.10059431111588,0
 -1.26427668641101,-1.45320991169019,0
 -4.34179320000102,-0.857291094129094,0
 0.126116064479831,2.75464371161086,1
@@ -61,7 +61,7 @@ x,y,label
 0.907793621817517,3.0458801586322,1
 1.17805835162515,2.99270616795713,1
 1.41565107824024,2.86722409929698,1
-0.404648120340494,0.810676830091108,1
+0.404648120340494,0.710676830091108,1
 3.1856231111646,1.80924619513057,1
 0.716322528720786,3.33153794242802,1
 0.967280934445937,5.61128258901615,1

environment.yml

@@ -11,10 +11,11 @@ channels:
 dependencies:
     - python==3.6.8
     - pandas==0.25.0
-    - matplotlib==3.1.1 
+    - matplotlib==3.1.1
     - scikit-learn==0.21.2
     - seaborn==0.9.0
     - jupyter==1.0.0
+    - jupyter_contrib_nbextensions==0.5.1
     - keras==2.2.4
     - tensorflow==1.10
     - pydot==1.4.1

environment_mac.yml

@@ -12,10 +12,11 @@ dependencies:
     - python==3.6.8
     - nomkl==3.0
     - pandas==0.25.0
-    - matplotlib==3.1.1 
+    - matplotlib==3.1.1
     - scikit-learn==0.21.2
     - seaborn==0.9.0
     - jupyter==1.0.0
+    - jupyter_contrib_nbextensions==0.5.1
     - keras==2.2.4
     - tensorflow==1.10
     - pydot==1.4.1

requirements_dev.txt

@@ -22,14 +22,14 @@ jupyter-contrib-nbextensions>=0.5.1
 jupyter-core>=4.4.0
 kiwisolver>=1.0.1
 MarkupSafe>=1.0
-matplotlib>=2.2.3
+matplotlib>=3.1.1
 mistune>=0.8.3
 nbconvert>=5.4.0
 nbformat>=4.4.0
 nb-filter-cells>=0.0.2
 notebook>=5.6.0
 numpy>=1.15.1
-pandas>=0.23.4
+pandas>=0.25.0
 pandocfilters>=1.4.2
 parso>=0.3.1
 pexpect>=4.6.0