From 25df8eefcb36397a13e37063375e44103e29fc98 Mon Sep 17 00:00:00 2001
From: marcobarilari <marcobarilr@gmail.com>
Date: Tue, 29 Sep 2020 00:17:24 +0200
Subject: [PATCH 1/9] add func to set random seed

---
 src/randomization/setUpRand.m | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 src/randomization/setUpRand.m

diff --git a/src/randomization/setUpRand.m b/src/randomization/setUpRand.m
new file mode 100644
index 0000000..c022f36
--- /dev/null
+++ b/src/randomization/setUpRand.m
@@ -0,0 +1,18 @@
+function [] = setUpRand()
+    % Set up the randomizers for uniform and normal distributions.
+    % It is of great importance to do this before anything else!
+
+    seed = sum(100 * clock);
+
+    if isOctave
+
+        rand('state', seed);
+        randn('state', seed);
+
+    else
+
+        RandStream.setGlobalStream(RandStream('mt19937ar', 'seed', seed));
+
+    end
+
+end

From 744b5e51510e99b5666fcc1c90a25f07230d30c8 Mon Sep 17 00:00:00 2001
From: marcobarilari <marcobarilr@gmail.com>
Date: Tue, 29 Sep 2020 00:17:53 +0200
Subject: [PATCH 2/9] add documentation about random func

---
 docs/10_functions_description.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/10_functions_description.md b/docs/10_functions_description.md
