Skip to content

Commit 5b6f4e5

Browse files
friskluftfriskluft
committed
cleaned
1 parent b189cae commit 5b6f4e5

File tree

2 files changed

+18
-23
lines changed

2 files changed

+18
-23
lines changed

‎tests/python/test_nyxus.py‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,8 @@ def test_3d_ngtdm_compatibility (self):
919919
assert nyx is not None
920920

921921
# configure Nyxus 3D NGTDM to mock Radiomics
922-
nyx.set_metaparam ("3ngtdm/greydepth=-20") # corresponds to Radiomics setting "binCount:20"
922+
nyx.set_metaparam ("3ngtdm/greydepth=0") # matching Radiomics setting "binWidth:1"
923+
nyx.set_metaparam ("3ngtdm/radius=1")
923924

924925
# calculate features
925926
testsRoot = str (pathlib.Path(__file__).parent.parent.resolve()) # parent.parent to reach the data owned by c++ tests
@@ -982,22 +983,22 @@ def test_3d_glrlm_compatibility (self):
982983
"Case-1_original_glrlm_ShortRunLowGrayLevelEmphasis" : 0.011465297979291003
983984
}
984985

985-
assert np.isclose (f.at[0, "3GLRLM_GLN"], radiomics_gt["Case-1_original_glrlm_GrayLevelNonUniformity"], rtol=1.e-1, atol=1.e-2)
986-
assert np.isclose (f.at[0, "3GLRLM_GLNN"], radiomics_gt["Case-1_original_glrlm_GrayLevelNonUniformityNormalized"], rtol=1.e-1, atol=1.e-2)
987-
assert np.isclose (f.at[0, "3GLRLM_GLV"], radiomics_gt["Case-1_original_glrlm_GrayLevelVariance"], rtol=1.e-1, atol=1.e-2)
988-
assert np.isclose (f.at[0, "3GLRLM_HGLRE"], radiomics_gt["Case-1_original_glrlm_HighGrayLevelRunEmphasis"], rtol=1.e-1, atol=1.e-2)
989-
assert np.isclose (f.at[0, "3GLRLM_LRE"], radiomics_gt["Case-1_original_glrlm_LongRunEmphasis"], rtol=1.e-1, atol=1.e-2)
990-
assert np.isclose (f.at[0, "3GLRLM_LRHGLE"], radiomics_gt["Case-1_original_glrlm_LongRunHighGrayLevelEmphasis"], rtol=1.e-1, atol=1.e-2)
991-
assert np.isclose (f.at[0, "3GLRLM_LRLGLE"], radiomics_gt["Case-1_original_glrlm_LongRunLowGrayLevelEmphasis"], rtol=1.e-1, atol=1.e-2)
992-
assert np.isclose (f.at[0, "3GLRLM_LGLRE"], radiomics_gt["Case-1_original_glrlm_LowGrayLevelRunEmphasis"], rtol=1.e-1, atol=1.e-2)
993-
assert np.isclose (f.at[0, "3GLRLM_RE"], radiomics_gt["Case-1_original_glrlm_RunEntropy"], rtol=1.e-1, atol=1.e-2)
994-
assert np.isclose (f.at[0, "3GLRLM_RLN"], radiomics_gt["Case-1_original_glrlm_RunLengthNonUniformity"], rtol=1.e-1, atol=1.e-2)
995-
assert np.isclose (f.at[0, "3GLRLM_RLNN"], radiomics_gt["Case-1_original_glrlm_RunLengthNonUniformityNormalized"], rtol=1.e-1, atol=1.e-2)
996-
assert np.isclose (f.at[0, "3GLRLM_RP"], radiomics_gt["Case-1_original_glrlm_RunPercentage"], rtol=1.e-1, atol=1.e-2)
997-
assert np.isclose (f.at[0, "3GLRLM_RV"], radiomics_gt["Case-1_original_glrlm_RunVariance"], rtol=1.e-1, atol=1.e-2)
998-
assert np.isclose (f.at[0, "3GLRLM_SRE"], radiomics_gt["Case-1_original_glrlm_ShortRunEmphasis"], rtol=1.e-1, atol=1.e-2)
999-
assert np.isclose (f.at[0, "3GLRLM_SRHGLE"], radiomics_gt["Case-1_original_glrlm_ShortRunHighGrayLevelEmphasis"], rtol=1.e-1, atol=1.e-2)
1000-
assert np.isclose (f.at[0, "3GLRLM_SRLGLE"], radiomics_gt["Case-1_original_glrlm_ShortRunLowGrayLevelEmphasis"], rtol=1.e-1, atol=1.e-2)
986+
assert np.isclose (f.at[0, "3GLRLM_GLN_AVE"], radiomics_gt["Case-1_original_glrlm_GrayLevelNonUniformity"], rtol=1.e-1, atol=1.e-2)
987+
assert np.isclose (f.at[0, "3GLRLM_GLNN_AVE"], radiomics_gt["Case-1_original_glrlm_GrayLevelNonUniformityNormalized"], rtol=1.e-1, atol=1.e-2)
988+
assert np.isclose (f.at[0, "3GLRLM_GLV_AVE"], radiomics_gt["Case-1_original_glrlm_GrayLevelVariance"], rtol=1.e-1, atol=1.e-2)
989+
assert np.isclose (f.at[0, "3GLRLM_HGLRE_AVE"], radiomics_gt["Case-1_original_glrlm_HighGrayLevelRunEmphasis"], rtol=1.e-1, atol=1.e-2)
990+
assert np.isclose (f.at[0, "3GLRLM_LRE_AVE"], radiomics_gt["Case-1_original_glrlm_LongRunEmphasis"], rtol=1.e-1, atol=1.e-2)
991+
assert np.isclose (f.at[0, "3GLRLM_LRHGLE_AVE"], radiomics_gt["Case-1_original_glrlm_LongRunHighGrayLevelEmphasis"], rtol=1.e-1, atol=1.e-2)
992+
assert np.isclose (f.at[0, "3GLRLM_LRLGLE_AVE"], radiomics_gt["Case-1_original_glrlm_LongRunLowGrayLevelEmphasis"], rtol=1.e-1, atol=1.e-2)
993+
assert np.isclose (f.at[0, "3GLRLM_LGLRE_AVE"], radiomics_gt["Case-1_original_glrlm_LowGrayLevelRunEmphasis"], rtol=1.e-1, atol=1.e-2)
994+
assert np.isclose (f.at[0, "3GLRLM_RE_AVE"], radiomics_gt["Case-1_original_glrlm_RunEntropy"], rtol=1.e-1, atol=1.e-2)
995+
assert np.isclose (f.at[0, "3GLRLM_RLN_AVE"], radiomics_gt["Case-1_original_glrlm_RunLengthNonUniformity"], rtol=1.e-1, atol=1.e-2)
996+
assert np.isclose (f.at[0, "3GLRLM_RLNN_AVE"], radiomics_gt["Case-1_original_glrlm_RunLengthNonUniformityNormalized"], rtol=1.e-1, atol=1.e-2)
997+
assert np.isclose (f.at[0, "3GLRLM_RP_AVE"], radiomics_gt["Case-1_original_glrlm_RunPercentage"], rtol=1.e-1, atol=1.e-2)
998+
assert np.isclose (f.at[0, "3GLRLM_RV_AVE"], radiomics_gt["Case-1_original_glrlm_RunVariance"], rtol=1.e-1, atol=1.e-2)
999+
assert np.isclose (f.at[0, "3GLRLM_SRE_AVE"], radiomics_gt["Case-1_original_glrlm_ShortRunEmphasis"], rtol=1.e-1, atol=1.e-2)
1000+
assert np.isclose (f.at[0, "3GLRLM_SRHGLE_AVE"], radiomics_gt["Case-1_original_glrlm_ShortRunHighGrayLevelEmphasis"], rtol=1.e-1, atol=1.e-2)
1001+
assert np.isclose (f.at[0, "3GLRLM_SRLGLE_AVE"], radiomics_gt["Case-1_original_glrlm_ShortRunLowGrayLevelEmphasis"], rtol=1.e-1, atol=1.e-2)
10011002

10021003

10031004
def test_3d_glszm_compatibility (self):

‎tests/test_all.cc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@
3535
#include "test_arrow_file_name.h"
3636

3737

38-
TEST(TEST_NYXUS, TEST_COMPAT_3GLDM_DV_INTERCEPT)
39-
{
40-
ASSERT_NO_THROW(test_compat_3GLDM_DV());
41-
}
42-
43-
4438
// ***** 3D NGTDM compatibility *****
4539

4640
TEST(TEST_NYXUS, TEST_COMPAT_3NGTDM_BUSYNESS) {

0 commit comments

Comments
 (0)