MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

revert part changes

pull/1/head
Emmanuelle Vargas-Gonzalez 2021-03-01 12:44:35 -05:00
parent d2e867b52e
commit 3efa4c1ce9
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stix2/equivalence/object/__init__.py
View File

@ -176,7 +176,7 @@ def object_similarity(
elif comp_funct == list_reference_check: elif comp_funct == list_reference_check:
comp_funct = partial_list_based comp_funct = partial_list_based
contributing_score = w * comp_funct(obj1[prop], obj2[prop]) contributing_score = w * comp_funct(obj1[prop], obj2[prop])
prop_scores[prop]["method"] = comp_funct.__name__ prop_scores[prop]["check_type"] = comp_funct.__name__
else: else:
continue # prevent excessive recursion continue # prevent excessive recursion
weights["_internal"]["max_depth"] = max_depth weights["_internal"]["max_depth"] = max_depth
@ -409,9 +409,10 @@ def _versioned_checks(ref1, ref2, ds1, ds2, **weights):
for object1, object2 in pairs: for object1, object2 in pairs:
result = object_similarity( result = object_similarity(
object1, object2, ds1, ds2, object1, object2, ds1=ds1, ds2=ds2,
ignore_spec_version, versioning_checks, ignore_spec_version=ignore_spec_version,
max_depth, **weights versioning_checks=versioning_checks,
max_depth=max_depth, **weights
) )
if ref1 not in results: if ref1 not in results:
results[ref1] = {"matched": ref2, "value": result} results[ref1] = {"matched": ref2, "value": result}
@ -442,9 +443,10 @@ def reference_check(ref1, ref2, ds1, ds2, **weights):
o1, o2 = ds1.get(ref1), ds2.get(ref2) o1, o2 = ds1.get(ref1), ds2.get(ref2)
if o1 and o2: if o1 and o2:
result = object_similarity( result = object_similarity(
o1, o2, ds1, ds2, o1, o2, ds1=ds1, ds2=ds2,
ignore_spec_version, versioning_checks, ignore_spec_version=ignore_spec_version,
max_depth, **weights versioning_checks=versioning_checks,
max_depth=max_depth, **weights
) / 100.0 ) / 100.0
logger.debug( logger.debug(