Merge branch 'master' of ssh://c4science.ch/source/sp4e

.gitignore

+.idea
+cmake-build-debug
+*.o
+*.pyc
+__pycache__
+*~
\ No newline at end of file

exercises/week3/stl/solution/CMakeLists.txt

 cmake_minimum_required(VERSION 2.6)
+project(stl-exercise)
 
 add_executable(stl
   main.cc

exercises/week3/stl/solution/main.cc

@@ -114,11 +114,10 @@ int main(int argc, char ** argv){
   //Triplet origin_coordinates(0.,0.,0.);
   map["sun"] = origin_coordinates;
 
-  std::map<std::string,Triplet>::iterator end3 = map.end();
+  auto end3 = map.end();
 
-  //origin_coordinates.coords[0] = 1.;
   origin_coordinates[0] = 1.;
-  std::map<std::string,Triplet>::iterator it3 = map.find("earth");
+  auto it3 = map.find("earth");
   if (it3 == end3) map["earth"] = origin_coordinates;
 
   std::set<std::string> keys;

exercises/week4/matplotlib/data.plot

+0.0	0.0	-0.8635690114713294
+1.0	0.1	-3.983393377527013
+2.0	0.2	1.6475987651901083
+3.0	0.30000000000000004	-0.013448929818011657
+4.0	0.4	1.7020855869972298
+5.0	0.5	1.9036924953736578
+6.0	0.6000000000000001	1.6289014065212006
+7.0	0.7000000000000001	-0.2028559703308047
+8.0	0.8	2.490528429288304
+9.0	0.9	1.0883609887279249
+10.0	1.0	-0.051012316978761296
+11.0	1.1	1.8204975629519398
+12.0	1.2000000000000002	0.7157060460619417
+13.0	1.3	-0.42808254146857516
+14.0	1.4000000000000001	0.7331304792030288
+15.0	1.5	2.544245408669501
+16.0	1.6	3.962308732097846
+17.0	1.7000000000000002	1.4608357341880713
+18.0	1.8	1.2690746308248424
+19.0	1.9000000000000001	2.6265944059107666
+20.0	2.0	2.632428969216172
+21.0	2.1	1.3422679083567872
+22.0	2.2	2.9257197141501723
+23.0	2.3000000000000003	1.3614448761812277
+24.0	2.4000000000000004	3.064735805983908
+25.0	2.5	2.6903566032744934
+26.0	2.6	2.4290676326124747
+27.0	2.7	4.161366911637214
+28.0	2.8000000000000003	1.1145249844991771
+29.0	2.9000000000000004	2.040933733499069
+30.0	3.0	2.858552312257049
+31.0	3.1	1.0345872852945477
+32.0	3.2	4.986821010982829
+33.0	3.3000000000000003	3.8621821878442666
+34.0	3.4000000000000004	1.8315409301869798
+35.0	3.5	3.218531677902038
+36.0	3.6	3.857618366281857
+37.0	3.7	2.800098852566543
+38.0	3.8000000000000003	3.0241384439413097
+39.0	3.9000000000000004	3.8338324993692345
+40.0	4.0	3.315525676679333
+41.0	4.1000000000000005	4.869457933346336
+42.0	4.2	4.224827895669636
+43.0	4.3	4.7481490012150696
+44.0	4.4	3.719332976475398
+45.0	4.5	5.459658003820859
+46.0	4.6000000000000005	3.9727745295858865
+47.0	4.7	4.624266586221793
+48.0	4.800000000000001	5.330351858791689
+49.0	4.9	3.8610588555077885
+50.0	5.0	4.80279205853373
+51.0	5.1000000000000005	5.491634520706891
+52.0	5.2	6.909309803093841
+53.0	5.300000000000001	6.250347870194489
+54.0	5.4	5.606750182470649
+55.0	5.5	5.531048913091318
+56.0	5.6000000000000005	6.708309868615826
+57.0	5.7	5.505698824169584
+58.0	5.800000000000001	7.443578457943644
+59.0	5.9	6.478010303914372
+60.0	6.0	7.710360088341963
+61.0	6.1000000000000005	7.66661680571905
+62.0	6.2	6.429643248906461
+63.0	6.300000000000001	3.9285742251456863
+64.0	6.4	5.865608682623606
+65.0	6.5	6.419451474742295
+66.0	6.6000000000000005	7.8859194676060085
+67.0	6.7	6.600505856823377
+68.0	6.800000000000001	5.900712909520696
+69.0	6.9	6.390336876834687
+70.0	7.0	6.659771178775214
+71.0	7.1000000000000005	8.663604073841723
+72.0	7.2	7.2575715035679105
+73.0	7.300000000000001	7.017753668264512
+74.0	7.4	7.116108308748837
+75.0	7.5	7.156890927222187
+76.0	7.6000000000000005	7.217389101699033
+77.0	7.7	8.29706529043113
+78.0	7.800000000000001	8.397946139425912
+79.0	7.9	9.444344596151478
+80.0	8.0	8.887590477451646
+81.0	8.1	6.682429579458668
+82.0	8.200000000000001	5.894873763719882
+83.0	8.3	7.924658368021774
+84.0	8.4	8.518094587997913
+85.0	8.5	7.4680248935524
+86.0	8.6	7.616810846131029
+87.0	8.700000000000001	11.161950744177995
+88.0	8.8	6.707631200845542
+89.0	8.9	8.515067193914767
+90.0	9.0	8.812823178036874
+91.0	9.1	9.118696259832157
+92.0	9.200000000000001	7.972578730735284
+93.0	9.3	9.732542931237127
+94.0	9.4	8.73446073505053
+95.0	9.5	9.157166419364735
+96.0	9.600000000000001	10.109543348028659
+97.0	9.700000000000001	9.946990726732482
+98.0	9.8	9.995105246063474
+99.0	9.9	7.73678166283983