Skip to content

Commit 8367ad2

Browse files
benfulcherbenfulcher
committed
Merge branch 'OperationChanges'
2 parents be0d742 + ceaa170 commit 8367ad2

40 files changed

+302
-266
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ sql_settings.conf
2424
*.mexw64
2525
*.mexw64.manifest
2626
*.mexmaci64
27+
*.mexmaca64
2728
*.mexa64
2829

2930
# Random stuff

‎Calculation/TS_Combine.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function TS_Combine(HCTSA_1,HCTSA_2,compare_tsids,merge_features,outputFileName,
7474
'time series IDs are comparable.\nAny intersection of IDs will be filtered out.\n'],...
7575
HCTSA_1,HCTSA_2);
7676
else
77-
fprintf(1,['Assuming that %s and %s came different databases so' ...
77+
fprintf(1,['Assuming that %s and %s came from different databases so' ...
7878
' duplicate ts_ids can occur in the resulting matrix.\n'], ...
7979
HCTSA_1,HCTSA_2);
8080
end

‎Database/ToolboxDependencies.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ EXTERNAL TOOLBOXES (PROVIDED)
172172

173173
Michael Small Package (provided)
174174

175-
NL_BoxCorrDim.m
176175
NL_MS_LZcomplexity.m
177176
NL_MS_fnn.m
178177
NL_MS_nlpe.m
178+
NL_TSTL_BoxCorrDim.m
179179
NL_TSTL_PoincareSection.m
180180
NL_TSTL_ReturnTime.m
181181
NL_TSTL_TakensEstimator.m
@@ -194,7 +194,7 @@ TSTOOL Package (GPL; provided)
194194
CO_TSTL_AutoCorrMethod.m
195195
CO_TSTL_amutual.m
196196
CO_TSTL_amutual2.m
197-
NL_BoxCorrDim.m
197+
NL_TSTL_BoxCorrDim.m
198198
NL_CaosMethod.m
199199
NL_TSTL_FractalDimensions.m
200200
NL_TSTL_GPCorrSum.m
@@ -227,7 +227,7 @@ MF_GP_hyperparameters.m
227227

228228
CRP Toolbox (GPL, provided)
229229

230-
NL_BoxCorrDim.m
230+
NL_TSTL_BoxCorrDim.m
231231
NL_crptool_fnn.m
232232

233233
HMM Toolbox (MIT License, provided)

‎FeatureSets/INP_mops_hctsa.txt

+71-56
Original file line numberDiff line numberDiff line change
@@ -148,61 +148,76 @@ CO_FirstMin(x_z,'mi-kraskov1','4',false) CO_FirstMax_mi-kraskov1_4
148148
CO_FirstMin(x_z,'mi-kraskov2','4',false) CO_FirstMax_mi-kraskov2_4
149149
CO_FirstMin(x_z,'mi-hist',5,false) CO_FirstMax_mi-hist_5
150150
CO_FirstMin(x_z,'mi-hist',10,false) CO_FirstMax_mi-hist_10
151-
CO_NonlinearAutocorr(x_z,[1,2]) AC_nl_12
152-
CO_NonlinearAutocorr(x_z,[1,2,3]) AC_nl_123
153-
CO_NonlinearAutocorr(x_z,[1,2,3,4]) AC_nl_1234
154-
CO_NonlinearAutocorr(x_z,[1,2,3,4,5]) AC_nl_12345
155-
CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6]) AC_nl_123456
156-
CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6,7]) AC_nl_1234567
157-
CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6,7,8]) AC_nl_12345678
158-
CO_NonlinearAutocorr(x_z,[1,3]) AC_nl_13
159-
CO_NonlinearAutocorr(x_z,[2,4]) AC_nl_24
160-
CO_NonlinearAutocorr(x_z,[1,3,5]) AC_nl_135
161-
CO_NonlinearAutocorr(x_z,[2,4,6]) AC_nl_246
162-
CO_NonlinearAutocorr(x_z,[1,3,5,7]) AC_nl_1357
163-
CO_NonlinearAutocorr(x_z,[2,4,6,8]) AC_nl_2468
164-
CO_NonlinearAutocorr(x_z,[1,2,4]) AC_nl_124
165-
CO_NonlinearAutocorr(x_z,[1,3,4]) AC_nl_134
166-
CO_NonlinearAutocorr(x_z,[1,4]) AC_nl_14
167-
CO_NonlinearAutocorr(x_z,[1,1]) AC_nl_11
168-
CO_NonlinearAutocorr(x_z,[2,2]) AC_nl_22
169-
CO_NonlinearAutocorr(x_z,[3,3]) AC_nl_33
170-
CO_NonlinearAutocorr(x_z,[4,4]) AC_nl_44
171-
CO_NonlinearAutocorr(x_z,[5,5]) AC_nl_55
172-
CO_NonlinearAutocorr(x_z,[6,6]) AC_nl_66
173-
CO_NonlinearAutocorr(x_z,[0,1,1]) AC_nl_011
174-
CO_NonlinearAutocorr(x_z,[0,2,2]) AC_nl_022
175-
CO_NonlinearAutocorr(x_z,[0,3,3]) AC_nl_033
176-
CO_NonlinearAutocorr(x_z,[0,4,4]) AC_nl_044
177-
CO_NonlinearAutocorr(x_z,[0,5,5]) AC_nl_055
178-
CO_NonlinearAutocorr(x_z,[0,6,6]) AC_nl_066
179-
CO_NonlinearAutocorr(x_z,[0,0,1]) AC_nl_001
180-
CO_NonlinearAutocorr(x_z,[0,0,2]) AC_nl_002
181-
CO_NonlinearAutocorr(x_z,[0,0,3]) AC_nl_003
182-
CO_NonlinearAutocorr(x_z,[0,0,4]) AC_nl_004
183-
CO_NonlinearAutocorr(x_z,[0,0,5]) AC_nl_005
184-
CO_NonlinearAutocorr(x_z,[0,0,6]) AC_nl_006
185-
CO_NonlinearAutocorr(x_z,[0,1,2]) AC_nl_012
186-
CO_NonlinearAutocorr(x_z,[0,1,3]) AC_nl_013
187-
CO_NonlinearAutocorr(x_z,[0,2,3]) AC_nl_023
188-
CO_NonlinearAutocorr(x_z,[0,1,4]) AC_nl_014
189-
CO_NonlinearAutocorr(x_z,[0,2,4]) AC_nl_024
190-
CO_NonlinearAutocorr(x_z,[0,3,4]) AC_nl_034
191-
CO_NonlinearAutocorr(x_z,[0,1,5]) AC_nl_015
192-
CO_NonlinearAutocorr(x_z,[0,2,5]) AC_nl_025
193-
CO_NonlinearAutocorr(x_z,[0,3,5]) AC_nl_035
194-
CO_NonlinearAutocorr(x_z,[0,4,5]) AC_nl_045
195-
CO_NonlinearAutocorr(x_z,[0,1,6]) AC_nl_016
196-
CO_NonlinearAutocorr(x_z,[0,2,6]) AC_nl_026
197-
CO_NonlinearAutocorr(x_z,[0,3,6]) AC_nl_036
198-
CO_NonlinearAutocorr(x_z,[0,4,6]) AC_nl_046
199-
CO_NonlinearAutocorr(x_z,[0,5,6]) AC_nl_056
200-
CO_NonlinearAutocorr(x_z,[1,1,2]) AC_nl_112
201-
CO_NonlinearAutocorr(x_z,[1,1,3]) AC_nl_113
202-
CO_NonlinearAutocorr(x_z,[1,2,2]) AC_nl_122
203-
CO_NonlinearAutocorr(x_z,[1,3,3]) AC_nl_133
204-
CO_NonlinearAutocorr(x_z,[2,2,3]) AC_nl_223
205-
CO_NonlinearAutocorr(x_z,[2,3,3]) AC_nl_233
151+
CO_NonlinearAutocorr(x_z,[1,2],false) AC_nl_12
152+
CO_NonlinearAutocorr(x_z,[1,2],true) AC_nl_12_abs
153+
CO_NonlinearAutocorr(x_z,[1,2,3],false) AC_nl_123
154+
CO_NonlinearAutocorr(x_z,[1,2,3,4],false) AC_nl_1234
155+
CO_NonlinearAutocorr(x_z,[1,2,3,4],true) AC_nl_1234_abs
156+
CO_NonlinearAutocorr(x_z,[1,2,3,4,5],false) AC_nl_12345
157+
CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6],false) AC_nl_123456
158+
CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6],true) AC_nl_123456_abs
159+
CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6,7],false) AC_nl_1234567
160+
CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6,7,8],false) AC_nl_12345678
161+
CO_NonlinearAutocorr(x_z,[1,2,3,4,5,6,7,8],true) AC_nl_12345678_abs
162+
CO_NonlinearAutocorr(x_z,[1,3],false) AC_nl_13
163+
CO_NonlinearAutocorr(x_z,[1,3],true) AC_nl_13_abs
164+
CO_NonlinearAutocorr(x_z,[2,4],false) AC_nl_24
165+
CO_NonlinearAutocorr(x_z,[2,4],true) AC_nl_24_abs
166+
CO_NonlinearAutocorr(x_z,[1,3,5],false) AC_nl_135
167+
CO_NonlinearAutocorr(x_z,[2,4,6],false) AC_nl_246
168+
CO_NonlinearAutocorr(x_z,[1,3,5,7],false) AC_nl_1357
169+
CO_NonlinearAutocorr(x_z,[1,3,5,7],true) AC_nl_1357_abs
170+
CO_NonlinearAutocorr(x_z,[2,4,6,8],false) AC_nl_2468
171+
CO_NonlinearAutocorr(x_z,[2,4,6,8],true) AC_nl_2468_abs
172+
CO_NonlinearAutocorr(x_z,[1,2,4],false) AC_nl_124
173+
CO_NonlinearAutocorr(x_z,[1,3,4],false) AC_nl_134
174+
CO_NonlinearAutocorr(x_z,[1,4],false) AC_nl_14
175+
CO_NonlinearAutocorr(x_z,[1,4],true) AC_nl_14_abs
176+
CO_NonlinearAutocorr(x_z,[1,1],false) AC_nl_11
177+
CO_NonlinearAutocorr(x_z,[1,1],true) AC_nl_11_abs
178+
CO_NonlinearAutocorr(x_z,[2,2],false) AC_nl_22
179+
CO_NonlinearAutocorr(x_z,[2,2],true) AC_nl_22_abs
180+
CO_NonlinearAutocorr(x_z,[3,3],false) AC_nl_33
181+
CO_NonlinearAutocorr(x_z,[3,3],true) AC_nl_33_abs
182+
CO_NonlinearAutocorr(x_z,[4,4],false) AC_nl_44
183+
CO_NonlinearAutocorr(x_z,[4,4],true) AC_nl_44_abs
184+
CO_NonlinearAutocorr(x_z,[5,5],false) AC_nl_55
185+
CO_NonlinearAutocorr(x_z,[5,5],true) AC_nl_55_abs
186+
CO_NonlinearAutocorr(x_z,[6,6],false) AC_nl_66
187+
CO_NonlinearAutocorr(x_z,[6,6],true) AC_nl_66_abs
188+
CO_NonlinearAutocorr(x_z,[0,1,1],false) AC_nl_011
189+
CO_NonlinearAutocorr(x_z,[0,2,2],false) AC_nl_022
190+
CO_NonlinearAutocorr(x_z,[0,3,3],false) AC_nl_033
191+
CO_NonlinearAutocorr(x_z,[0,4,4],false) AC_nl_044
192+
CO_NonlinearAutocorr(x_z,[0,5,5],false) AC_nl_055
193+
CO_NonlinearAutocorr(x_z,[0,6,6],false) AC_nl_066
194+
CO_NonlinearAutocorr(x_z,[0,0,1],false) AC_nl_001
195+
CO_NonlinearAutocorr(x_z,[0,0,2],false) AC_nl_002
196+
CO_NonlinearAutocorr(x_z,[0,0,3],false) AC_nl_003
197+
CO_NonlinearAutocorr(x_z,[0,0,4],false) AC_nl_004
198+
CO_NonlinearAutocorr(x_z,[0,0,5],false) AC_nl_005
199+
CO_NonlinearAutocorr(x_z,[0,0,6],false) AC_nl_006
200+
CO_NonlinearAutocorr(x_z,[0,1,2],false) AC_nl_012
201+
CO_NonlinearAutocorr(x_z,[0,1,3],false) AC_nl_013
202+
CO_NonlinearAutocorr(x_z,[0,2,3],false) AC_nl_023
203+
CO_NonlinearAutocorr(x_z,[0,1,4],false) AC_nl_014
204+
CO_NonlinearAutocorr(x_z,[0,2,4],false) AC_nl_024
205+
CO_NonlinearAutocorr(x_z,[0,3,4],false) AC_nl_034
206+
CO_NonlinearAutocorr(x_z,[0,1,5],false) AC_nl_015
207+
CO_NonlinearAutocorr(x_z,[0,2,5],false) AC_nl_025
208+
CO_NonlinearAutocorr(x_z,[0,3,5],false) AC_nl_035
209+
CO_NonlinearAutocorr(x_z,[0,4,5],false) AC_nl_045
210+
CO_NonlinearAutocorr(x_z,[0,1,6],false) AC_nl_016
211+
CO_NonlinearAutocorr(x_z,[0,2,6],false) AC_nl_026
212+
CO_NonlinearAutocorr(x_z,[0,3,6],false) AC_nl_036
213+
CO_NonlinearAutocorr(x_z,[0,4,6],false) AC_nl_046
214+
CO_NonlinearAutocorr(x_z,[0,5,6],false) AC_nl_056
215+
CO_NonlinearAutocorr(x_z,[1,1,2],false) AC_nl_112
216+
CO_NonlinearAutocorr(x_z,[1,1,3],false) AC_nl_113
217+
CO_NonlinearAutocorr(x_z,[1,2,2],false) AC_nl_122
218+
CO_NonlinearAutocorr(x_z,[1,3,3],false) AC_nl_133
219+
CO_NonlinearAutocorr(x_z,[2,2,3],false) AC_nl_223
220+
CO_NonlinearAutocorr(x_z,[2,3,3],false) AC_nl_233
206221
CO_RM_AMInformation(x_z,0) CO_RM_AMInformation_0
207222
CO_RM_AMInformation(x_z,1) CO_RM_AMInformation_1
208223
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
934949
NL_TISEAN_d2(x_z,'ac',10,0.01) NL_TISEAN_d2_ac_10_001
935950
NL_TISEAN_c1(x_z,1,[1,7],0.02,0.5) NL_TISEAN_c1_1_1_7_002_05
936951
NL_TISEAN_c1(x_z,1,[2,6],25,0.1) NL_TISEAN_c1_1_2_6_25_01
937-
NL_BoxCorrDim(x_z,50,{'ac',5}) NL_BoxCorrDim_50_ac_5
952+
NL_TSTL_BoxCorrDim(x_z,50,{'ac',5}) NL_TSTL_BoxCorrDim_50_ac_5
938953
NL_TSTL_GPCorrSum(x_z,-1,0.5,40,20,{'ac','fnnmar'},1) NL_TSTL_GPCorrSum2_n1_05_40_20_ac_fnnmar
939954
NL_TSTL_GPCorrSum(x_z,-1,0.5,100,20,{'ac','fnnmar'},1) NL_TSTL_GPCorrSum2_n1_05_100_20_ac_fnnmar
940955
NL_TSTL_GPCorrSum(x_z,-1,0.1,40,20,{'ac','fnnmar'},1) NL_TSTL_GPCorrSum2_n1_01_40_20_ac_fnnmar

0 commit comments

Comments
 (0)