diff --git a/.gitignore b/.gitignore index 9bc7e713b..21d50e013 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ sql_settings.conf *.mexw64 *.mexw64.manifest *.mexmaci64 +*.mexmaca64 *.mexa64 # Random stuff diff --git a/Calculation/TS_Combine.m b/Calculation/TS_Combine.m index 039b38a9a..da8489acb 100644 --- a/Calculation/TS_Combine.m +++ b/Calculation/TS_Combine.m @@ -74,7 +74,7 @@ function TS_Combine(HCTSA_1,HCTSA_2,compare_tsids,merge_features,outputFileName, 'time series IDs are comparable.\nAny intersection of IDs will be filtered out.\n'],... HCTSA_1,HCTSA_2); else - fprintf(1,['Assuming that %s and %s came different databases so' ... + fprintf(1,['Assuming that %s and %s came from different databases so' ... ' duplicate ts_ids can occur in the resulting matrix.\n'], ... HCTSA_1,HCTSA_2); end diff --git a/Database/ToolboxDependencies.txt b/Database/ToolboxDependencies.txt index ffcdf4a0e..a3fb80ef0 100644 --- a/Database/ToolboxDependencies.txt +++ b/Database/ToolboxDependencies.txt @@ -172,10 +172,10 @@ EXTERNAL TOOLBOXES (PROVIDED) Michael Small Package (provided) -NL_BoxCorrDim.m NL_MS_LZcomplexity.m NL_MS_fnn.m NL_MS_nlpe.m +NL_TSTL_BoxCorrDim.m NL_TSTL_PoincareSection.m NL_TSTL_ReturnTime.m NL_TSTL_TakensEstimator.m @@ -194,7 +194,7 @@ TSTOOL Package (GPL; provided) CO_TSTL_AutoCorrMethod.m CO_TSTL_amutual.m CO_TSTL_amutual2.m -NL_BoxCorrDim.m +NL_TSTL_BoxCorrDim.m NL_CaosMethod.m NL_TSTL_FractalDimensions.m NL_TSTL_GPCorrSum.m @@ -227,7 +227,7 @@ MF_GP_hyperparameters.m CRP Toolbox (GPL, provided) -NL_BoxCorrDim.m +NL_TSTL_BoxCorrDim.m NL_crptool_fnn.m HMM Toolbox (MIT License, provided) diff --git a/FeatureSets/INP_mops_hctsa.txt b/FeatureSets/INP_mops_hctsa.txt index d01b9939a..f9e1d65ef 100644 --- a/FeatureSets/INP_mops_hctsa.txt +++ b/FeatureSets/INP_mops_hctsa.txt @@ -148,61 +148,76 @@ CO_FirstMin(x_z,'mi-kraskov1','4',false) CO_FirstMax_mi-kraskov1_4 CO_FirstMin(x_z,'mi-kraskov2','4',false) CO_FirstMax_mi-kraskov2_4 CO_FirstMin(x_z,'mi-hist',5,false) CO_FirstMax_mi-hist_5 CO_FirstMin(x_z,'mi-hist',10,false) CO_FirstMax_mi-hist_10 -CO_NonlinearAutocorr(x_z,[1,2]) AC_nl_12 -CO_NonlinearAutocorr(x_z,[1,2,3]) AC_nl_123 -CO_NonlinearAutocorr(x_z,[1,2,3,4]) AC_nl_1234 -CO_NonlinearAutocorr(x_z,[1,2,3,4,5]) AC_nl_12345 -CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6]) AC_nl_123456 -CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6,7]) AC_nl_1234567 -CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6,7,8]) AC_nl_12345678 -CO_NonlinearAutocorr(x_z,[1,3]) AC_nl_13 -CO_NonlinearAutocorr(x_z,[2,4]) AC_nl_24 -CO_NonlinearAutocorr(x_z,[1,3,5]) AC_nl_135 -CO_NonlinearAutocorr(x_z,[2,4,6]) AC_nl_246 -CO_NonlinearAutocorr(x_z,[1,3,5,7]) AC_nl_1357 -CO_NonlinearAutocorr(x_z,[2,4,6,8]) AC_nl_2468 -CO_NonlinearAutocorr(x_z,[1,2,4]) AC_nl_124 -CO_NonlinearAutocorr(x_z,[1,3,4]) AC_nl_134 -CO_NonlinearAutocorr(x_z,[1,4]) AC_nl_14 -CO_NonlinearAutocorr(x_z,[1,1]) AC_nl_11 -CO_NonlinearAutocorr(x_z,[2,2]) AC_nl_22 -CO_NonlinearAutocorr(x_z,[3,3]) AC_nl_33 -CO_NonlinearAutocorr(x_z,[4,4]) AC_nl_44 -CO_NonlinearAutocorr(x_z,[5,5]) AC_nl_55 -CO_NonlinearAutocorr(x_z,[6,6]) AC_nl_66 -CO_NonlinearAutocorr(x_z,[0,1,1]) AC_nl_011 -CO_NonlinearAutocorr(x_z,[0,2,2]) AC_nl_022 -CO_NonlinearAutocorr(x_z,[0,3,3]) AC_nl_033 -CO_NonlinearAutocorr(x_z,[0,4,4]) AC_nl_044 -CO_NonlinearAutocorr(x_z,[0,5,5]) AC_nl_055 -CO_NonlinearAutocorr(x_z,[0,6,6]) AC_nl_066 -CO_NonlinearAutocorr(x_z,[0,0,1]) AC_nl_001 -CO_NonlinearAutocorr(x_z,[0,0,2]) AC_nl_002 -CO_NonlinearAutocorr(x_z,[0,0,3]) AC_nl_003 -CO_NonlinearAutocorr(x_z,[0,0,4]) AC_nl_004 -CO_NonlinearAutocorr(x_z,[0,0,5]) AC_nl_005 -CO_NonlinearAutocorr(x_z,[0,0,6]) AC_nl_006 -CO_NonlinearAutocorr(x_z,[0,1,2]) AC_nl_012 -CO_NonlinearAutocorr(x_z,[0,1,3]) AC_nl_013 -CO_NonlinearAutocorr(x_z,[0,2,3]) AC_nl_023 -CO_NonlinearAutocorr(x_z,[0,1,4]) AC_nl_014 -CO_NonlinearAutocorr(x_z,[0,2,4]) AC_nl_024 -CO_NonlinearAutocorr(x_z,[0,3,4]) AC_nl_034 -CO_NonlinearAutocorr(x_z,[0,1,5]) AC_nl_015 -CO_NonlinearAutocorr(x_z,[0,2,5]) AC_nl_025 -CO_NonlinearAutocorr(x_z,[0,3,5]) AC_nl_035 -CO_NonlinearAutocorr(x_z,[0,4,5]) AC_nl_045 -CO_NonlinearAutocorr(x_z,[0,1,6]) AC_nl_016 -CO_NonlinearAutocorr(x_z,[0,2,6]) AC_nl_026 -CO_NonlinearAutocorr(x_z,[0,3,6]) AC_nl_036 -CO_NonlinearAutocorr(x_z,[0,4,6]) AC_nl_046 -CO_NonlinearAutocorr(x_z,[0,5,6]) AC_nl_056 -CO_NonlinearAutocorr(x_z,[1,1,2]) AC_nl_112 -CO_NonlinearAutocorr(x_z,[1,1,3]) AC_nl_113 -CO_NonlinearAutocorr(x_z,[1,2,2]) AC_nl_122 -CO_NonlinearAutocorr(x_z,[1,3,3]) AC_nl_133 -CO_NonlinearAutocorr(x_z,[2,2,3]) AC_nl_223 -CO_NonlinearAutocorr(x_z,[2,3,3]) AC_nl_233 +CO_NonlinearAutocorr(x_z,[1,2],false) AC_nl_12 +CO_NonlinearAutocorr(x_z,[1,2],true) AC_nl_12_abs +CO_NonlinearAutocorr(x_z,[1,2,3],false) AC_nl_123 +CO_NonlinearAutocorr(x_z,[1,2,3,4],false) AC_nl_1234 +CO_NonlinearAutocorr(x_z,[1,2,3,4],true) AC_nl_1234_abs +CO_NonlinearAutocorr(x_z,[1,2,3,4,5],false) AC_nl_12345 +CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6],false) AC_nl_123456 +CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6],true) AC_nl_123456_abs +CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6,7],false) AC_nl_1234567 +CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6,7,8],false) AC_nl_12345678 +CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6,7,8],true) AC_nl_12345678_abs +CO_NonlinearAutocorr(x_z,[1,3],false) AC_nl_13 +CO_NonlinearAutocorr(x_z,[1,3],true) AC_nl_13_abs +CO_NonlinearAutocorr(x_z,[2,4],false) AC_nl_24 +CO_NonlinearAutocorr(x_z,[2,4],true) AC_nl_24_abs +CO_NonlinearAutocorr(x_z,[1,3,5],false) AC_nl_135 +CO_NonlinearAutocorr(x_z,[2,4,6],false) AC_nl_246 +CO_NonlinearAutocorr(x_z,[1,3,5,7],false) AC_nl_1357 +CO_NonlinearAutocorr(x_z,[1,3,5,7],true) AC_nl_1357_abs +CO_NonlinearAutocorr(x_z,[2,4,6,8],false) AC_nl_2468 +CO_NonlinearAutocorr(x_z,[2,4,6,8],true) AC_nl_2468_abs +CO_NonlinearAutocorr(x_z,[1,2,4],false) AC_nl_124 +CO_NonlinearAutocorr(x_z,[1,3,4],false) AC_nl_134 +CO_NonlinearAutocorr(x_z,[1,4],false) AC_nl_14 +CO_NonlinearAutocorr(x_z,[1,4],true) AC_nl_14_abs +CO_NonlinearAutocorr(x_z,[1,1],false) AC_nl_11 +CO_NonlinearAutocorr(x_z,[1,1],true) AC_nl_11_abs +CO_NonlinearAutocorr(x_z,[2,2],false) AC_nl_22 +CO_NonlinearAutocorr(x_z,[2,2],true) AC_nl_22_abs +CO_NonlinearAutocorr(x_z,[3,3],false) AC_nl_33 +CO_NonlinearAutocorr(x_z,[3,3],true) AC_nl_33_abs +CO_NonlinearAutocorr(x_z,[4,4],false) AC_nl_44 +CO_NonlinearAutocorr(x_z,[4,4],true) AC_nl_44_abs +CO_NonlinearAutocorr(x_z,[5,5],false) AC_nl_55 +CO_NonlinearAutocorr(x_z,[5,5],true) AC_nl_55_abs +CO_NonlinearAutocorr(x_z,[6,6],false) AC_nl_66 +CO_NonlinearAutocorr(x_z,[6,6],true) AC_nl_66_abs +CO_NonlinearAutocorr(x_z,[0,1,1],false) AC_nl_011 +CO_NonlinearAutocorr(x_z,[0,2,2],false) AC_nl_022 +CO_NonlinearAutocorr(x_z,[0,3,3],false) AC_nl_033 +CO_NonlinearAutocorr(x_z,[0,4,4],false) AC_nl_044 +CO_NonlinearAutocorr(x_z,[0,5,5],false) AC_nl_055 +CO_NonlinearAutocorr(x_z,[0,6,6],false) AC_nl_066 +CO_NonlinearAutocorr(x_z,[0,0,1],false) AC_nl_001 +CO_NonlinearAutocorr(x_z,[0,0,2],false) AC_nl_002 +CO_NonlinearAutocorr(x_z,[0,0,3],false) AC_nl_003 +CO_NonlinearAutocorr(x_z,[0,0,4],false) AC_nl_004 +CO_NonlinearAutocorr(x_z,[0,0,5],false) AC_nl_005 +CO_NonlinearAutocorr(x_z,[0,0,6],false) AC_nl_006 +CO_NonlinearAutocorr(x_z,[0,1,2],false) AC_nl_012 +CO_NonlinearAutocorr(x_z,[0,1,3],false) AC_nl_013 +CO_NonlinearAutocorr(x_z,[0,2,3],false) AC_nl_023 +CO_NonlinearAutocorr(x_z,[0,1,4],false) AC_nl_014 +CO_NonlinearAutocorr(x_z,[0,2,4],false) AC_nl_024 +CO_NonlinearAutocorr(x_z,[0,3,4],false) AC_nl_034 +CO_NonlinearAutocorr(x_z,[0,1,5],false) AC_nl_015 +CO_NonlinearAutocorr(x_z,[0,2,5],false) AC_nl_025 +CO_NonlinearAutocorr(x_z,[0,3,5],false) AC_nl_035 +CO_NonlinearAutocorr(x_z,[0,4,5],false) AC_nl_045 +CO_NonlinearAutocorr(x_z,[0,1,6],false) AC_nl_016 +CO_NonlinearAutocorr(x_z,[0,2,6],false) AC_nl_026 +CO_NonlinearAutocorr(x_z,[0,3,6],false) AC_nl_036 +CO_NonlinearAutocorr(x_z,[0,4,6],false) AC_nl_046 +CO_NonlinearAutocorr(x_z,[0,5,6],false) AC_nl_056 +CO_NonlinearAutocorr(x_z,[1,1,2],false) AC_nl_112 +CO_NonlinearAutocorr(x_z,[1,1,3],false) AC_nl_113 +CO_NonlinearAutocorr(x_z,[1,2,2],false) AC_nl_122 +CO_NonlinearAutocorr(x_z,[1,3,3],false) AC_nl_133 +CO_NonlinearAutocorr(x_z,[2,2,3],false) AC_nl_223 +CO_NonlinearAutocorr(x_z,[2,3,3],false) AC_nl_233 CO_RM_AMInformation(x_z,0) CO_RM_AMInformation_0 CO_RM_AMInformation(x_z,1) CO_RM_AMInformation_1 CO_RM_AMInformation(x_z,2) CO_RM_AMInformation_2 @@ -934,7 +949,7 @@ NL_TISEAN_d2(x_z,1,10,0) NL_TISEAN_d2_1_10_0 NL_TISEAN_d2(x_z,'ac',10,0.01) NL_TISEAN_d2_ac_10_001 NL_TISEAN_c1(x_z,1,[1,7],0.02,0.5) NL_TISEAN_c1_1_1_7_002_05 NL_TISEAN_c1(x_z,1,[2,6],25,0.1) NL_TISEAN_c1_1_2_6_25_01 -NL_BoxCorrDim(x_z,50,{'ac',5}) NL_BoxCorrDim_50_ac_5 +NL_TSTL_BoxCorrDim(x_z,50,{'ac',5}) NL_TSTL_BoxCorrDim_50_ac_5 NL_TSTL_GPCorrSum(x_z,-1,0.5,40,20,{'ac','fnnmar'},1) NL_TSTL_GPCorrSum2_n1_05_40_20_ac_fnnmar NL_TSTL_GPCorrSum(x_z,-1,0.5,100,20,{'ac','fnnmar'},1) NL_TSTL_GPCorrSum2_n1_05_100_20_ac_fnnmar NL_TSTL_GPCorrSum(x_z,-1,0.1,40,20,{'ac','fnnmar'},1) NL_TSTL_GPCorrSum2_n1_01_40_20_ac_fnnmar diff --git a/FeatureSets/INP_ops_hctsa.txt b/FeatureSets/INP_ops_hctsa.txt index 40356e48e..1e32cf1e1 100644 --- a/FeatureSets/INP_ops_hctsa.txt +++ b/FeatureSets/INP_ops_hctsa.txt @@ -176,61 +176,76 @@ CO_FirstMax_mi-kraskov1_4 firstMax_mi-kraskov1_4 correlation,AMI CO_FirstMax_mi-kraskov2_4 firstMax_mi-kraskov2_4 correlation,AMI CO_FirstMax_mi-hist_5 firstMax_mi-hist_5 correlation,AMI CO_FirstMax_mi-hist_10 firstMax_mi-hist_10 correlation,AMI -AC_nl_12 AC_nl_12 correlation,nonlinearautocorr -AC_nl_123 AC_nl_123 correlation,nonlinearautocorr -AC_nl_1234 AC_nl_1234 correlation,nonlinearautocorr -AC_nl_12345 AC_nl_12345 correlation,nonlinearautocorr -AC_nl_123456 AC_nl_123456 correlation,nonlinearautocorr -AC_nl_1234567 AC_nl_1234567 correlation,nonlinearautocorr -AC_nl_12345678 AC_nl_12345678 correlation,nonlinearautocorr -AC_nl_13 AC_nl_13 correlation,nonlinearautocorr -AC_nl_24 AC_nl_24 correlation,nonlinearautocorr -AC_nl_135 AC_nl_135 correlation,nonlinearautocorr -AC_nl_246 AC_nl_246 correlation,nonlinearautocorr -AC_nl_1357 AC_nl_1357 correlation,nonlinearautocorr -AC_nl_2468 AC_nl_2468 correlation,nonlinearautocorr -AC_nl_124 AC_nl_124 correlation,nonlinearautocorr -AC_nl_134 AC_nl_134 correlation,nonlinearautocorr -AC_nl_14 AC_nl_14 correlation,nonlinearautocorr -AC_nl_11 AC_nl_11 correlation,nonlinearautocorr -AC_nl_22 AC_nl_22 correlation,nonlinearautocorr -AC_nl_33 AC_nl_33 correlation,nonlinearautocorr -AC_nl_44 AC_nl_44 correlation,nonlinearautocorr -AC_nl_55 AC_nl_55 correlation,nonlinearautocorr -AC_nl_66 AC_nl_66 correlation,nonlinearautocorr -AC_nl_011 AC_nl_011 correlation,nonlinearautocorr -AC_nl_022 AC_nl_022 correlation,nonlinearautocorr -AC_nl_033 AC_nl_033 correlation,nonlinearautocorr -AC_nl_044 AC_nl_044 correlation,nonlinearautocorr -AC_nl_055 AC_nl_055 correlation,nonlinearautocorr -AC_nl_066 AC_nl_066 correlation,nonlinearautocorr -AC_nl_001 AC_nl_001 correlation,nonlinearautocorr -AC_nl_002 AC_nl_002 correlation,nonlinearautocorr -AC_nl_003 AC_nl_003 correlation,nonlinearautocorr -AC_nl_004 AC_nl_004 correlation,nonlinearautocorr -AC_nl_005 AC_nl_005 correlation,nonlinearautocorr -AC_nl_006 AC_nl_006 correlation,nonlinearautocorr -AC_nl_012 AC_nl_012 correlation,nonlinearautocorr -AC_nl_013 AC_nl_013 correlation,nonlinearautocorr -AC_nl_023 AC_nl_023 correlation,nonlinearautocorr -AC_nl_014 AC_nl_014 correlation,nonlinearautocorr -AC_nl_024 AC_nl_024 correlation,nonlinearautocorr -AC_nl_034 AC_nl_034 correlation,nonlinearautocorr -AC_nl_015 AC_nl_015 correlation,nonlinearautocorr -AC_nl_025 AC_nl_025 correlation,nonlinearautocorr -AC_nl_035 AC_nl_035 correlation,nonlinearautocorr -AC_nl_045 AC_nl_045 correlation,nonlinearautocorr -AC_nl_016 AC_nl_016 correlation,nonlinearautocorr -AC_nl_026 AC_nl_026 correlation,nonlinearautocorr -AC_nl_036 AC_nl_036 correlation,nonlinearautocorr -AC_nl_046 AC_nl_046 correlation,nonlinearautocorr -AC_nl_056 AC_nl_056 correlation,nonlinearautocorr -AC_nl_112 AC_nl_112 correlation,nonlinearautocorr -AC_nl_113 AC_nl_113 correlation,nonlinearautocorr -AC_nl_122 AC_nl_122 correlation,nonlinearautocorr -AC_nl_133 AC_nl_133 correlation,nonlinearautocorr -AC_nl_223 AC_nl_223 correlation,nonlinearautocorr -AC_nl_233 AC_nl_233 correlation,nonlinearautocorr +AC_nl_12 AC_nl_12 correlation,nonlinearautocorr +AC_nl_12_abs AC_nl_12_abs correlation,nonlinearautocorr +AC_nl_123 AC_nl_123 correlation,nonlinearautocorr +AC_nl_1234 AC_nl_1234 correlation,nonlinearautocorr +AC_nl_1234_abs AC_nl_1234_abs correlation,nonlinearautocorr +AC_nl_12345 AC_nl_12345 correlation,nonlinearautocorr +AC_nl_123456 AC_nl_123456 correlation,nonlinearautocorr +AC_nl_123456_abs AC_nl_123456_abs correlation,nonlinearautocorr +AC_nl_1234567 AC_nl_1234567 correlation,nonlinearautocorr +AC_nl_12345678 AC_nl_12345678 correlation,nonlinearautocorr +AC_nl_12345678_abs AC_nl_12345678_abs correlation,nonlinearautocorr +AC_nl_13 AC_nl_13 correlation,nonlinearautocorr +AC_nl_13_abs AC_nl_13_abs correlation,nonlinearautocorr +AC_nl_24 AC_nl_24 correlation,nonlinearautocorr +AC_nl_24_abs AC_nl_24_abs correlation,nonlinearautocorr +AC_nl_135 AC_nl_135 correlation,nonlinearautocorr +AC_nl_246 AC_nl_246 correlation,nonlinearautocorr +AC_nl_1357 AC_nl_1357 correlation,nonlinearautocorr +AC_nl_1357_abs AC_nl_1357_abs correlation,nonlinearautocorr +AC_nl_2468 AC_nl_2468 correlation,nonlinearautocorr +AC_nl_2468_abs AC_nl_2468_abs correlation,nonlinearautocorr +AC_nl_124 AC_nl_124 correlation,nonlinearautocorr +AC_nl_134 AC_nl_134 correlation,nonlinearautocorr +AC_nl_14 AC_nl_14 correlation,nonlinearautocorr +AC_nl_14_abs AC_nl_14_abs correlation,nonlinearautocorr +AC_nl_11 AC_nl_11 correlation,nonlinearautocorr +AC_nl_11_abs AC_nl_11_abs correlation,nonlinearautocorr +AC_nl_22 AC_nl_22 correlation,nonlinearautocorr +AC_nl_22_abs AC_nl_22_abs correlation,nonlinearautocorr +AC_nl_33 AC_nl_33 correlation,nonlinearautocorr +AC_nl_33_abs AC_nl_33_abs correlation,nonlinearautocorr +AC_nl_44 AC_nl_44 correlation,nonlinearautocorr +AC_nl_44_abs AC_nl_44_abs correlation,nonlinearautocorr +AC_nl_55 AC_nl_55 correlation,nonlinearautocorr +AC_nl_55_abs AC_nl_55_abs correlation,nonlinearautocorr +AC_nl_66 AC_nl_66 correlation,nonlinearautocorr +AC_nl_66_abs AC_nl_66_abs correlation,nonlinearautocorr +AC_nl_011 AC_nl_011 correlation,nonlinearautocorr +AC_nl_022 AC_nl_022 correlation,nonlinearautocorr +AC_nl_033 AC_nl_033 correlation,nonlinearautocorr +AC_nl_044 AC_nl_044 correlation,nonlinearautocorr +AC_nl_055 AC_nl_055 correlation,nonlinearautocorr +AC_nl_066 AC_nl_066 correlation,nonlinearautocorr +AC_nl_001 AC_nl_001 correlation,nonlinearautocorr +AC_nl_002 AC_nl_002 correlation,nonlinearautocorr +AC_nl_003 AC_nl_003 correlation,nonlinearautocorr +AC_nl_004 AC_nl_004 correlation,nonlinearautocorr +AC_nl_005 AC_nl_005 correlation,nonlinearautocorr +AC_nl_006 AC_nl_006 correlation,nonlinearautocorr +AC_nl_012 AC_nl_012 correlation,nonlinearautocorr +AC_nl_013 AC_nl_013 correlation,nonlinearautocorr +AC_nl_023 AC_nl_023 correlation,nonlinearautocorr +AC_nl_014 AC_nl_014 correlation,nonlinearautocorr +AC_nl_024 AC_nl_024 correlation,nonlinearautocorr +AC_nl_034 AC_nl_034 correlation,nonlinearautocorr +AC_nl_015 AC_nl_015 correlation,nonlinearautocorr +AC_nl_025 AC_nl_025 correlation,nonlinearautocorr +AC_nl_035 AC_nl_035 correlation,nonlinearautocorr +AC_nl_045 AC_nl_045 correlation,nonlinearautocorr +AC_nl_016 AC_nl_016 correlation,nonlinearautocorr +AC_nl_026 AC_nl_026 correlation,nonlinearautocorr +AC_nl_036 AC_nl_036 correlation,nonlinearautocorr +AC_nl_046 AC_nl_046 correlation,nonlinearautocorr +AC_nl_056 AC_nl_056 correlation,nonlinearautocorr +AC_nl_112 AC_nl_112 correlation,nonlinearautocorr +AC_nl_113 AC_nl_113 correlation,nonlinearautocorr +AC_nl_122 AC_nl_122 correlation,nonlinearautocorr +AC_nl_133 AC_nl_133 correlation,nonlinearautocorr +AC_nl_223 AC_nl_223 correlation,nonlinearautocorr +AC_nl_233 AC_nl_233 correlation,nonlinearautocorr CO_RM_AMInformation_0 RM_ami_0 information,correlation,AMI,distribution CO_RM_AMInformation_1 RM_ami_1 information,correlation,AMI CO_RM_AMInformation_2 RM_ami_2 information,correlation,AMI @@ -2738,7 +2753,7 @@ PH_Walker_momentum_2.w_ac2 PH_Walker_momentum_2_w_ac2 trend PH_Walker_momentum_2.w_tau PH_Walker_momentum_2_w_tau trend PH_Walker_momentum_2.w_min PH_Walker_momentum_2_w_min trend PH_Walker_momentum_2.w_max PH_Walker_momentum_2_w_max trend -PH_Walker_momentum_2.w_propzcross PH_Walker_momentum_2_w_momentumzcross trend +PH_Walker_momentum_2.w_propzcross PH_Walker_momentum_2_w_propzcross trend PH_Walker_momentum_2.sw_meanabsdiff PH_Walker_momentum_2_sw_meanabsdiff trend PH_Walker_momentum_2.sw_taudiff PH_Walker_momentum_2_sw_taudiff trend PH_Walker_momentum_2.sw_ac1rat PH_Walker_momentum_2_sw_ac1rat trend @@ -2758,7 +2773,7 @@ PH_Walker_momentum_5.w_ac2 PH_Walker_momentum_5_w_ac2 trend PH_Walker_momentum_5.w_tau PH_Walker_momentum_5_w_tau trend PH_Walker_momentum_5.w_min PH_Walker_momentum_5_w_min trend PH_Walker_momentum_5.w_max PH_Walker_momentum_5_w_max trend -PH_Walker_momentum_5.w_propzcross PH_Walker_momentum_5_w_momentumzcross trend +PH_Walker_momentum_5.w_propzcross PH_Walker_momentum_5_w_propzcross trend PH_Walker_momentum_5.sw_meanabsdiff PH_Walker_momentum_5_sw_meanabsdiff trend PH_Walker_momentum_5.sw_taudiff PH_Walker_momentum_5_sw_taudiff trend PH_Walker_momentum_5.sw_ac1rat PH_Walker_momentum_5_sw_ac1rat trend @@ -5060,90 +5075,90 @@ NL_TISEAN_c1_1_2_6_25_01.maxmd NL_TISEAN_c1_1_2_6_25_01_maxmd nonlinear,tisean,d NL_TISEAN_c1_1_2_6_25_01.meanstd NL_TISEAN_c1_1_2_6_25_01_meanstd nonlinear,tisean,dimension,entropy NL_TISEAN_c1_1_2_6_25_01.bestscrd NL_TISEAN_c1_1_2_6_25_01_bestscrd nonlinear,tisean,dimension,entropy NL_TISEAN_c1_1_2_6_25_01.longestscr NL_TISEAN_c1_1_2_6_25_01_longestscr nonlinear,tisean,dimension,entropy -NL_BoxCorrDim_50_ac_5.meand2 NL_BoxCorrDim_50_ac_5_meand2 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.mediand2 NL_BoxCorrDim_50_ac_5_mediand2 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.mind2 NL_BoxCorrDim_50_ac_5_mind2 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meand3 NL_BoxCorrDim_50_ac_5_meand3 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.mediand3 NL_BoxCorrDim_50_ac_5_mediand3 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.mind3 NL_BoxCorrDim_50_ac_5_mind3 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meand4 NL_BoxCorrDim_50_ac_5_meand4 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.mediand4 NL_BoxCorrDim_50_ac_5_mediand4 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.mind4 NL_BoxCorrDim_50_ac_5_mind4 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meand5 NL_BoxCorrDim_50_ac_5_meand5 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.mediand5 NL_BoxCorrDim_50_ac_5_mediand5 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr2 NL_BoxCorrDim_50_ac_5_meanr2 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr2 NL_BoxCorrDim_50_ac_5_medianr2 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr2 NL_BoxCorrDim_50_ac_5_minr2 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr2 NL_BoxCorrDim_50_ac_5_meanchr2 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr3 NL_BoxCorrDim_50_ac_5_meanr3 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr3 NL_BoxCorrDim_50_ac_5_medianr3 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr3 NL_BoxCorrDim_50_ac_5_minr3 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr3 NL_BoxCorrDim_50_ac_5_meanchr3 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr4 NL_BoxCorrDim_50_ac_5_meanr4 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr4 NL_BoxCorrDim_50_ac_5_medianr4 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr4 NL_BoxCorrDim_50_ac_5_minr4 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr4 NL_BoxCorrDim_50_ac_5_meanchr4 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr5 NL_BoxCorrDim_50_ac_5_meanr5 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr5 NL_BoxCorrDim_50_ac_5_medianr5 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr5 NL_BoxCorrDim_50_ac_5_minr5 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr5 NL_BoxCorrDim_50_ac_5_meanchr5 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr6 NL_BoxCorrDim_50_ac_5_meanr6 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr6 NL_BoxCorrDim_50_ac_5_medianr6 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr6 NL_BoxCorrDim_50_ac_5_minr6 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr6 NL_BoxCorrDim_50_ac_5_meanchr6 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr7 NL_BoxCorrDim_50_ac_5_meanr7 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr7 NL_BoxCorrDim_50_ac_5_medianr7 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr7 NL_BoxCorrDim_50_ac_5_minr7 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr7 NL_BoxCorrDim_50_ac_5_meanchr7 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr8 NL_BoxCorrDim_50_ac_5_meanr8 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr8 NL_BoxCorrDim_50_ac_5_medianr8 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr8 NL_BoxCorrDim_50_ac_5_minr8 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr8 NL_BoxCorrDim_50_ac_5_meanchr8 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr9 NL_BoxCorrDim_50_ac_5_meanr9 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr9 NL_BoxCorrDim_50_ac_5_medianr9 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr9 NL_BoxCorrDim_50_ac_5_minr9 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr9 NL_BoxCorrDim_50_ac_5_meanchr9 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr10 NL_BoxCorrDim_50_ac_5_meanr10 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr10 NL_BoxCorrDim_50_ac_5_medianr10 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr10 NL_BoxCorrDim_50_ac_5_minr10 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr10 NL_BoxCorrDim_50_ac_5_meanchr10 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr11 NL_BoxCorrDim_50_ac_5_meanr11 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr11 NL_BoxCorrDim_50_ac_5_medianr11 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr11 NL_BoxCorrDim_50_ac_5_minr11 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr11 NL_BoxCorrDim_50_ac_5_meanchr11 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr12 NL_BoxCorrDim_50_ac_5_meanr12 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr12 NL_BoxCorrDim_50_ac_5_medianr12 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr12 NL_BoxCorrDim_50_ac_5_minr12 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr12 NL_BoxCorrDim_50_ac_5_meanchr12 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr13 NL_BoxCorrDim_50_ac_5_meanr13 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr13 NL_BoxCorrDim_50_ac_5_medianr13 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr13 NL_BoxCorrDim_50_ac_5_minr13 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr13 NL_BoxCorrDim_50_ac_5_meanchr13 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr14 NL_BoxCorrDim_50_ac_5_meanr14 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr14 NL_BoxCorrDim_50_ac_5_medianr14 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr14 NL_BoxCorrDim_50_ac_5_minr14 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr14 NL_BoxCorrDim_50_ac_5_meanchr14 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr15 NL_BoxCorrDim_50_ac_5_meanr15 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr15 NL_BoxCorrDim_50_ac_5_medianr15 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr15 NL_BoxCorrDim_50_ac_5_minr15 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr15 NL_BoxCorrDim_50_ac_5_meanchr15 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr16 NL_BoxCorrDim_50_ac_5_meanr16 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr16 NL_BoxCorrDim_50_ac_5_medianr16 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr16 NL_BoxCorrDim_50_ac_5_minr16 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr16 NL_BoxCorrDim_50_ac_5_meanchr16 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr17 NL_BoxCorrDim_50_ac_5_meanr17 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr17 NL_BoxCorrDim_50_ac_5_medianr17 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr17 NL_BoxCorrDim_50_ac_5_minr17 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr17 NL_BoxCorrDim_50_ac_5_meanchr17 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanr18 NL_BoxCorrDim_50_ac_5_meanr18 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianr18 NL_BoxCorrDim_50_ac_5_medianr18 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minr18 NL_BoxCorrDim_50_ac_5_minr18 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.meanchr18 NL_BoxCorrDim_50_ac_5_meanchr18 nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.stdmean NL_BoxCorrDim_50_ac_5_stdmean nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.stdmedian NL_BoxCorrDim_50_ac_5_stdmedian nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.medianstretch NL_BoxCorrDim_50_ac_5_medianstretch nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.minstretch NL_BoxCorrDim_50_ac_5_minstretch nonlinear,correlation,tstool,dimension -NL_BoxCorrDim_50_ac_5.iqrstretch NL_BoxCorrDim_50_ac_5_iqrstretch nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meand2 NL_TSTL_BoxCorrDim_50_ac_5_meand2 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.mediand2 NL_TSTL_BoxCorrDim_50_ac_5_mediand2 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.mind2 NL_TSTL_BoxCorrDim_50_ac_5_mind2 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meand3 NL_TSTL_BoxCorrDim_50_ac_5_meand3 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.mediand3 NL_TSTL_BoxCorrDim_50_ac_5_mediand3 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.mind3 NL_TSTL_BoxCorrDim_50_ac_5_mind3 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meand4 NL_TSTL_BoxCorrDim_50_ac_5_meand4 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.mediand4 NL_TSTL_BoxCorrDim_50_ac_5_mediand4 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.mind4 NL_TSTL_BoxCorrDim_50_ac_5_mind4 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meand5 NL_TSTL_BoxCorrDim_50_ac_5_meand5 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.mediand5 NL_TSTL_BoxCorrDim_50_ac_5_mediand5 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr2 NL_TSTL_BoxCorrDim_50_ac_5_meanr2 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr2 NL_TSTL_BoxCorrDim_50_ac_5_medianr2 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr2 NL_TSTL_BoxCorrDim_50_ac_5_minr2 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr2 NL_TSTL_BoxCorrDim_50_ac_5_meanchr2 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr3 NL_TSTL_BoxCorrDim_50_ac_5_meanr3 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr3 NL_TSTL_BoxCorrDim_50_ac_5_medianr3 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr3 NL_TSTL_BoxCorrDim_50_ac_5_minr3 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr3 NL_TSTL_BoxCorrDim_50_ac_5_meanchr3 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr4 NL_TSTL_BoxCorrDim_50_ac_5_meanr4 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr4 NL_TSTL_BoxCorrDim_50_ac_5_medianr4 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr4 NL_TSTL_BoxCorrDim_50_ac_5_minr4 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr4 NL_TSTL_BoxCorrDim_50_ac_5_meanchr4 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr5 NL_TSTL_BoxCorrDim_50_ac_5_meanr5 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr5 NL_TSTL_BoxCorrDim_50_ac_5_medianr5 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr5 NL_TSTL_BoxCorrDim_50_ac_5_minr5 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr5 NL_TSTL_BoxCorrDim_50_ac_5_meanchr5 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr6 NL_TSTL_BoxCorrDim_50_ac_5_meanr6 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr6 NL_TSTL_BoxCorrDim_50_ac_5_medianr6 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr6 NL_TSTL_BoxCorrDim_50_ac_5_minr6 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr6 NL_TSTL_BoxCorrDim_50_ac_5_meanchr6 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr7 NL_TSTL_BoxCorrDim_50_ac_5_meanr7 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr7 NL_TSTL_BoxCorrDim_50_ac_5_medianr7 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr7 NL_TSTL_BoxCorrDim_50_ac_5_minr7 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr7 NL_TSTL_BoxCorrDim_50_ac_5_meanchr7 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr8 NL_TSTL_BoxCorrDim_50_ac_5_meanr8 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr8 NL_TSTL_BoxCorrDim_50_ac_5_medianr8 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr8 NL_TSTL_BoxCorrDim_50_ac_5_minr8 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr8 NL_TSTL_BoxCorrDim_50_ac_5_meanchr8 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr9 NL_TSTL_BoxCorrDim_50_ac_5_meanr9 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr9 NL_TSTL_BoxCorrDim_50_ac_5_medianr9 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr9 NL_TSTL_BoxCorrDim_50_ac_5_minr9 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr9 NL_TSTL_BoxCorrDim_50_ac_5_meanchr9 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr10 NL_TSTL_BoxCorrDim_50_ac_5_meanr10 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr10 NL_TSTL_BoxCorrDim_50_ac_5_medianr10 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr10 NL_TSTL_BoxCorrDim_50_ac_5_minr10 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr10 NL_TSTL_BoxCorrDim_50_ac_5_meanchr10 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr11 NL_TSTL_BoxCorrDim_50_ac_5_meanr11 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr11 NL_TSTL_BoxCorrDim_50_ac_5_medianr11 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr11 NL_TSTL_BoxCorrDim_50_ac_5_minr11 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr11 NL_TSTL_BoxCorrDim_50_ac_5_meanchr11 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr12 NL_TSTL_BoxCorrDim_50_ac_5_meanr12 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr12 NL_TSTL_BoxCorrDim_50_ac_5_medianr12 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr12 NL_TSTL_BoxCorrDim_50_ac_5_minr12 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr12 NL_TSTL_BoxCorrDim_50_ac_5_meanchr12 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr13 NL_TSTL_BoxCorrDim_50_ac_5_meanr13 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr13 NL_TSTL_BoxCorrDim_50_ac_5_medianr13 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr13 NL_TSTL_BoxCorrDim_50_ac_5_minr13 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr13 NL_TSTL_BoxCorrDim_50_ac_5_meanchr13 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr14 NL_TSTL_BoxCorrDim_50_ac_5_meanr14 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr14 NL_TSTL_BoxCorrDim_50_ac_5_medianr14 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr14 NL_TSTL_BoxCorrDim_50_ac_5_minr14 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr14 NL_TSTL_BoxCorrDim_50_ac_5_meanchr14 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr15 NL_TSTL_BoxCorrDim_50_ac_5_meanr15 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr15 NL_TSTL_BoxCorrDim_50_ac_5_medianr15 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr15 NL_TSTL_BoxCorrDim_50_ac_5_minr15 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr15 NL_TSTL_BoxCorrDim_50_ac_5_meanchr15 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr16 NL_TSTL_BoxCorrDim_50_ac_5_meanr16 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr16 NL_TSTL_BoxCorrDim_50_ac_5_medianr16 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr16 NL_TSTL_BoxCorrDim_50_ac_5_minr16 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr16 NL_TSTL_BoxCorrDim_50_ac_5_meanchr16 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr17 NL_TSTL_BoxCorrDim_50_ac_5_meanr17 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr17 NL_TSTL_BoxCorrDim_50_ac_5_medianr17 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr17 NL_TSTL_BoxCorrDim_50_ac_5_minr17 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr17 NL_TSTL_BoxCorrDim_50_ac_5_meanchr17 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanr18 NL_TSTL_BoxCorrDim_50_ac_5_meanr18 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianr18 NL_TSTL_BoxCorrDim_50_ac_5_medianr18 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minr18 NL_TSTL_BoxCorrDim_50_ac_5_minr18 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.meanchr18 NL_TSTL_BoxCorrDim_50_ac_5_meanchr18 nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.stdmean NL_TSTL_BoxCorrDim_50_ac_5_stdmean nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.stdmedian NL_TSTL_BoxCorrDim_50_ac_5_stdmedian nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.medianstretch NL_TSTL_BoxCorrDim_50_ac_5_medianstretch nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.minstretch NL_TSTL_BoxCorrDim_50_ac_5_minstretch nonlinear,correlation,tstool,dimension +NL_TSTL_BoxCorrDim_50_ac_5.iqrstretch NL_TSTL_BoxCorrDim_50_ac_5_iqrstretch nonlinear,correlation,tstool,dimension NL_TSTL_GPCorrSum2_n1_05_40_20_ac_fnnmar.robfit_a1 NL_TSTL_GPCorrSum2_n1_05_40_20_ac_fnnmar_robfit_a1 nonlinear,correlation,tstool,stochastic NL_TSTL_GPCorrSum2_n1_05_40_20_ac_fnnmar.robfit_a2 NL_TSTL_GPCorrSum2_n1_05_40_20_ac_fnnmar_robfit_a2 nonlinear,correlation,tstool,stochastic NL_TSTL_GPCorrSum2_n1_05_40_20_ac_fnnmar.robfit_sigrat NL_TSTL_GPCorrSum2_n1_05_40_20_ac_fnnmar_robfit_sigrat nonlinear,correlation,tstool,stochastic diff --git a/Operations/CO_NonlinearAutocorr.m b/Operations/CO_NonlinearAutocorr.m index cf83f5100..a8d356304 100644 --- a/Operations/CO_NonlinearAutocorr.m +++ b/Operations/CO_NonlinearAutocorr.m @@ -1,10 +1,9 @@ function out = CO_NonlinearAutocorr(y,taus,doAbs) % CO_NonlinearAutocorr A custom nonlinear autocorrelation of a time series. % -% Nonlinear autocorrelations are of the form: -% -% The usual two-point autocorrelations are -% +% Nonlinear autocorrelations are of the form: +% +% The usual two-point autocorrelations are: % % Assumes that all the taus are much less than the length of the time % series, N, so that the means can be approximated as the sample means and the @@ -12,25 +11,26 @@ % the z-scored time series can simply be used straight-up. % %---INPUTS: -% y -- should be the z-scored time series (Nx1 vector) +% y -- should be the z-scored time series (Nx1 vector) % taus -- should be a vector of the time delays as above (mx1 vector) % e.g., [2] computes % e.g., [1,2] computes % e.g., [1,1,3] computes % e.g., [0,0,1] computes -% doAbs [opt] -- a boolean (0,1) -- if one, takes an absolute value before +% doAbs [opt] -- a boolean (true/false) -- if true, takes an absolute value before % taking the final mean -- useful for an odd number of % contributions to the sum. Default is to do this for odd % numbers anyway, if not specified. % %---NOTES: % (*) For odd numbers of regressions (i.e., even number length -% taus vectors) the result will be near zero due to fluctuations -% below the mean; even for highly-correlated signals. (doAbs) +% taus vectors) the result will be near zero (for reversible processes +% due to fluctuations about the mean; even for highly-correlated signals. (doAbs) % % (*) doAbs = true is really a different operation that can't be compared with % the values obtained from taking doAbs = false (i.e., for odd lengths -% of taus) +% of taus). +% % (*) It can be helpful to look at nonlinearAC at each iteration. % ------------------------------------------------------------------------------ @@ -63,10 +63,11 @@ % ------------------------------------------------------------------------------ % ------------------------------------------------------------------------------ -%% Check Inputs: +%% Check inputs & set defaults: % ------------------------------------------------------------------------------ if nargin < 3 || isempty(doAbs) % use default settings for doAbs if rem(length(taus),2) == 1 + % Odd number of time-lags doAbs = false; else % Even number of time-lags diff --git a/Operations/EN_wentropy.m b/Operations/EN_wentropy.m index ce73a6560..ca036432f 100644 --- a/Operations/EN_wentropy.m +++ b/Operations/EN_wentropy.m @@ -48,7 +48,7 @@ % ------------------------------------------------------------------------------ %% Check that a Wavelet Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('wavelet_toolbox') +BF_CheckToolbox('wavelet_toolbox'); % ------------------------------------------------------------------------------ % Check inputs diff --git a/Operations/MF_ARMA_orders.m b/Operations/MF_ARMA_orders.m index b90400aea..14773362b 100644 --- a/Operations/MF_ARMA_orders.m +++ b/Operations/MF_ARMA_orders.m @@ -55,7 +55,7 @@ % ------------------------------------------------------------------------------ %% Check that a System Identification Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('identification_toolbox') +BF_CheckToolbox('identification_toolbox'); % ------------------------------------------------------------------------------ %% Check Inputs diff --git a/Operations/MF_CompareAR.m b/Operations/MF_CompareAR.m index f5edebda9..018384521 100644 --- a/Operations/MF_CompareAR.m +++ b/Operations/MF_CompareAR.m @@ -45,7 +45,7 @@ % ------------------------------------------------------------------------------ %% Check that a System Identification Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('identification_toolbox') +BF_CheckToolbox('identification_toolbox'); % Preliminaries doPlot = false; % set to true to plot outputs diff --git a/Operations/MF_CompareTestSets.m b/Operations/MF_CompareTestSets.m index ab45a32de..fea3f4a89 100644 --- a/Operations/MF_CompareTestSets.m +++ b/Operations/MF_CompareTestSets.m @@ -71,7 +71,7 @@ % ------------------------------------------------------------------------------ %% Check that a System Identification Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('identification_toolbox') +BF_CheckToolbox('identification_toolbox'); % ------------------------------------------------------------------------------ %% Preliminaries diff --git a/Operations/MF_FitSubsegments.m b/Operations/MF_FitSubsegments.m index 954f9fc1c..b7cdb8bd4 100644 --- a/Operations/MF_FitSubsegments.m +++ b/Operations/MF_FitSubsegments.m @@ -209,7 +209,7 @@ % Return statistics on parameters and goodness of fit %% Check that a System Identification Toolbox license is available to run the 'ar' function: - BF_CheckToolbox('identification_toolbox') + BF_CheckToolbox('identification_toolbox'); fpes = zeros(numPred,1); as = zeros(numPred,order+1); diff --git a/Operations/MF_GARCHcompare.m b/Operations/MF_GARCHcompare.m index 2b5dfe2b5..ce1af8b1b 100644 --- a/Operations/MF_GARCHcompare.m +++ b/Operations/MF_GARCHcompare.m @@ -64,7 +64,7 @@ % ------------------------------------------------------------------------------ %% Check that an Econometrics Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('econometrics_toolbox') +BF_CheckToolbox('econometrics_toolbox'); % ------------------------------------------------------------------------------ %% Check inputs: @@ -136,11 +136,11 @@ % (iii) Correlation in time series: autocorrelation % autocorrs_y = CO_AutoCorr(y,1:20); % autocorrs_var = CO_AutoCorr(y.^2,1:20); -[ACF_y, Lags_acf_y, bounds_acf_y] = autocorr(y,20,[],[]); -[ACF_var_y, Lags_acf_var_y, bounds_acf_var_y] = autocorr(y.^2,20,[],[]); +[ACF_y, Lags_acf_y, bounds_acf_y] = autocorr(y,NumLags=20); +[ACF_var_y, Lags_acf_var_y, bounds_acf_var_y] = autocorr(y.^2,NumLags=20); % (iv) Partial autocorrelation function: PACF -[PACF_y, Lags_pacf_y, bounds_pacf_y] = parcorr(y,20,[],[]); +[PACF_y, Lags_pacf_y, bounds_pacf_y] = parcorr(y,NumLags=20); % ------------------------------------------------------------------------------ %% (3) Create an appropriate GARCH model diff --git a/Operations/MF_GARCHfit.m b/Operations/MF_GARCHfit.m index fd143141b..e476fe02c 100644 --- a/Operations/MF_GARCHfit.m +++ b/Operations/MF_GARCHfit.m @@ -81,10 +81,10 @@ %% Preliminaries % ------------------------------------------------------------------------------ -beVocal = 0; % Whether to display commentary on the fitting process +beVocal = false; % Whether to display commentary on the fitting process % Check that an Econometrics Toolbox license is available: -BF_CheckToolbox('econometrics_toolbox') +BF_CheckToolbox('econometrics_toolbox'); % ------------------------------------------------------------------------------ %% Check inputs @@ -152,11 +152,11 @@ % (iii) Correlation in time series: autocorrelation -[ACF_y, Lags_acf_y, bounds_acf_y] = autocorr(y,20,[],[]); -[ACF_var_y, Lags_acf_var_y, bounds_acf_var_y] = autocorr(y.^2,20,[],[]); +[ACF_y, Lags_acf_y, bounds_acf_y] = autocorr(y,NumLags=20); +[ACF_var_y, Lags_acf_var_y, bounds_acf_var_y] = autocorr(y.^2,NumLags=20); % (iv) Partial autocorrelation function: PACF -[PACF_y, Lags_pacf_y, bounds_pacf_y] = parcorr(y,20,[],[]); +[PACF_y, Lags_pacf_y, bounds_pacf_y] = parcorr(y,NumLags=20); % ------------------------------------------------------------------------------ diff --git a/Operations/MF_ResidualAnalysis.m b/Operations/MF_ResidualAnalysis.m index 5dc0f9ce4..0ed8eca3f 100644 --- a/Operations/MF_ResidualAnalysis.m +++ b/Operations/MF_ResidualAnalysis.m @@ -44,7 +44,7 @@ % ------------------------------------------------------------------------------ % Check that a System Identification Toolbox license is available (for spa): -BF_CheckToolbox('identification_toolbox') +BF_CheckToolbox('identification_toolbox'); if size(e,2) > size(e,1) e = e'; % make sure residuals are a column vector diff --git a/Operations/MF_StateSpaceCompOrder.m b/Operations/MF_StateSpaceCompOrder.m index b833e773d..69630aedf 100644 --- a/Operations/MF_StateSpaceCompOrder.m +++ b/Operations/MF_StateSpaceCompOrder.m @@ -45,7 +45,7 @@ % ------------------------------------------------------------------------------ %% Check that a System Identification Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('identification_toolbox') +BF_CheckToolbox('identification_toolbox'); % ------------------------------------------------------------------------------ % Check inputs: diff --git a/Operations/MF_StateSpace_n4sid.m b/Operations/MF_StateSpace_n4sid.m index 8893ed0eb..299f946a7 100644 --- a/Operations/MF_StateSpace_n4sid.m +++ b/Operations/MF_StateSpace_n4sid.m @@ -61,7 +61,7 @@ % ------------------------------------------------------------------------------ %% Check that a System Identification Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('identification_toolbox') +BF_CheckToolbox('identification_toolbox'); % ------------------------------------------------------------------------------ %% Check Inputs: diff --git a/Operations/MF_armax.m b/Operations/MF_armax.m index 4ee538541..bc6d6cc41 100644 --- a/Operations/MF_armax.m +++ b/Operations/MF_armax.m @@ -53,7 +53,7 @@ % ------------------------------------------------------------------------------ %% Check that a System Identification Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('identification_toolbox') +BF_CheckToolbox('identification_toolbox'); % ------------------------------------------------------------------------------ %% Prepare Inputs diff --git a/Operations/MF_steps_ahead.m b/Operations/MF_steps_ahead.m index 3b4785e4f..3a62355f9 100644 --- a/Operations/MF_steps_ahead.m +++ b/Operations/MF_steps_ahead.m @@ -58,7 +58,7 @@ % ------------------------------------------------------------------------------ %% Check that a System Identification Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('identification_toolbox') +BF_CheckToolbox('identification_toolbox'); % ------------------------------------------------------------------------------ %% Preliminaries diff --git a/Operations/NL_BoxCorrDim.m b/Operations/NL_TSTL_BoxCorrDim.m similarity index 93% rename from Operations/NL_BoxCorrDim.m rename to Operations/NL_TSTL_BoxCorrDim.m index a54109d64..efdbdfc00 100644 --- a/Operations/NL_BoxCorrDim.m +++ b/Operations/NL_TSTL_BoxCorrDim.m @@ -1,7 +1,7 @@ -function out = NL_BoxCorrDim(y,numBins,embedParams) -% NL_BoxCorrDim Correlation dimension of a time series. +function out = NL_TSTL_BoxCorrDim(y,numBins,embedParams) +% NL_TSTL_BoxCorrDim Correlation dimension of a time series. % -% References TSTOOL code, corrdim, to estimate the correlation dimension of a +% Uses TSTOOL code, corrdim, to estimate the correlation dimension of a % time-delay embedded time series using a box-counting approach. % % TSTOOL: http://www.physik3.gwdg.de/tstool/ @@ -65,10 +65,10 @@ % ------------------------------------------------------------------------------ %% Embed the signal % ------------------------------------------------------------------------------ -% convert to embedded signal object for TSTOOL +% Convert to embedded signal object for TSTOOL s = BF_Embed(y,embedParams{1},embedParams{2},1); -if ~isa(s,'signal') && isnan(s); % embedding failed +if ~isa(s,'signal') && isnan(s) % embedding failed error('Time-series embedding to signal class for TSTOOL failed') end diff --git a/Operations/NL_TSTL_dimensions.m b/Operations/NL_TSTL_dimensions.m index ce7f2355c..eb8c596a4 100644 --- a/Operations/NL_TSTL_dimensions.m +++ b/Operations/NL_TSTL_dimensions.m @@ -56,7 +56,7 @@ % (1) Maximum number of bins, numBins if nargin < 2 || isempty(numBins) numBins = 50; % 50 points - fprintf(1,'Using a default of 50 bins per axis\n'); + fprintf(1,'Using a default of 50 bins per axis.\n'); end % (2) Set embedding parameters to defaults @@ -273,7 +273,7 @@ function [m, b, meansqdev] = subsublinfit(x,y) p1 = polyfit(x,y,1); pfit = p1(1)*x + p1(2); - res = y-pfit; + res = y - pfit; m = p1(1); % gradient b = p1(2); % intercept meansqdev = mean(res.^2); @@ -359,7 +359,7 @@ x = logr(stptr(a):endptr(b)); y = logN(stptr(a):endptr(b))'; p = polyfit(x,y,1); - pfit = p(1)*x+p(2); + pfit = p(1)*x + p(2); res = pfit - y; % subout.meanabsres = mean(abs(res)); % subout.meansqres = mean(res.^2); diff --git a/Operations/PD_PeriodicityWang.m b/Operations/PD_PeriodicityWang.m index fa667a35a..5163b7a19 100644 --- a/Operations/PD_PeriodicityWang.m +++ b/Operations/PD_PeriodicityWang.m @@ -56,7 +56,7 @@ doPlot = false; % plot outputs to figure % Check that a Curve-Fitting Toolbox license is available (for the splines): -BF_CheckToolbox('curve_fitting_toolbox') +BF_CheckToolbox('curve_fitting_toolbox'); % Check that the time series is z-scored: if ~BF_iszscored(y) diff --git a/Operations/PH_Walker.m b/Operations/PH_Walker.m index 1f120383c..84b6ad0e0 100644 --- a/Operations/PH_Walker.m +++ b/Operations/PH_Walker.m @@ -214,11 +214,11 @@ out.w_tau = CO_FirstCrossing(w,'ac',0,'continuous'); out.w_min = min(w); out.w_max = max(w); +% fraction of time series length that walker crosses time series: out.w_propzcross = sum(w(1:end-1).*w(2:end) < 0) / (N-1); -% fraction of time series length that walker crosses time series % (ii) Differences between the walk at signal -out.sw_meanabsdiff = mean(abs(y-w)); +out.sw_meanabsdiff = mean(abs(y - w)); out.sw_taudiff = CO_FirstCrossing(y,'ac',0,'continuous') - CO_FirstCrossing(w,'ac',0,'continuous'); out.sw_stdrat = std(w)/std(y); % will be the same as w_std for z-scored signal out.sw_ac1rat = out.w_ac1/CO_AutoCorr(y,1); @@ -230,7 +230,7 @@ % test from same distribution: Ansari-Bradley test % (this may not be valid given the dependence of w on y, and the % properties of the null hypothesis itself... But this is the name of the game!) -[h, pval, stats] = ansaribradley(w,y); +[~, pval] = ansaribradley(w,y); out.sw_ansarib_pval = pval; % p-value from the test % out.sw_ansarib_W = stats.W; % W (test statistic) % out.sw_ansarib_Wstar = stats.Wstar; % Approximate normal statistic @@ -238,11 +238,11 @@ r = linspace(min(min(y),min(w)),max(max(y),max(w)),200); % make range of ksdensity uniform across all subsegments dy = ksdensity(y,r); dw = ksdensity(w,r); % the kernel-smoothed distributions -out.sw_distdiff = sum(abs(dy-dw)); +out.sw_distdiff = sum(abs(dy - dw)); % (iii) Looking at residuals between time series and walker res = w - y; -[h, pval] = runstest(res); % runs test +[~, pval] = runstest(res); % runs test out.res_runstest = pval; out.res_swss5_1 = SY_SlidingWindow(res,'std','std',5,1); % sliding window stationarity out.res_ac1 = CO_AutoCorr(res,1); % auto correlation at lag-1 diff --git a/Operations/PP_Compare.m b/Operations/PP_Compare.m index 039516fbd..06a102e6a 100644 --- a/Operations/PP_Compare.m +++ b/Operations/PP_Compare.m @@ -137,7 +137,7 @@ intp = str2double(detrndmeth(8)); %% Check that a Curve-Fitting Toolbox license is available: - BF_CheckToolbox('curve_fitting_toolbox') + BF_CheckToolbox('curve_fitting_toolbox'); spline = spap2(nknots,intp,r,y); % just a single middle knot with cubic interpolants y_spl = fnval(spline,1:N); % evaluate at the 1:N time intervals diff --git a/Operations/PP_Iterate.m b/Operations/PP_Iterate.m index c3e6b4790..c311cc669 100644 --- a/Operations/PP_Iterate.m +++ b/Operations/PP_Iterate.m @@ -49,7 +49,7 @@ % ------------------------------------------------------------------------------ %% Check that a Curve-Fitting Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('curve_fitting_toolbox') +BF_CheckToolbox('curve_fitting_toolbox'); % ------------------------------------------------------------------------------ %% Preparation diff --git a/Operations/PP_ModelFit.m b/Operations/PP_ModelFit.m index 7fb57a9b2..25ffdabee 100644 --- a/Operations/PP_ModelFit.m +++ b/Operations/PP_ModelFit.m @@ -99,7 +99,7 @@ switch model % SO MANY OPTIONS! ;-) case 'ar' %% Check that a System Identification Toolbox license is available - BF_CheckToolbox('identification_toolbox') + BF_CheckToolbox('identification_toolbox'); data = zscore(data); % zscore the data from this preprocessing m = ar(data,order); % fit the model diff --git a/Operations/PP_PreProcess.m b/Operations/PP_PreProcess.m index 645262e7e..47b36f828 100644 --- a/Operations/PP_PreProcess.m +++ b/Operations/PP_PreProcess.m @@ -193,7 +193,7 @@ switch chooseBest case 'ar' % picks the *worst* fit to an AR(p) model %% Check that a System Identification Toolbox license is available: - BF_CheckToolbox('identification_toolbox') + BF_CheckToolbox('identification_toolbox'); % order = 2; % should be set from inputs/defaults rmserrs = zeros(nfields,1); diff --git a/Operations/SB_TransitionpAlphabet.m b/Operations/SB_TransitionpAlphabet.m index 59cc9199a..710bbac41 100644 --- a/Operations/SB_TransitionpAlphabet.m +++ b/Operations/SB_TransitionpAlphabet.m @@ -52,7 +52,7 @@ % ------------------------------------------------------------------------------ %% Check that a Curve-Fitting Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('curve_fitting_toolbox') +BF_CheckToolbox('curve_fitting_toolbox'); if nargin < 2 || isempty(numGroups) numGroups = (2:10); % compare across alphabet sizes from 2 to 10 diff --git a/Operations/SP_Summaries.m b/Operations/SP_Summaries.m index 148bcda68..4c9066d99 100644 --- a/Operations/SP_Summaries.m +++ b/Operations/SP_Summaries.m @@ -69,7 +69,7 @@ % ------------------------------------------------------------------------------ %% Check that a Curve-Fitting Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('curve_fitting_toolbox') +BF_CheckToolbox('curve_fitting_toolbox'); % ------------------------------------------------------------------------------ % Check inputs, set defaults: diff --git a/Operations/SY_KPSStest.m b/Operations/SY_KPSStest.m index 3dac937d6..6ea87ff55 100644 --- a/Operations/SY_KPSStest.m +++ b/Operations/SY_KPSStest.m @@ -52,7 +52,7 @@ % ------------------------------------------------------------------------------ %% Check that an Econometrics license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('econometrics_toolbox') +BF_CheckToolbox('econometrics_toolbox'); %------------------------------------------------------------------------------- % Check inputs diff --git a/Operations/SY_LocalGlobal.m b/Operations/SY_LocalGlobal.m index 6e32638ed..d2f5c6411 100644 --- a/Operations/SY_LocalGlobal.m +++ b/Operations/SY_LocalGlobal.m @@ -128,6 +128,8 @@ out.skewness = abs(1 - skewness(y(r))/skewness(y)); % how far from true out.kurtosis = abs(1 - kurtosis(y(r))/kurtosis(y)); % how far from true out.ac1 = abs(1 - CO_AutoCorr(y(r),1,'Fourier')/CO_AutoCorr(y,1,'Fourier')); % how far from true -out.sampen101 = PN_sampenc(y(r),1,0.1,1)/PN_sampenc(y,1,0.1,1); +sampEn_struct_r = EN_SampEn(y(r),1,0.1); +sampEn_struct = EN_SampEn(y,1,0.1); +out.sampen101 = sampEn_struct_r.sampen1/sampEn_struct.sampen1; end diff --git a/Operations/SY_StdNthDerChange.m b/Operations/SY_StdNthDerChange.m index 21abd2b8d..3c0acb18e 100644 --- a/Operations/SY_StdNthDerChange.m +++ b/Operations/SY_StdNthDerChange.m @@ -51,7 +51,7 @@ % Check that a Curve-Fitting Toolbox license is available: -BF_CheckToolbox('curve_fitting_toolbox') +BF_CheckToolbox('curve_fitting_toolbox'); doPlot = false; % plot outputs diff --git a/Operations/SY_VarRatioTest.m b/Operations/SY_VarRatioTest.m index eba7d89ba..fde45f1f3 100644 --- a/Operations/SY_VarRatioTest.m +++ b/Operations/SY_VarRatioTest.m @@ -47,7 +47,7 @@ % ------------------------------------------------------------------------------ %% Check that an Econometrics Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('econometrics_toolbox') +BF_CheckToolbox('econometrics_toolbox'); % ------------------------------------------------------------------------------ %% Check Inputs: diff --git a/Operations/WL_coeffs.m b/Operations/WL_coeffs.m index 203f86093..d208f3a53 100644 --- a/Operations/WL_coeffs.m +++ b/Operations/WL_coeffs.m @@ -45,7 +45,7 @@ % ------------------------------------------------------------------------------ %% Check that a Wavelet Toolbox license is available: -BF_CheckToolbox('wavelet_toolbox') +BF_CheckToolbox('wavelet_toolbox'); % ------------------------------------------------------------------------------ %% Check Inputs diff --git a/Operations/WL_cwt.m b/Operations/WL_cwt.m index 5a40ec799..17ce9b756 100644 --- a/Operations/WL_cwt.m +++ b/Operations/WL_cwt.m @@ -59,7 +59,7 @@ % ------------------------------------------------------------------------------ % Preliminaries % ------------------------------------------------------------------------------ -BF_CheckToolbox('wavelet_toolbox') % Check that a Wavelet Toolbox license is available: +BF_CheckToolbox('wavelet_toolbox'); % Check that a Wavelet Toolbox license is available: doPlot = false; % plot outputs to figures N = length(y); % length of the time series diff --git a/Operations/WL_dwtcoeff.m b/Operations/WL_dwtcoeff.m index 02ce011b0..1da8e54f8 100644 --- a/Operations/WL_dwtcoeff.m +++ b/Operations/WL_dwtcoeff.m @@ -46,7 +46,7 @@ % ------------------------------------------------------------------------------ %% Check that a Wavelet Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('wavelet_toolbox') +BF_CheckToolbox('wavelet_toolbox'); % ------------------------------------------------------------------------------ %% Check Inputs diff --git a/Operations/WL_fBM.m b/Operations/WL_fBM.m index f82393d2a..3e482310c 100644 --- a/Operations/WL_fBM.m +++ b/Operations/WL_fBM.m @@ -40,7 +40,7 @@ % ------------------------------------------------------------------------------ %% Check that a Wavelet Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('wavelet_toolbox') +BF_CheckToolbox('wavelet_toolbox'); % Parameter estimation of fractional Brownian motion hest = wfbmesti(y); diff --git a/Operations/WL_scal2frq.m b/Operations/WL_scal2frq.m index 9f2692fd5..b59c2417c 100644 --- a/Operations/WL_scal2frq.m +++ b/Operations/WL_scal2frq.m @@ -52,7 +52,7 @@ % ------------------------------------------------------------------------------ %% Check that a Wavelet Toolbox license is available: % ------------------------------------------------------------------------------ -BF_CheckToolbox('wavelet_toolbox') +BF_CheckToolbox('wavelet_toolbox'); % ------------------------------------------------------------------------------ %% Preliminaries diff --git a/PeripheryFunctions/BF_CheckToolbox.m b/PeripheryFunctions/BF_CheckToolbox.m index e8edf5bb6..7d4f25bd8 100644 --- a/PeripheryFunctions/BF_CheckToolbox.m +++ b/PeripheryFunctions/BF_CheckToolbox.m @@ -51,6 +51,7 @@ %------------------------------------------------------------------------------- %% Get a more interpretable string for user feedback: theName +%% (and for testing against text in matlab.addons.installedAddons) %------------------------------------------------------------------------------- switch theToolbox case 'statistics_toolbox' @@ -73,6 +74,8 @@ theName = 'Database Toolbox'; case 'parallel_computing_toolbox' theName = 'Parallel Computing Toolbox'; +case 'distrib_computing_toolbox' + theName = 'Parallel Computing Toolbox'; otherwise error('Unknown toolbox ''%s''.\n',theToolbox); end @@ -98,16 +101,15 @@ outFlag = true; end else - % Want to use a license + % Want to use (and checkout) a license if ~haveToolbox - error('This function requires %s.',theName); + error('This function requires %s but you don''t have it installed'.',theName); end % 2. Check to see if there's an available license for this toolbox: [licenseFree,~] = license('checkout',theToolbox); % Attempt to check out a license if ~licenseFree - error(['This function requires %s but it is not installed ',... - '(or I could not obtain a license for it).'],theName); + error('This function requires %s but I could not obtain a license for it).',theName); end end diff --git a/PeripheryFunctions/TS_InitiateParallel.m b/PeripheryFunctions/TS_InitiateParallel.m index bea36a964..53db7007a 100644 --- a/PeripheryFunctions/TS_InitiateParallel.m +++ b/PeripheryFunctions/TS_InitiateParallel.m @@ -37,9 +37,9 @@ % Check a license is available: try - BF_CheckToolbox('parallel_computing_toolbox') + BF_CheckToolbox('distrib_computing_toolbox',true); catch - fprintf(1,['License for Parallel Computing Toolbox could not be initiated' ... + fprintf(1,['License for Parallel/Distributed Computing Toolbox could not be initiated' ... ' -- cannot perform computations across multiple cores.\n']); success = false; return diff --git a/install.m b/install.m index 863756668..21c106530 100644 --- a/install.m +++ b/install.m @@ -71,7 +71,7 @@ function install(silentInstall) fprintf(1,'The Statistics and Machine Learning Toolbox is required for hctsa and needs to be installed.\n'); end % For distributed computing -noDistributedToolbox = BF_CheckToolbox('parallel_computing_toolbox',true,true); +noDistributedToolbox = BF_CheckToolbox('distrib_computing_toolbox',true,true); if noDistributedToolbox fprintf(1,'Matlab''s Parallel Computing Toolbox is required for distributed calculation but is not installed.\n'); end