Merge pull request #574 from hed-standard/dev_ian

Remove hed group frozen
hed-standard · Jan 17, 2023 · 458f68c · 458f68c
2 parents 59218b9 + 4710bc7
commit 458f68c
Show file tree

Hide file tree

Showing 11 changed files with 436 additions and 584 deletions.
diff --git a/hed/errors/error_types.py b/hed/errors/error_types.py
@@ -27,7 +27,6 @@ class ValidationErrors:
     HED_DEF_EXPAND_INVALID = "HED_DEF_EXPAND_INVALID"
     HED_DEF_VALUE_INVALID = "HED_DEF_VALUE_INVALID"
     HED_DEFINITION_INVALID = "HED_DEFINITION_INVALID"
-    # HED_LIBRARY_UNMATCHED
     HED_NODE_NAME_EMPTY = 'HED_NODE_NAME_EMPTY'
     HED_ONSET_OFFSET_ERROR = 'HED_ONSET_OFFSET_ERROR'
     HED_PARENTHESES_MISMATCH = 'HED_PARENTHESES_MISMATCH'
@@ -47,16 +46,16 @@ class ValidationErrors:
     HED_UNITS_INVALID = 'HED_UNITS_INVALID'
     HED_UNITS_DEFAULT_USED = 'HED_UNITS_DEFAULT_USED'
     HED_VALUE_INVALID = 'HED_VALUE_INVALID'
+    HED_LIBRARY_UNMATCHED = "HED_LIBRARY_UNMATCHED"
     # HED_VERSION_WARNING
 
     HED_MISSING_REQUIRED_COLUMN = "HED_MISSING_REQUIRED_COLUMN"
     HED_UNKNOWN_COLUMN = "HED_UNKNOWN_COLUMN"
     HED_DUPLICATE_COLUMN = "HED_DUPLICATE_COLUMN"
     HED_BLANK_COLUMN = "HED_BLANK_COLUMN"
-    HED_LIBRARY_UNMATCHED = "HED_LIBRARY_UNMATCHED"
+
 
     # Below here shows what the given error maps to
-    # HED_TAG_EMPTY
     HED_GROUP_EMPTY = 'emptyHedGroup'
     INVALID_TAG_CHARACTER = 'invalidTagCharacter'
 

diff --git a/hed/models/__init__.py b/hed/models/__init__.py
@@ -7,11 +7,10 @@
 from .definition_entry import DefinitionEntry
 from .def_mapper import DefMapper
 from .expression_parser import TagExpressionParser
-from .hed_group import HedGroup, HedGroupFrozen
-from .hed_group_base import HedGroupBase
+from .hed_group import HedGroup
 from .spreadsheet_input import SpreadsheetInput
 from .hed_ops import HedOps
-from .hed_string import HedString, HedStringFrozen
+from .hed_string import HedString
 from .hed_string_group import HedStringGroup
 from .hed_tag import HedTag
 from .onset_mapper import OnsetMapper

diff --git a/hed/models/expression_parser.py b/hed/models/expression_parser.py
@@ -142,6 +142,7 @@ def handle_expr(self, hed_group, exact=False):
                     group = group._parent
         return all_found_groups
 
+
 class ExpressionAnd(Expression):
     def handle_expr(self, hed_group, exact=False):
         groups1 = self.left.handle_expr(hed_group, exact=exact)