index d1d50ab..c309de3 100644
--- a/docs/10_functions_description.md
+++ b/docs/10_functions_description.md
@@ -26,6 +26,7 @@
     -   6.1. [shuffle](#shuffle)
     -   6.2. [setTargetPositionInSequence](#setTargetPositionInSequence)
     -   6.3. [repeatShuffleConditions](#repeatShuffleConditions)
+    -   6.4. [setUpRand](#setUprand)
 
 <!-- vscode-markdown-toc-config
 	numbering=true
@@ -214,3 +215,7 @@ they are not in consecutive positions.
 Given `baseConditionVector`, a vector of conditions (coded as numbers), this
 will create a longer vector made of `nbRepeats` of this base vector and make
 sure that a given condition is not repeated one after the other.
+
+### 6.4. <a name='setUpRand'></a>setUpRand
+
+Set up the randomizers for uniform and normal distributions. It is of great importance to do this before anything else!

From 161be303799458810c843c8c11643e4c67933871 Mon Sep 17 00:00:00 2001
From: marcobarilari <marcobarilr@gmail.com>
Date: Tue, 29 Sep 2020 00:30:14 +0200
Subject: [PATCH 3/9] update random type for octave

---
 src/randomization/setUpRand.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/randomization/setUpRand.m b/src/randomization/setUpRand.m
index c022f36..b715e10 100644
--- a/src/randomization/setUpRand.m
+++ b/src/randomization/setUpRand.m
@@ -2,12 +2,14 @@
     % Set up the randomizers for uniform and normal distributions.
     % It is of great importance to do this before anything else!
 
+    % For an alternative from PTB see `ClockRandSeed`
+
     seed = sum(100 * clock);
 
     if isOctave
 
-        rand('state', seed);
-        randn('state', seed);
+        rand('twister', seed);
+        randn('twister', seed);
 
     else
 

From 243c377b4ce52116d0601744b6229ec8ff1e420f Mon Sep 17 00:00:00 2001
From: marcobarilari <marcobarilr@gmail.com>
Date: Tue, 29 Sep 2020 11:41:31 +0200
Subject: [PATCH 4/9] move the rand seeder func in /utilis

---
 src/{randomization => utils}/setUpRand.m | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/{randomization => utils}/setUpRand.m (100%)

diff --git a/src/randomization/setUpRand.m b/src/utils/setUpRand.m
similarity index 100%
rename from src/randomization/setUpRand.m
rename to src/utils/setUpRand.m

From 52212fe23f4723e0643fedec8676fbd5e5e05618 Mon Sep 17 00:00:00 2001
From: marcobarilari <marcobarilr@gmail.com>
Date: Tue, 29 Sep 2020 11:53:10 +0200
Subject: [PATCH 5/9] add coverage for the most modern to very old matlab
 version

---
 src/utils/setUpRand.m | 44 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/utils/setUpRand.m b/src/utils/setUpRand.m
index b715e10..06aad8e 100644
--- a/src/utils/setUpRand.m
+++ b/src/utils/setUpRand.m
@@ -1,7 +1,13 @@
-function [] = setUpRand()
-    % Set up the randomizers for uniform and normal distributions.
+% (C) Copyright 2010-2020 Sam Schwarzkopf
+% (C) Copyright 2020 CPP_PTB developers
+
+function setUpRand()
+    % setUpRand()
+    %
+    % Resets the seed of the random number generator. Will "adapt" depending on the matlab/octave
+    % version.
     % It is of great importance to do this before anything else!
-
+    %
     % For an alternative from PTB see `ClockRandSeed`
 
     seed = sum(100 * clock);
@@ -13,8 +19,32 @@
 
     else
 
-        RandStream.setGlobalStream(RandStream('mt19937ar', 'seed', seed));
-
+        try
+            % Use the reccomended method in modern Matlab
+            RandStream.setGlobalStream(RandStream('mt19937ar', 'seed', seed));
+            disp('Using modern randomizer...');
+        catch
+
+            try
+                % Use the recommended method in Matlab R2012a.
+                rng('shuffle');
+                disp('Using less modern randomizer...');
+            catch
+
+                try
+                    % Use worse methods for old versions of Matlab (e.g. 7.1.0.246 (R14) SP3).
+                    rand('twister', seed);
+                    randn('twister', seed);
+                    disp('Using outdated randomizer...');
+                catch
+                    % For very old Matlab versions these are the only methods you can use.
+                    % These are supposed to be flawed although you will probably not
+                    % notice any effect of this for most situations.
+                    rand('state', seed);
+                    randn('state', seed);
+                    disp('Using "flawed" randomizer...');
+                end
+            end
+        end
+        
     end
-
-end

From 7aba269f09b711da501c1ea79c5c360f5c9ba195 Mon Sep 17 00:00:00 2001
From: marcobarilari <marcobarilr@gmail.com>
Date: Tue, 29 Sep 2020 11:59:34 +0200
Subject: [PATCH 6/9] update doc for setUpRand

---
 docs/10_functions_description.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/10_functions_description.md b/docs/10_functions_description.md
index c309de3..f0bfa39 100644
--- a/docs/10_functions_description.md
+++ b/docs/10_functions_description.md
@@ -218,4 +218,5 @@ sure that a given condition is not repeated one after the other.
 
 ### 6.4. <a name='setUpRand'></a>setUpRand
 
-Set up the randomizers for uniform and normal distributions. It is of great importance to do this before anything else!
+Resets the seed of the random number generator. Will "adapt" depending on the matlab/octave version.
+ It is of great importance to do this before anything else!

From ea8e7e7d3abe030eee0ce9a37ba3633ab6a958b4 Mon Sep 17 00:00:00 2001
From: marcobarilari <marcobarilr@gmail.com>
Date: Tue, 29 Sep 2020 12:11:55 +0200
Subject: [PATCH 7/9] fix dead link in docs

---
 docs/00_index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/00_index.md b/docs/00_index.md
index 660c9a7..e0ceec6 100644
--- a/docs/00_index.md
+++ b/docs/00_index.md
@@ -193,7 +193,7 @@ let PTB find and use the default device.
 ## 3. <a name='functionsdescriptions'></a>functions descriptions
 
 The main functions of the toolbox are described
-[here](./10_functions_descriptions.md).
+[here](./10_functions_description.md).
 
 ## 4. <a name='Annexes'></a>Annexes
 

From d7ebc2690ae1a1b70a43e860d04fab4e2870ff07 Mon Sep 17 00:00:00 2001
From: marcobarilari <marcobarilr@gmail.com>
Date: Tue, 29 Sep 2020 12:13:31 +0200
Subject: [PATCH 8/9] mh fix

---
 src/utils/setUpRand.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/setUpRand.m b/src/utils/setUpRand.m
index 06aad8e..d63a687 100644
--- a/src/utils/setUpRand.m
+++ b/src/utils/setUpRand.m
@@ -46,5 +46,5 @@ function setUpRand()
                 end
             end
         end
-        
+
     end

From 323259e1f4e6a1272a278cfc89d0fc671f90539a Mon Sep 17 00:00:00 2001
From: marcobarilari <marcobarilr@gmail.com>
Date: Tue, 29 Sep 2020 12:18:07 +0200
Subject: [PATCH 9/9] put octave and matlab together

---
 src/utils/setUpRand.m | 44 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/utils/setUpRand.m b/src/utils/setUpRand.m
index d63a687..6311869 100644
--- a/src/utils/setUpRand.m
+++ b/src/utils/setUpRand.m
@@ -12,38 +12,30 @@ function setUpRand()
 
     seed = sum(100 * clock);
 
-    if isOctave
-
-        rand('twister', seed);
-        randn('twister', seed);
-
-    else
+    try
+        % Use the reccomended method in modern Matlab
+        RandStream.setGlobalStream(RandStream('mt19937ar', 'seed', seed));
+        disp('Using modern randomizer...');
+    catch
 
         try
-            % Use the reccomended method in modern Matlab
-            RandStream.setGlobalStream(RandStream('mt19937ar', 'seed', seed));
-            disp('Using modern randomizer...');
+            % Use the recommended method in Matlab R2012a.
+            rng('shuffle');
+            disp('Using less modern randomizer...');
         catch
 
             try
-                % Use the recommended method in Matlab R2012a.
-                rng('shuffle');
-                disp('Using less modern randomizer...');
+                % Use worse methods for Octave or old versions of Matlab (e.g. 7.1.0.246 (R14) SP3).
+                rand('twister', seed);
+                randn('twister', seed);
+                disp('Using Octave or outdated randomizer...');
             catch
-
-                try
-                    % Use worse methods for old versions of Matlab (e.g. 7.1.0.246 (R14) SP3).
-                    rand('twister', seed);
-                    randn('twister', seed);
-                    disp('Using outdated randomizer...');
-                catch
-                    % For very old Matlab versions these are the only methods you can use.
-                    % These are supposed to be flawed although you will probably not
-                    % notice any effect of this for most situations.
-                    rand('state', seed);
-                    randn('state', seed);
-                    disp('Using "flawed" randomizer...');
-                end
+                % For very old Matlab versions these are the only methods you can use.
+                % These are supposed to be flawed although you will probably not
+                % notice any effect of this for most situations.
+                rand('state', seed);
+                randn('state', seed);
+                disp('Using "flawed" randomizer...');
             end
         end