natas_hw
/
jidt
mirror of https://github.com/jlizier/jidt
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding check of dimensionality of observations supplied to multivariate AIS calculators when univariate is expected.

This commit is contained in:
jlizier 2018-06-19 23:45:00 +10:00
parent 5bde6f295b
commit ca909dc60f
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/source/infodynamics/measures/continuous/ActiveInfoStorageCalculatorMultiVariateViaMutualInfo.java
View File

@ -292,6 +292,9 @@ public class ActiveInfoStorageCalculatorMultiVariateViaMutualInfo
public void addObservations(double[][] observations) throws Exception {
if (dimensions == 1) {
if ((observations.length > 0) && (observations[0].length != dimensions)) {
throw new Exception("Observations with dimension > 1 supplied when calculator only initialised for dimension 1");
}
addObservations(MatrixUtils.selectColumn(observations, 0));
} else {
// Store these observations in our vector for now
@ -342,6 +345,9 @@ public class ActiveInfoStorageCalculatorMultiVariateViaMutualInfo
}
if (dimensions == 1) {
if ((observations.length > 0) && (observations[0].length != dimensions)) {
throw new Exception("Observations with dimension > 1 supplied when calculator only initialised for dimension 1");
}
super.addObservations(MatrixUtils.selectColumn(observations, 0), startTime, numTimeSteps);
} else {
addObservations(MatrixUtils.selectRows(observations, startTime, numTimeSteps));
@ -364,6 +370,9 @@ public class ActiveInfoStorageCalculatorMultiVariateViaMutualInfo
throws Exception {
if (dimensions == 1) {
if ((observations.length > 0) && (observations[0].length != dimensions)) {
throw new Exception("Observations with dimension > 1 supplied when calculator only initialised for dimension 1");
}
super.addObservations(MatrixUtils.selectColumn(observations, 0), valid);
} else {
// Add these observations and the indication of their validity