#19 Adjust EngineFlags

senzing-garage · May 7, 2024 · 59bc997 · 59bc997
1 parent 706cfea
commit 59bc997
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/src/senzing_abstract/szengineflags.py b/src/senzing_abstract/szengineflags.py
@@ -88,26 +88,24 @@ def combine_flags(
 
     # Flags for extra feature data.
 
-    SZ_ENTITY_OPTION_INCLUDE_INTERNAL_FEATURES = 1 << 23
-    SZ_ENTITY_OPTION_INCLUDE_FEATURE_STATS = 1 << 24
-    SZ_ENTITY_OPTION_INCLUDE_FEATURE_ELEMENTS = 1 << 32
+    SZ_ENTITY_INCLUDE_INTERNAL_FEATURES = 1 << 23
+    SZ_ENTITY_INCLUDE_FEATURE_STATS = 1 << 24
+    SZ_ENTITY_INCLUDE_FEATURE_ELEMENTS = 1 << 32
 
     # Flags for extra matching data.
 
-    SZ_ENTITY_OPTION_INCLUDE_MATCH_KEY_DETAILS = 1 << 34
+    SZ_INCLUDE_MATCH_KEY_DETAILS = 1 << 34
 
     # Flags for finding entity path & network data.
 
     SZ_FIND_PATH_PREFER_EXCLUDE = 1 << 25
-    SZ_FIND_PATH_MATCHING_INFO = 1 << 30
-    SZ_FIND_NETWORK_MATCHING_INFO = 1 << 33
+    SZ_FIND_PATH_INCLUDE_MATCHING_INFO = 1 << 30
+    SZ_FIND_NETWORK_INCLUDE_MATCHING_INFO = 1 << 33
 
     # Flags for including search result information.
 
     SZ_INCLUDE_FEATURE_SCORES = 1 << 26
     SZ_SEARCH_INCLUDE_STATS = 1 << 27
-    SZ_SEARCH_INCLUDE_FEATURE_SCORES = SZ_INCLUDE_FEATURE_SCORES
-    SZ_SEARCH_INCLUDE_MATCH_KEY_DETAILS = SZ_ENTITY_OPTION_INCLUDE_MATCH_KEY_DETAILS
 
     # Flag for returning with info responses.
     SZ_WITH_INFO = 1 << 62
@@ -156,35 +154,35 @@ def combine_flags(
     )
 
     SZ_FIND_PATH_DEFAULT_FLAGS = (
-        SZ_FIND_PATH_MATCHING_INFO
+        SZ_FIND_PATH_INCLUDE_MATCHING_INFO
         | SZ_ENTITY_INCLUDE_ENTITY_NAME
         | SZ_ENTITY_INCLUDE_RECORD_SUMMARY
     )
 
     SZ_FIND_NETWORK_DEFAULT_FLAGS = (
-        SZ_FIND_NETWORK_MATCHING_INFO
+        SZ_FIND_NETWORK_INCLUDE_MATCHING_INFO
         | SZ_ENTITY_INCLUDE_ENTITY_NAME
         | SZ_ENTITY_INCLUDE_RECORD_SUMMARY
     )
 
     SZ_WHY_ENTITIES_DEFAULT_FLAGS = (
         SZ_ENTITY_DEFAULT_FLAGS
-        | SZ_ENTITY_OPTION_INCLUDE_INTERNAL_FEATURES
-        | SZ_ENTITY_OPTION_INCLUDE_FEATURE_STATS
+        | SZ_ENTITY_INCLUDE_INTERNAL_FEATURES
+        | SZ_ENTITY_INCLUDE_FEATURE_STATS
         | SZ_INCLUDE_FEATURE_SCORES
     )
 
     SZ_WHY_RECORDS_DEFAULT_FLAGS = (
         SZ_ENTITY_DEFAULT_FLAGS
-        | SZ_ENTITY_OPTION_INCLUDE_INTERNAL_FEATURES
-        | SZ_ENTITY_OPTION_INCLUDE_FEATURE_STATS
+        | SZ_ENTITY_INCLUDE_INTERNAL_FEATURES
+        | SZ_ENTITY_INCLUDE_FEATURE_STATS
         | SZ_INCLUDE_FEATURE_SCORES
     )
 
     SZ_WHY_RECORD_IN_ENTITY_DEFAULT_FLAGS = (
         SZ_ENTITY_DEFAULT_FLAGS
-        | SZ_ENTITY_OPTION_INCLUDE_INTERNAL_FEATURES
-        | SZ_ENTITY_OPTION_INCLUDE_FEATURE_STATS
+        | SZ_ENTITY_INCLUDE_INTERNAL_FEATURES
+        | SZ_ENTITY_INCLUDE_FEATURE_STATS
         | SZ_INCLUDE_FEATURE_SCORES
     )
 
@@ -197,7 +195,7 @@ def combine_flags(
         | SZ_ENTITY_INCLUDE_REPRESENTATIVE_FEATURES
         | SZ_ENTITY_INCLUDE_ENTITY_NAME
         | SZ_ENTITY_INCLUDE_RECORD_SUMMARY
-        | SZ_SEARCH_INCLUDE_FEATURE_SCORES
+        | SZ_INCLUDE_FEATURE_SCORES
     )
 
     SZ_SEARCH_BY_ATTRIBUTES_STRONG = (
@@ -206,7 +204,7 @@ def combine_flags(
         | SZ_ENTITY_INCLUDE_REPRESENTATIVE_FEATURES
         | SZ_ENTITY_INCLUDE_ENTITY_NAME
         | SZ_ENTITY_INCLUDE_RECORD_SUMMARY
-        | SZ_SEARCH_INCLUDE_FEATURE_SCORES
+        | SZ_INCLUDE_FEATURE_SCORES
     )
 
     SZ_SEARCH_BY_ATTRIBUTES_MINIMAL_ALL = SZ_SEARCH_INCLUDE_ALL_ENTITIES