Merge branch 'master' of whale:scientificComputing

2017-01-24 11:14:07 +01:00 · 2017-01-24 11:14:07 +01:00 · 0501b89444
commit 0501b89444
parent 924d00679f 96834e71bc
51 changed files with 7 additions and 7 deletions
--- a/projects/project_eod/Makefile
+++ b/projects/project_eod/Makefile
@ -7,4 +7,4 @@ clean:
 	rm -f `basename *.tex .tex`.pdf

 zip: latex
-	zip `basename *.tex .tex`.zip *.pdf *.dat *.mat
+	zip `basename *.tex .tex`.zip *.pdf  data/*.mat
--- a/projects/project_eyetracker/Makefile
+++ b/projects/project_eyetracker/Makefile
@ -7,4 +7,4 @@ clean:
 	rm -f `basename *.tex .tex`.pdf

 zip: latex
-	zip `basename *.tex .tex`.zip *.pdf *.dat *.mat
+	zip `basename *.tex .tex`.zip *.pdf data/*.mat
--- a/projects/project_input_resistance/Makefile
+++ b/projects/project_input_resistance/Makefile
@ -7,4 +7,4 @@ clean:
 	rm -f `basename *.tex .tex`.pdf

 zip: latex
-	zip `basename *.tex .tex`.zip *.pdf *.dat *.mat
+	zip `basename *.tex .tex`.zip *.pdf data/*.mat
--- a/projects/project_input_resistance/data/resistance_CMS_1.mat
+++ b/projects/project_input_resistance/data/resistance_CMS_1.mat
--- a/projects/project_input_resistance/data/resistance_CMS_2.mat
+++ b/projects/project_input_resistance/data/resistance_CMS_2.mat
--- a/projects/project_input_resistance/data/resistance_CMS_3.mat
+++ b/projects/project_input_resistance/data/resistance_CMS_3.mat
--- a/projects/project_input_resistance/data/resistance_CMS_4.mat
+++ b/projects/project_input_resistance/data/resistance_CMS_4.mat
--- a/projects/project_input_resistance/data/resistance_CMS_5.mat
+++ b/projects/project_input_resistance/data/resistance_CMS_5.mat
--- a/projects/project_input_resistance/data/resistance_MS_1.mat
+++ b/projects/project_input_resistance/data/resistance_MS_1.mat
--- a/projects/project_input_resistance/data/resistance_MS_2.mat
+++ b/projects/project_input_resistance/data/resistance_MS_2.mat
--- a/projects/project_input_resistance/data/resistance_MS_3.mat
+++ b/projects/project_input_resistance/data/resistance_MS_3.mat
--- a/projects/project_input_resistance/data/resistance_MS_4.mat
+++ b/projects/project_input_resistance/data/resistance_MS_4.mat
--- a/projects/project_input_resistance/data/resistance_MS_5.mat
+++ b/projects/project_input_resistance/data/resistance_MS_5.mat
--- a/projects/project_numbers/data/Neuron22.mat
+++ b/projects/project_numbers/data/Neuron22.mat
--- a/projects/project_onset_fi/Makefile
+++ b/projects/project_onset_fi/Makefile
@ -7,4 +7,4 @@ clean:
 	rm -f `basename *.tex .tex`.pdf

 zip: latex
-	zip `basename *.tex .tex`.zip *.pdf *.dat *.mat
+	zip `basename *.tex .tex`.zip *.pdf *.dat data/*.mat
--- a/projects/project_photoreceptor/Makefile
+++ b/projects/project_photoreceptor/Makefile
@ -7,4 +7,4 @@ clean:
 	rm -f `basename *.tex .tex`.pdf

 zip: latex
-	zip `basename *.tex .tex`.zip *.pdf *.dat *.mat
+	zip `basename *.tex .tex`.zip *.pdf *.dat data/*.mat
--- a/projects/project_photoreceptor/data/R1_6_step_response_0.mat
+++ b/projects/project_photoreceptor/data/R1_6_step_response_0.mat
--- a/projects/project_photoreceptor/data/R1_6_step_response_1.mat
+++ b/projects/project_photoreceptor/data/R1_6_step_response_1.mat
--- a/projects/project_photoreceptor/data/R1_6_step_response_2.mat
+++ b/projects/project_photoreceptor/data/R1_6_step_response_2.mat
--- a/projects/project_photoreceptor/data/R1_6_step_response_3.mat
+++ b/projects/project_photoreceptor/data/R1_6_step_response_3.mat
--- a/projects/project_photoreceptor/data/R1_6_step_response_4.mat
+++ b/projects/project_photoreceptor/data/R1_6_step_response_4.mat
--- a/projects/project_photoreceptor/data/R1_6_step_response_5.mat
+++ b/projects/project_photoreceptor/data/R1_6_step_response_5.mat
--- a/projects/project_photoreceptor/data/R1_6_step_response_6.mat
+++ b/projects/project_photoreceptor/data/R1_6_step_response_6.mat
--- a/projects/project_random_walk/Makefile
+++ b/projects/project_random_walk/Makefile
@ -7,4 +7,4 @@ clean:
 	rm -f `basename *.tex .tex`.pdf

 zip: latex
-	zip `basename *.tex .tex`.zip *.pdf *.dat *.mat
+	zip `basename *.tex .tex`.zip *.pdf *.dat data/*.mat
--- a/projects/project_vector_strength/Makefile
+++ b/projects/project_vector_strength/Makefile
@ -7,4 +7,4 @@ clean:
 	rm -f `basename *.tex .tex`.pdf

 zip: latex
-	zip `basename *.tex .tex`.zip *.pdf data/*.zip
+	zip `basename *.tex .tex`.zip *.pdf data/*.mat
--- a/projects/project_vector_strength/data/2012-03-23-aa_baseline.mat
+++ b/projects/project_vector_strength/data/2012-03-23-aa_baseline.mat
--- a/projects/project_vector_strength/data/2012-04-20-ac_baseline.mat
+++ b/projects/project_vector_strength/data/2012-04-20-ac_baseline.mat
--- a/projects/project_vector_strength/data/2012-04-20-ad_baseline.mat
+++ b/projects/project_vector_strength/data/2012-04-20-ad_baseline.mat
--- a/projects/project_vector_strength/data/2012-04-20-ah_baseline.mat
+++ b/projects/project_vector_strength/data/2012-04-20-ah_baseline.mat
--- a/projects/project_vector_strength/data/2012-04-26-aa_baseline.mat
+++ b/projects/project_vector_strength/data/2012-04-26-aa_baseline.mat
--- a/projects/project_vector_strength/data/2012-05-07-ae_baseline.mat
+++ b/projects/project_vector_strength/data/2012-05-07-ae_baseline.mat
--- a/projects/project_vector_strength/data/2012-05-10-ab_baseline.mat
+++ b/projects/project_vector_strength/data/2012-05-10-ab_baseline.mat
--- a/projects/project_vector_strength/data/2012-06-08-ag_baseline.mat
+++ b/projects/project_vector_strength/data/2012-06-08-ag_baseline.mat
--- a/projects/project_vector_strength/data/2012-06-08-ai_baseline.mat
+++ b/projects/project_vector_strength/data/2012-06-08-ai_baseline.mat
--- a/projects/project_vector_strength/data/2012-06-25-ad_baseline.mat
+++ b/projects/project_vector_strength/data/2012-06-25-ad_baseline.mat
--- a/projects/project_vector_strength/data/2012-06-27-ah_baseline.mat
+++ b/projects/project_vector_strength/data/2012-06-27-ah_baseline.mat
--- a/projects/project_vector_strength/data/2012-06-27-ak_baseline.mat
+++ b/projects/project_vector_strength/data/2012-06-27-ak_baseline.mat
--- a/projects/project_vector_strength/data/2012-07-11-aa_baseline.mat
+++ b/projects/project_vector_strength/data/2012-07-11-aa_baseline.mat
--- a/projects/project_vector_strength/data/2012-07-11-an_baseline.mat
+++ b/projects/project_vector_strength/data/2012-07-11-an_baseline.mat
--- a/projects/project_vector_strength/data/2012-07-12-ap_baseline.mat
+++ b/projects/project_vector_strength/data/2012-07-12-ap_baseline.mat
--- a/projects/project_vector_strength/data/2012-10-31-af_baseline.mat
+++ b/projects/project_vector_strength/data/2012-10-31-af_baseline.mat
--- a/projects/project_vector_strength/data/2012-10-31-ai_baseline.mat
+++ b/projects/project_vector_strength/data/2012-10-31-ai_baseline.mat
--- a/projects/project_vector_strength/data/2012-12-13-ad_baseline.mat
+++ b/projects/project_vector_strength/data/2012-12-13-ad_baseline.mat
--- a/projects/project_vector_strength/data/2012-12-13-ak_baseline.mat
+++ b/projects/project_vector_strength/data/2012-12-13-ak_baseline.mat
--- a/projects/project_vector_strength/data/2012-12-13-ao_baseline.mat
+++ b/projects/project_vector_strength/data/2012-12-13-ao_baseline.mat
--- a/projects/project_vector_strength/data/2012-12-13-ap_baseline.mat
+++ b/projects/project_vector_strength/data/2012-12-13-ap_baseline.mat
--- a/projects/project_vector_strength/data/2012-12-20-ad_baseline.mat
+++ b/projects/project_vector_strength/data/2012-12-20-ad_baseline.mat
--- a/projects/project_vector_strength/data/2012-12-21-ai_baseline.mat
+++ b/projects/project_vector_strength/data/2012-12-21-ai_baseline.mat
--- a/projects/project_vector_strength/data/2012-12-21-am_baseline.mat
+++ b/projects/project_vector_strength/data/2012-12-21-am_baseline.mat
--- a/projects/project_vector_strength/data/2012-12-21-an_baseline.mat
+++ b/projects/project_vector_strength/data/2012-12-21-an_baseline.mat
--- a/projects/project_vector_strength/data/project_vector_strength.zip
+++ b/projects/project_vector_strength/data/project_vector_strength.zip