diff --git a/contrast/feat_extract/__pycache__/config.cpython-39.pyc b/contrast/feat_extract/__pycache__/config.cpython-39.pyc index 11b46cc..2571d7d 100644 Binary files a/contrast/feat_extract/__pycache__/config.cpython-39.pyc and b/contrast/feat_extract/__pycache__/config.cpython-39.pyc differ diff --git a/contrast/one2one_contrast.py b/contrast/one2one_contrast.py index f2b2ba3..ce9fea5 100644 --- a/contrast/one2one_contrast.py +++ b/contrast/one2one_contrast.py @@ -567,8 +567,8 @@ def init_std_evt_dict(): event_spath.append(os.path.join(evtpath, evtname)) '''==== 1. 生成标准特征集, 只需运行一次, 在 genfeats.py 中实现 ===========''' - # bcdSet = set(bcdList) - # gen_bcd_features(stdSamplePath, stdBarcodePath, stdFeaturePath, bcdSet) + bcdSet = set(bcdList) + gen_bcd_features(stdSamplePath, stdBarcodePath, stdFeaturePath, bcdSet) print("stdFeats have generated and saved!") @@ -583,7 +583,7 @@ def test_one2one(): '''1:1性能评估''' # 1. 只需运行一次,生成事件字典和相应的标准特征库字典 - # init_std_evt_dict() + init_std_evt_dict() # 2. 基于事件barcode集和标准库barcode交集构造事件集合 evtList, evtDict, stdDict = build_std_evt_dict() @@ -597,7 +597,7 @@ def test_one2SN(): '''1:SN性能评估''' # 1. 只需运行一次,生成事件字典和相应的标准特征库字典 - # init_std_evt_dict() + init_std_evt_dict() # 2. 事件barcode集和标准库barcode求交集 evtList, evtDict, stdDict = build_std_evt_dict() @@ -642,7 +642,7 @@ if __name__ == '__main__': test_one2one() - # test_one2SN() + test_one2SN()