update guide example, conf.py and remove some unused imports
							parent
							
								
									e4e6f46089
								
							
						
					
					
						commit
						72a12e96ba
					
				| 
						 | 
				
			
			@ -7,7 +7,6 @@ import sys
 | 
			
		|||
from sphinx.ext.autodoc import ClassDocumenter
 | 
			
		||||
 | 
			
		||||
from stix2.base import _STIXBase
 | 
			
		||||
from stix2.equivalence.graph import GRAPH_WEIGHTS
 | 
			
		||||
from stix2.equivalence.object import WEIGHTS
 | 
			
		||||
from stix2.version import __version__
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4607,20 +4607,11 @@
 | 
			
		|||
    "    ),\n",
 | 
			
		||||
    "]\n",
 | 
			
		||||
    "\n",
 | 
			
		||||
    "\n",
 | 
			
		||||
    "weights = {\n",
 | 
			
		||||
    "    \"_internal\": {\n",
 | 
			
		||||
    "        \"ignore_spec_version\": False,\n",
 | 
			
		||||
    "        \"versioning_checks\": False,\n",
 | 
			
		||||
    "        \"max_depth\": 1,\n",
 | 
			
		||||
    "    },\n",
 | 
			
		||||
    "}\n",
 | 
			
		||||
    "\n",
 | 
			
		||||
    "memstore1 = MemoryStore(g1)\n",
 | 
			
		||||
    "memstore2 = MemoryStore(g2)\n",
 | 
			
		||||
    "prop_scores = {}\n",
 | 
			
		||||
    "\n",
 | 
			
		||||
    "similarity_result = env.graph_similarity(memstore1, memstore2, prop_scores, **weights)\n",
 | 
			
		||||
    "similarity_result = env.graph_similarity(memstore1, memstore2, prop_scores)\n",
 | 
			
		||||
    "equivalence_result = env.graph_equivalence(memstore1, memstore2, threshold=60)\n",
 | 
			
		||||
    "\n",
 | 
			
		||||
    "print(similarity_result)\n",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,9 +2,7 @@
 | 
			
		|||
import logging
 | 
			
		||||
 | 
			
		||||
from ..object import (
 | 
			
		||||
    WEIGHTS, _bucket_per_type, _object_pairs, exact_match,
 | 
			
		||||
    list_reference_check, object_similarity, partial_string_based,
 | 
			
		||||
    partial_timestamp_based, reference_check,
 | 
			
		||||
    WEIGHTS, _bucket_per_type, _object_pairs, object_similarity,
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
logger = logging.getLogger(__name__)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -412,8 +412,8 @@ def _versioned_checks(ref1, ref2, ds1, ds2, **weights):
 | 
			
		|||
                object1, object2, ds1=ds1, ds2=ds2,
 | 
			
		||||
                ignore_spec_version=ignore_spec_version,
 | 
			
		||||
                versioning_checks=versioning_checks,
 | 
			
		||||
                max_depth=max_depth, **weights
 | 
			
		||||
            )
 | 
			
		||||
                max_depth=max_depth, **weights,
 | 
			
		||||
        )
 | 
			
		||||
        if ref1 not in results:
 | 
			
		||||
            results[ref1] = {"matched": ref2, "value": result}
 | 
			
		||||
        elif result > results[ref1]["value"]:
 | 
			
		||||
| 
						 | 
				
			
			@ -446,7 +446,7 @@ def reference_check(ref1, ref2, ds1, ds2, **weights):
 | 
			
		|||
                    o1, o2, ds1=ds1, ds2=ds2,
 | 
			
		||||
                    ignore_spec_version=ignore_spec_version,
 | 
			
		||||
                    versioning_checks=versioning_checks,
 | 
			
		||||
                    max_depth=max_depth, **weights
 | 
			
		||||
                    max_depth=max_depth, **weights,
 | 
			
		||||
                ) / 100.0
 | 
			
		||||
 | 
			
		||||
    logger.debug(
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue