Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to aas-core-meta, codegen, testgen f9cbdb3, b14237b2, 5a705a0b1 #39

Merged
merged 1 commit into from
Aug 31, 2024
Merged

Update to aas-core-meta, codegen, testgen f9cbdb3, b14237b2, 5a705a0b1 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _dev_scripts/aas_core3/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

This copy is necessary so that we can decouple from ``aas-core*-python`` repository.

The revision of aas-core-codegen was: 0f7345e1
The revision of aas-core-codegen was: b14237b2
"""
20 changes: 10 additions & 10 deletions _dev_scripts/aas_core3/verification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3426,21 +3426,21 @@ def transform_submodel_element_list(
if not (
not (
(
(that.value is not None)
and (
(
that.type_value_list_element == aas_types.AASSubmodelElements.PROPERTY
or that.type_value_list_element == aas_types.AASSubmodelElements.RANGE
)
)
that.type_value_list_element == aas_types.AASSubmodelElements.PROPERTY
or that.type_value_list_element == aas_types.AASSubmodelElements.RANGE
)
)
or (
(
(that.value_type_list_element is not None)
and properties_or_ranges_have_value_type(
that.value,
that.value_type_list_element
and (
(
(that.value is None)
or properties_or_ranges_have_value_type(
that.value,
that.value_type_list_element
)
)
)
)
)
Expand Down
4 changes: 2 additions & 2 deletions _dev_scripts/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
keywords="asset administration shell code generation industry 4.0 industrie i4.0",
install_requires=[
"icontract>=2.6.1,<3",
"aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@31d6afd#egg=aas-core-meta",
"aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@0f7345e1#egg=aas-core-codegen",
"aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@f9cbdb3#egg=aas-core-meta",
"aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@b14237b2#egg=aas-core-codegen",
],
# fmt: off
extras_require={
Expand Down
14 changes: 7 additions & 7 deletions verification/verification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5177,14 +5177,14 @@ func VerifySubmodelElementList(
}
}

if !(!((that.Value() != nil) &&
(that.TypeValueListElement() == aastypes.AASSubmodelElementsProperty ||
that.TypeValueListElement() == aastypes.AASSubmodelElementsRange)) ||
if !(!(that.TypeValueListElement() == aastypes.AASSubmodelElementsProperty ||
that.TypeValueListElement() == aastypes.AASSubmodelElementsRange) ||
((that.ValueTypeListElement() != nil) &&
PropertiesOrRangesHaveValueType(
that.Value(),
*that.ValueTypeListElement(),
))) {
((that.Value() == nil) ||
PropertiesOrRangesHaveValueType(
that.Value(),
*that.ValueTypeListElement(),
)))) {
abort = onError(
newVerificationError(
"Constraint AASd-109: If type value list element is equal to " +
Expand Down
Loading