Skip to content

Commit

Permalink
Merge branch 'OperationChanges'
Browse files Browse the repository at this point in the history
  • Loading branch information
@benfulcher
benfulcher committed Nov 25, 2024
2 parents be0d742 + ceaa170 commit 8367ad2
Show file tree
Hide file tree
Showing 40 changed files with 302 additions and 266 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ sql_settings.conf
*.mexw64
*.mexw64.manifest
*.mexmaci64
*.mexmaca64
*.mexa64

# Random stuff
Expand Down
2 changes: 1 addition & 1 deletion Calculation/TS_Combine.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Database/ToolboxDependencies.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down
127 changes: 71 additions & 56 deletions FeatureSets/INP_mops_hctsa.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 8367ad2

Please sign in to comment.