Merge pull request #1 from willov/master

Fixed scripts so they work on Linux
chrsi30 · May 17, 2021 · b2d9179 · b2d9179
2 parents 983bbdb + 3e4ab5e
commit b2d9179
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.mex*
+*.asv
diff --git a/Bergqvist et al (2017)/GLUTPlosOneKr.txt → Bergqvist et al (2017)/GLUTPlosOnekr.txt b/Bergqvist et al (2017)/GLUTPlosOneKr.txt → Bergqvist et al (2017)/GLUTPlosOnekr.txt
diff --git a/MLMM/Figure_6_and_7AB.m b/MLMM/Figure_6_and_7AB.m
@@ -29,7 +29,7 @@
 hfd_color = [ 0.2, 0.5, 0.98];
 t2d_color = [1,0.7,0.2];
 
-Estimation_folder ='Results\MLMM_final\Estimation';
+Estimation_folder ='Results/MLMM_final/Estimation';
 S = dir(Estimation_folder);
 load(strcat(Estimation_folder,'/',S(3).name));
 theta2 = Results.xbest;

diff --git a/MLMM/Figure_7C.m b/MLMM/Figure_7C.m
@@ -29,7 +29,7 @@
 hfd_color = [ 0.2, 0.5, 0.98];
 t2d_color = [1,0.7,0.2];
 
-Estimation_folder ='Results\MLMM_final\Estimation';
+Estimation_folder ='Results/MLMM_final/Estimation';
 S = dir(Estimation_folder);
 load(strcat(Estimation_folder,'/',S(3).name));
 theta2 = Results.xbest;

diff --git a/MLMM/Figure_SA1.m b/MLMM/Figure_SA1.m
@@ -125,7 +125,7 @@
 
 %% Simulations for best cost.
 
-Estimation_folder ='Results\MLMM_final\Estimation';
+Estimation_folder ='Results/MLMM_final/Estimation';
 S = dir(Estimation_folder);
 load(strcat(Estimation_folder,'/',S(3).name));
 theta2 = Results.xbest;

diff --git a/MLMM/Figure_SA2.m b/MLMM/Figure_SA2.m
@@ -30,7 +30,7 @@
 hfd_color = [ 0.2, 0.5, 0.98];
 t2d_color = [1,0.7,0.2];
 
-Estimation_folder ='Results\MLMM_final\Estimation';
+Estimation_folder ='Results/MLMM_final/Estimation';
 S = dir(Estimation_folder);
 load(strcat(Estimation_folder,'/',S(3).name));
 theta2 = Results.xbest;

diff --git a/Plot_figures.m b/Plot_figures.m
@@ -1,5 +1,5 @@
 %% Setup SBtoolbox
-cd ('.\SBPOPPACKAGE');
+cd ('./SBPOPPACKAGE');
 installSBPOPpackage
 cd ..
 %% Setup