diff --git a/README.md b/README.md
index e66a7843..64982b8b 100755
--- a/README.md
+++ b/README.md
@@ -27,9 +27,9 @@ Core functions in this package are known to be compatible with versions of Octav
### Installation
-To install (or test) the statistics-resampling package at it's existing location in either Octave or Matlab, follow these steps:
+To install (or test) the statistics-resampling package at a location of your choice, follow these steps:
- * Download the package release from [here](https://github.com/gnu-octave/statistics-resampling/releases/). If it is a compressed file (.zip or .tar.gz), extract it's contents and move the package directory to the desired location.
+ * Download the latest package release from [here](https://github.com/gnu-octave/statistics-resampling/releases/). Extract (not just browse) the contents of the compressed file (.zip or .tar.gz), and move the package directory to the desired location.
* Open Octave or Matlab (command prompt).
* Change directory (cd) into the package folder. (The directory contains a file called 'make.m' and 'install.m', among others)
* Type `make` to compile the MEX files from source (or use the precompiled binaries if available. If suitable precompiled binaries are not available for your platform, then Matlab/Octave will need access to a C++11 compiler. Note that if you skip the make step, then the package functions will still work, but some will run slower. This step is interactive so check the command window.)
diff --git a/docs/function/boot.html b/docs/function/boot.html
index c874d2d1..f4a0d8e5 100644
--- a/docs/function/boot.html
+++ b/docs/function/boot.html
@@ -115,9 +115,9 @@ Demonstration 1
Produces the following output
ans =
- 3 1 1 2 3 3 2 1 2 2 3 1 3 1 3 1 1 3 3 3
- 2 2 3 3 1 1 3 1 2 1 1 2 2 2 2 2 3 3 2 3
- 1 2 1 3 1 1 1 1 2 2 3 1 3 2 2 2 3 1 2 3
+ 3 3 1 2 1 3 2 3 2 1 1 3 2 1 3 3 2 2 2 3
+ 3 3 1 2 1 1 1 2 3 1 1 2 1 2 3 3 1 1 3 1
+ 3 2 2 3 2 2 2 1 3 1 2 3 2 3 2 1 1 1 3 2
Demonstration 2
@@ -129,9 +129,9 @@
Demonstration 2
Produces the following output
ans =
- 3 3 1 2 3 1 2 1 2 2 1 1 3 1 2 2 3 1 1 1
- 3 3 2 3 3 2 2 1 2 2 1 2 3 1 2 3 3 2 3 1
- 3 1 1 2 3 2 3 1 1 3 3 2 3 1 2 3 1 2 1 2
+ 3 3 1 3 3 2 2 1 1 2 1 1 3 3 1 3 1 2 2 1
+ 2 1 2 3 3 2 3 3 1 3 1 1 3 3 2 3 1 2 2 1
+ 3 3 1 2 1 2 2 1 1 2 3 2 2 1 2 2 3 2 3 1
Demonstration 3
diff --git a/docs/function/boot1way.html b/docs/function/boot1way.html
index cfcc6df7..32e59bdb 100644
--- a/docs/function/boot1way.html
+++ b/docs/function/boot1way.html
@@ -473,7 +473,7 @@
Demonstration 6
-----------------------------------------------------------------------------
| Comparison | Test # | Ref # | Difference | t | p |
|------------|------------|------------|------------|------------|----------|
-| 1 | 2 | 1 | -0.3036 | -0.73 | .398 |
+| 1 | 2 | 1 | -0.9135 | -2.67 | .026 |*
-----------------------------------------------------------------------------
| GROUP # | GROUP label | N |
@@ -518,7 +518,7 @@ Demonstration 7
-----------------------------------------------------------------------------
| Comparison | Test # | Ref # | Difference | t | p |
|------------|------------|------------|------------|------------|----------|
-| 1 | 2 | 1 | +0.03654 | +0.05 | .945 |
+| 1 | 2 | 1 | +0.08888 | +0.12 | .827 |
-----------------------------------------------------------------------------
| GROUP # | GROUP label | N |
diff --git a/docs/function/bootbayes.html b/docs/function/bootbayes.html
index ef35635d..8a5654bf 100644
--- a/docs/function/bootbayes.html
+++ b/docs/function/bootbayes.html
@@ -186,7 +186,7 @@ Demonstration 1
Posterior Statistics:
original bias median stdev CI_lower CI_upper
- +184.5 +0.007511 +184.5 1.296 +182.1 +187.2
+ +184.5 -0.002011 +184.5 1.331 +181.9 +187.1
Demonstration 2
@@ -222,8 +222,8 @@
Demonstration 2
Posterior Statistics:
original bias median stdev CI_lower CI_upper
- +175.5 +0.01716 +175.5 2.380 +170.5 +180.1
- +0.1904 -0.001915 +0.1901 0.07940 +0.02901 +0.3417
+ +175.5 -0.03629 +175.4 2.438 +170.7 +180.2
+ +0.1904 -0.0001636 +0.1918 0.08098 +0.03791 +0.3574
Package: statistics-resampling
diff --git a/docs/function/bootci.html b/docs/function/bootci.html
index 7f009d79..58239950 100644
--- a/docs/function/bootci.html
+++ b/docs/function/bootci.html
@@ -183,8 +183,8 @@ Demonstration 1
Produces the following output
ci =
- 23.616
- 34.358
+ 23.540
+ 34.574
Demonstration 2
@@ -202,8 +202,8 @@
Demonstration 2
Produces the following output
ci =
- 23.975
- 34.269
+ 23.886
+ 34.390
Demonstration 3
@@ -222,8 +222,8 @@
Demonstration 3
Produces the following output
ci =
- 25.040
- 36.477
+ 24.710
+ 37.094
Demonstration 4
@@ -239,8 +239,8 @@
Demonstration 4
Produces the following output
ci =
- 96.629
- 235.910
+ 96.788
+ 237.389
Demonstration 5
@@ -256,8 +256,8 @@
Demonstration 5
Produces the following output
ci =
- 117.01
- 260.73
+ 116.08
+ 263.28
Demonstration 6
@@ -276,8 +276,8 @@
Demonstration 6
Produces the following output
ci =
- 108.55
- 297.71
+ 116.56
+ 293.82
Demonstration 7
@@ -296,8 +296,8 @@
Demonstration 7
Produces the following output
ci =
- 111.53
- 268.13
+ 112.32
+ 280.18
Demonstration 8
@@ -317,8 +317,8 @@
Demonstration 8
Produces the following output
ci =
- 0.5050
- 0.8633
+ 0.5174
+ 0.8637
Demonstration 9
diff --git a/docs/function/bootclust.html b/docs/function/bootclust.html
index ffd0a7fa..d7ca772e 100644
--- a/docs/function/bootclust.html
+++ b/docs/function/bootclust.html
@@ -337,8 +337,8 @@
Demonstration 7
Bootstrap Statistics:
original bias std_error CI_lower CI_upper
- -0.2335 -0.001628 +0.2054 -0.5870 +0.09054
- +0.1101 +0.007670 +0.2271 -0.2454 +0.4870
+ -0.2246 +0.03767 +0.2504 -0.6439 +0.1755
+ -0.4531 +0.04160 +0.2805 -0.9408 -0.04681
Demonstration 8
@@ -364,8 +364,8 @@
Demonstration 8
Bootstrap Statistics:
original bias std_error CI_lower CI_upper
- +0.1900 +0.03519 +0.2267 -0.1441 +0.5321
- +0.04158 +0.03520 +0.3908 -0.5824 +0.6636
+ -0.06381 -0.006020 +0.2844 -0.5015 +0.4408
+ -0.2545 -0.01749 +0.2804 -0.6349 +0.2186
Demonstration 9
diff --git a/docs/function/bootknife.html b/docs/function/bootknife.html
index 7d880851..32907e9f 100644
--- a/docs/function/bootknife.html
+++ b/docs/function/bootknife.html
@@ -425,8 +425,8 @@
Demonstration 8
Bootstrap Statistics:
original bias std_error CI_lower CI_upper
- +0.06241 -0.01650 +0.2452 -0.3228 +0.4692
- +0.1596 -0.0001629 +0.2018 -0.1352 +0.5346
+ +0.0004216 +0.01043 +0.1768 -0.3131 +0.2727
+ +0.3188 -0.01964 +0.2658 -0.2203 +0.6758
Demonstration 9
diff --git a/docs/function/bootlm.html b/docs/function/bootlm.html
index 68124548..5a1761be 100644
--- a/docs/function/bootlm.html
+++ b/docs/function/bootlm.html
@@ -851,9 +851,9 @@
Demonstration 6
## Since the interaction term (F(1,18) = 0.42) was not significant (p > 0.1),
## we might rather consider the hypotheses tested using type II sums-of-
## squares without the interaction, which do not depend on the order and have
- ## more power respectively. This is easy to achieve with 2 predictors, by
- ## repeating the 'bootlm' commands with different predictors added last to
- ## the model (as above) but without the interaction (i.e. setting 'model',
+ ## more power respectively. This is easy to achieve with only 2 predictors,
+ ## by repeating the 'bootlm' commands with different predictors added last to
+ ## the model (as above) but without any interaction (i.e. setting 'model',
## 'linear'). We then take the statistics for the last main effect listed
## in each of the ANOVA tables - these then correspond to the ANOVA test for
## the respective predictor with type II sums-of-squares. For example:
diff --git a/docs/function/bootmode.html b/docs/function/bootmode.html
index 6798f72c..941b2770 100644
--- a/docs/function/bootmode.html
+++ b/docs/function/bootmode.html
@@ -148,9 +148,9 @@
Demonstration 1
Produces the following output
ans = Summary of results:
-ans = H1 is 1 with p = 0 so reject the null hypothesisthat there is 1 mode
+ans = H1 is 1 with p = 0.0015 so reject the null hypothesisthat there is 1 mode
-ans = H2 is 0 with p = 0.312 so accept the null hypothesis that there are 2 modes
+ans = H2 is 0 with p = 0.329 so accept the null hypothesis that there are 2 modes
Package: statistics-resampling
diff --git a/docs/function/bootstrp.html b/docs/function/bootstrp.html
index ebb54cbd..46b5d34a 100644
--- a/docs/function/bootstrp.html
+++ b/docs/function/bootstrp.html
@@ -104,58 +104,58 @@ Demonstration 1
Produces the following output
bootstat =
- 30.385
- 26.577
- 32.962
- 26.885
- 28.962
- 27.385
- 29.538
- 28.615
- 36.269
- 29.192
- 36.192
- 35.346
- 30.923
- 31.423
- 30.231
- 25.692
- 28.577
- 27.038
- 26.269
- 31.423
- 30.154
+ 27.231
+ 30.462
+ 26.846
29.654
- 28.577
- 32.154
+ 31.154
+ 29.769
+ 30.308
+ 31.231
+ 30.731
+ 31.000
+ 27.692
+ 29.346
+ 29.923
+ 34.731
+ 26.462
+ 29.269
+ 28.308
+ 28.115
+ 27.231
28.385
- 32.615
- 24.846
- 32.269
- 25.577
- 29.615
- 26.923
+ 28.462
27.038
- 26.731
- 33.923
- 31.962
- 26.538
- 26.846
- 29.769
- 27.000
- 26.731
- 29.231
- 30.885
- 31.077
+ 28.385
+ 28.962
+ 25.808
+ 27.615
+ 32.269
+ 31.231
+ 36.231
+ 35.538
+ 28.692
30.000
- 29.115
- 31.769
- 32.423
- 30.692
- 29.231
- 31.077
-
-ans = 2.7164
+ 31.615
+ 29.423
+ 28.846
+ 26.000
+ 31.231
+ 35.423
+ 27.615
+ 28.538
+ 27.385
+ 30.769
+ 26.462
+ 25.192
+ 33.769
+ 27.846
+ 32.462
+ 31.538
+ 30.885
+ 29.615
+
+ans = 2.5580
Package: statistics-resampling
diff --git a/docs/function/images/boot1way_601.png b/docs/function/images/boot1way_601.png
index 63c5650f..ece541a6 100644
Binary files a/docs/function/images/boot1way_601.png and b/docs/function/images/boot1way_601.png differ
diff --git a/docs/function/images/boot1way_701.png b/docs/function/images/boot1way_701.png
index f27ae983..17a4718f 100644
Binary files a/docs/function/images/boot1way_701.png and b/docs/function/images/boot1way_701.png differ
diff --git a/docs/readme.html b/docs/readme.html
index e24ddaec..fbef3526 100644
--- a/docs/readme.html
+++ b/docs/readme.html
@@ -59,13 +59,13 @@ Requirements and
Machine Learning Toolbox (in Matlab).
Installation
-
To install (or test) the statistics-resampling package at it’s
-existing location in either Octave or Matlab, follow these steps:
+To install (or test) the statistics-resampling package at a location
+of your choice, follow these steps:
-- Download the package release from Download the latest package release from here.
-If it is a compressed file (.zip or .tar.gz), extract it’s contents and
-move the package directory to the desired location.
+Extract (not just browse) the contents of the compressed file (.zip or
+.tar.gz), and move the package directory to the desired location.
- Open Octave or Matlab (command prompt).
- Change directory (cd) into the package folder. (The directory
contains a file called ‘make.m’ and ‘install.m’, among others)
diff --git a/make.m b/make.m
index 634ba705..11019c65 100755
--- a/make.m
+++ b/make.m
@@ -72,19 +72,19 @@
% Attemt to compile binaries from source code automatically if no suitable binaries can be found
if binary
- fprintf('The following suitable binaries were detected and copied over to the inst directory: ');
- fprintf('\n%s%s%s%s%s', '.', filesep, binary_paths{~cellfun(@isempty,arch_idx)}, 'boot.', mexext);
- fprintf('\n%s%s%s%s%s', '.', filesep, binary_paths{~cellfun(@isempty,arch_idx)}, 'smoothmedian.', mexext);
+ fprintf ('The following suitable binaries were detected and copied over to the inst directory: ');
+ fprintf ('\n%s%s%s%s%s', '.', filesep, binary_paths{~cellfun(@isempty,arch_idx)}, 'boot.', mexext);
+ fprintf ('\n%s%s%s%s%s', '.', filesep, binary_paths{~cellfun(@isempty,arch_idx)}, 'smoothmedian.', mexext);
else
- disp('Either you chose to compile from source, or no binaries are suitable.');
- disp('Attempting to compile the source code...');
+ disp ('Either you chose to compile from source, or no binaries are suitable.');
+ disp ('Attempting to compile the source code...');
if isoctave
try
mkoctfile -std=c++11 --mex --output ./inst/boot ./src/boot.cpp
catch
errflag = true;
err = lasterror();
- disp(err.message);
+ disp (err.message);
warning ('Could not compile boot.%s. Falling back to the (slower) boot.m file.',mexext)
end
try
@@ -108,7 +108,7 @@
catch
errflag = true;
err = lasterror();
- disp(err.message);
+ disp (err.message);
warning ('Could not compile boot.%s. Falling back to the (slower) boot.m file.',mexext)
end
try
@@ -116,16 +116,20 @@
catch
errflag = true;
err = lasterror();
- disp(err.message);
+ disp (err.message);
warning ('Could not compile smoothmedian.%s. Falling back to the (slower) smoothmedian.m file.',mexext)
end
end
end
if errflag
- fprintf('\nmake completed with errors. Please review the details in the errors in the above output. \n')
- fprintf('If you now execute ''install'', .m files equivalent to the mex files will be used instead. \n')
+ fprintf ('\nmake completed with errors. Please review the details in the errors in the above output. \n')
+ fprintf ('It is possible that a suitable c++ compiler is not installed or been configured properly. \n')
+ if (~ isoctave)
+ fprintf ('Try running ''mex -setup c++'' and following the instructions. \n')
+ end
+ fprintf ('If you now execute ''install'', .m files equivalent to the mex files will be used instead. \n')
else
- fprintf('\n''make'' completed successfully. Please now run the ''install'' command. \n')
+ fprintf ('\n''make'' completed successfully. Please now run the ''install'' command. \n')
end
clear arch arch_idx binary binary_paths comp endian info isoctave maxsize errflag retval