search

AECgeeks / infra-repo-issue-test-old1

0 stars 0 forks source link

Remove elemented and standard cases issue 53 #17

Open aothms opened 2 years ago

aothms commented 2 years ago 
--- tmp/a/IFC.exp   2022-03-20 23:29:07.896154700 +0100
+++ tmp/b/IFC.exp   2022-03-22 21:11:43.406636500 +0100
@@ -4294,41 +4294,30 @@
    CorrespondingVLists : SIZEOF(VMultiplicities) = KnotVUpper;
    UDirectionConstraints : IfcConstraintsParamBSpline (
   SELF\IfcBSplineSurface.UDegree, KnotUUpper, 
   SELF\IfcBSplineSurface.UUpper, UMultiplicities, UKnots);
    VDirectionConstraints : IfcConstraintsParamBSpline (
   SELF\IfcBSplineSurface.VDegree, KnotVUpper, 
   SELF\IfcBSplineSurface.VUpper, VMultiplicities, VKnots);
 END_ENTITY;

 ENTITY IfcBeam
- SUPERTYPE OF (ONEOF
-   (IfcBeamStandardCase))
  SUBTYPE OF (IfcBuiltElement);
    PredefinedType : OPTIONAL IfcBeamTypeEnum;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcBeamTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcBeamTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
    CorrectTypeAssigned : (SIZEOF(IsTypedBy) = 0) OR
   ('IFC4X3_DEV.IFCBEAMTYPE' IN TYPEOF(SELF\IfcObject.IsTypedBy[1].RelatingType));
 END_ENTITY;

-ENTITY IfcBeamStandardCase
- SUBTYPE OF (IfcBeam);
- WHERE
-   HasMaterialProfileSetUsage : SIZEOF (QUERY(temp <* USEDIN(SELF, 'IFC4X3_DEV.IFCRELASSOCIATES.RELATEDOBJECTS') |
-              ('IFC4X3_DEV.IFCRELASSOCIATESMATERIAL' IN TYPEOF(temp)) AND
-              ('IFC4X3_DEV.IFCMATERIALPROFILESETUSAGE' IN TYPEOF(temp.RelatingMaterial))
-              )) = 1;
-END_ENTITY;
-
 ENTITY IfcBeamType
  SUBTYPE OF (IfcBuiltElementType);
    PredefinedType : IfcBeamTypeEnum;
  WHERE
    CorrectPredefinedType : (PredefinedType <> IfcBeamTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcBeamTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcElementType.ElementType));
 END_ENTITY;

 ENTITY IfcBearing
  SUBTYPE OF (IfcBuiltElement);
@@ -5022,41 +5011,30 @@
 END_ENTITY;

 ENTITY IfcColourSpecification
  ABSTRACT SUPERTYPE OF (ONEOF
    (IfcColourRgb))
  SUBTYPE OF (IfcPresentationItem);
    Name : OPTIONAL IfcLabel;
 END_ENTITY;

 ENTITY IfcColumn
- SUPERTYPE OF (ONEOF
-   (IfcColumnStandardCase))
  SUBTYPE OF (IfcBuiltElement);
    PredefinedType : OPTIONAL IfcColumnTypeEnum;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcColumnTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcColumnTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
    CorrectTypeAssigned : (SIZEOF(IsTypedBy) = 0) OR
   ('IFC4X3_DEV.IFCCOLUMNTYPE' IN TYPEOF(SELF\IfcObject.IsTypedBy[1].RelatingType));
 END_ENTITY;

-ENTITY IfcColumnStandardCase
- SUBTYPE OF (IfcColumn);
- WHERE
-   HasMaterialProfileSetUsage : SIZEOF (QUERY(temp <* USEDIN(SELF, 'IFC4X3_DEV.IFCRELASSOCIATES.RELATEDOBJECTS') |
-              ('IFC4X3_DEV.IFCRELASSOCIATESMATERIAL' IN TYPEOF(temp)) AND
-              ('IFC4X3_DEV.IFCMATERIALPROFILESETUSAGE' IN TYPEOF(temp.RelatingMaterial))
-              )) = 1;
-END_ENTITY;
-
 ENTITY IfcColumnType
  SUBTYPE OF (IfcBuiltElementType);
    PredefinedType : IfcColumnTypeEnum;
  WHERE
    CorrectPredefinedType : (PredefinedType <> IfcColumnTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcColumnTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcElementType.ElementType));
 END_ENTITY;

 ENTITY IfcCommunicationsAppliance
  SUBTYPE OF (IfcFlowTerminal);
@@ -5949,22 +5927,20 @@
  SUBTYPE OF (IfcExternalReference);
    Description : OPTIONAL IfcText;
    ReferencedDocument : OPTIONAL IfcDocumentInformation;
  INVERSE
    DocumentRefForObjects : SET [0:?] OF IfcRelAssociatesDocument FOR RelatingDocument;
  WHERE
    WR1 : EXISTS(Name) XOR EXISTS(ReferencedDocument);
 END_ENTITY;

 ENTITY IfcDoor
- SUPERTYPE OF (ONEOF
-   (IfcDoorStandardCase))
  SUBTYPE OF (IfcBuiltElement);
    OverallHeight : OPTIONAL IfcPositiveLengthMeasure;
    OverallWidth : OPTIONAL IfcPositiveLengthMeasure;
    PredefinedType : OPTIONAL IfcDoorTypeEnum;
    OperationType : OPTIONAL IfcDoorTypeOperationEnum;
    UserDefinedOperationType : OPTIONAL IfcLabel;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcDoorTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcDoorTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
@@ -6013,24 +5989,20 @@
  WHERE
    ApplicableToType : (EXISTS(SELF\IfcPropertySetDefinition.DefinesType[1])) 
 AND 
 (
  ('IFC4X3_DEV.IFCDOORTYPE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
   OR
  ('IFC4X3_DEV.IFCDOORSTYLE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
 );
 END_ENTITY;

-ENTITY IfcDoorStandardCase
- SUBTYPE OF (IfcDoor);
-END_ENTITY;
-
 ENTITY IfcDoorType
  SUBTYPE OF (IfcBuiltElementType);
    PredefinedType : IfcDoorTypeEnum;
    OperationType : IfcDoorTypeOperationEnum;
    ParameterTakesPrecedence : OPTIONAL IfcBoolean;
    UserDefinedOperationType : OPTIONAL IfcLabel;
  WHERE
    CorrectPredefinedType : (PredefinedType <> IfcDoorTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcDoorTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcElementType.ElementType));
 END_ENTITY;
@@ -7985,41 +7957,30 @@

 ENTITY IfcMedicalDeviceType
  SUBTYPE OF (IfcFlowTerminalType);
    PredefinedType : IfcMedicalDeviceTypeEnum;
  WHERE
    CorrectPredefinedType : (PredefinedType <> IfcMedicalDeviceTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcMedicalDeviceTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcElementType.ElementType));
 END_ENTITY;

 ENTITY IfcMember
- SUPERTYPE OF (ONEOF
-   (IfcMemberStandardCase))
  SUBTYPE OF (IfcBuiltElement);
    PredefinedType : OPTIONAL IfcMemberTypeEnum;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcMemberTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcMemberTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
    CorrectTypeAssigned : (SIZEOF(IsTypedBy) = 0) OR
   ('IFC4X3_DEV.IFCMEMBERTYPE' IN TYPEOF(SELF\IfcObject.IsTypedBy[1].RelatingType));
 END_ENTITY;

-ENTITY IfcMemberStandardCase
- SUBTYPE OF (IfcMember);
- WHERE
-   HasMaterialProfileSetUsage : SIZEOF (QUERY(temp <* USEDIN(SELF, 'IFC4X3_DEV.IFCRELASSOCIATES.RELATEDOBJECTS') |
-              ('IFC4X3_DEV.IFCRELASSOCIATESMATERIAL' IN TYPEOF(temp)) AND
-              ('IFC4X3_DEV.IFCMATERIALPROFILESETUSAGE' IN TYPEOF(temp.RelatingMaterial))
-              )) = 1;
-END_ENTITY;
-
 ENTITY IfcMemberType
  SUBTYPE OF (IfcBuiltElementType);
    PredefinedType : IfcMemberTypeEnum;
  WHERE
    CorrectPredefinedType : (PredefinedType <> IfcMemberTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcMemberTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcElementType.ElementType));
 END_ENTITY;

 ENTITY IfcMetric
  SUBTYPE OF (IfcConstraint);
@@ -8248,36 +8209,30 @@
    CorrectProfileType : SELF\IfcProfileDef.ProfileType = IfcProfileTypeEnum.CURVE;
    CorrespondingSlopeWidths : SIZEOF(Slopes) = SIZEOF(Widths);
    CorrespondingTags : (NOT EXISTS (Tags)) OR (SIZEOF(Tags) = (SIZEOF(Slopes) + 1));
 END_ENTITY;

 ENTITY IfcOpenShell
  SUBTYPE OF (IfcConnectedFaceSet);
 END_ENTITY;

 ENTITY IfcOpeningElement
- SUPERTYPE OF (ONEOF
-   (IfcOpeningStandardCase))
  SUBTYPE OF (IfcFeatureElementSubtraction);
    PredefinedType : OPTIONAL IfcOpeningElementTypeEnum;
  INVERSE
    HasFillings : SET [0:?] OF IfcRelFillsElement FOR RelatingOpeningElement;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcOpeningElementTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcOpeningElementTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
 END_ENTITY;

-ENTITY IfcOpeningStandardCase
- SUBTYPE OF (IfcOpeningElement);
-END_ENTITY;
-
 ENTITY IfcOrganization;
    Identification : OPTIONAL IfcIdentifier;
    Name : IfcLabel;
    Description : OPTIONAL IfcText;
    Roles : OPTIONAL LIST [1:?] OF IfcActorRole;
    Addresses : OPTIONAL LIST [1:?] OF IfcAddress;
  INVERSE
    IsRelatedBy : SET [0:?] OF IfcOrganizationRelationship FOR RelatedOrganizations;
    Relates : SET [0:?] OF IfcOrganizationRelationship FOR RelatingOrganization;
    Engages : SET [0:?] OF IfcPersonAndOrganization FOR TheOrganization;
@@ -8567,41 +8522,30 @@
  SUBTYPE OF (IfcGeometricRepresentationItem);
    SizeInX : IfcLengthMeasure;
    SizeInY : IfcLengthMeasure;
 END_ENTITY;

 ENTITY IfcPlane
  SUBTYPE OF (IfcElementarySurface);
 END_ENTITY;

 ENTITY IfcPlate
- SUPERTYPE OF (ONEOF
-   (IfcPlateStandardCase))
  SUBTYPE OF (IfcBuiltElement);
    PredefinedType : OPTIONAL IfcPlateTypeEnum;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcPlateTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcPlateTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
    CorrectTypeAssigned : (SIZEOF(IsTypedBy) = 0) OR
   ('IFC4X3_DEV.IFCPLATETYPE' IN TYPEOF(SELF\IfcObject.IsTypedBy[1].RelatingType));
 END_ENTITY;

-ENTITY IfcPlateStandardCase
- SUBTYPE OF (IfcPlate);
- WHERE
-   HasMaterialLayerSetUsage : SIZEOF (QUERY(temp <* USEDIN(SELF, 'IFC4X3_DEV.IFCRELASSOCIATES.RELATEDOBJECTS') |
-              ('IFC4X3_DEV.IFCRELASSOCIATESMATERIAL' IN TYPEOF(temp)) AND
-              ('IFC4X3_DEV.IFCMATERIALLAYERSETUSAGE' IN TYPEOF(temp.RelatingMaterial))
-              )) = 1;
-END_ENTITY;
-
 ENTITY IfcPlateType
  SUBTYPE OF (IfcBuiltElementType);
    PredefinedType : IfcPlateTypeEnum;
  WHERE
    CorrectPredefinedType : (PredefinedType <> IfcPlateTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcPlateTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcElementType.ElementType));
 END_ENTITY;

 ENTITY IfcPoint
  ABSTRACT SUPERTYPE OF (ONEOF
@@ -10481,48 +10425,30 @@

 ENTITY IfcSite
  SUBTYPE OF (IfcSpatialStructureElement);
    RefLatitude : OPTIONAL IfcCompoundPlaneAngleMeasure;
    RefLongitude : OPTIONAL IfcCompoundPlaneAngleMeasure;
    RefElevation : OPTIONAL IfcLengthMeasure;
    LandTitleNumber : OPTIONAL IfcLabel;
 END_ENTITY;

 ENTITY IfcSlab
- SUPERTYPE OF (ONEOF
-   (IfcSlabElementedCase
-   ,IfcSlabStandardCase))
  SUBTYPE OF (IfcBuiltElement);
    PredefinedType : OPTIONAL IfcSlabTypeEnum;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcSlabTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcSlabTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
    CorrectTypeAssigned : (SIZEOF(IsTypedBy) = 0) OR
   ('IFC4X3_DEV.IFCSLABTYPE' IN TYPEOF(SELF\IfcObject.IsTypedBy[1].RelatingType));
 END_ENTITY;

-ENTITY IfcSlabElementedCase
- SUBTYPE OF (IfcSlab);
- WHERE
-   HasDecomposition : HIINDEX(SELF\IfcObjectDefinition.IsDecomposedBy) > 0;
-END_ENTITY;
-
-ENTITY IfcSlabStandardCase
- SUBTYPE OF (IfcSlab);
- WHERE
-   HasMaterialLayerSetusage : SIZEOF (QUERY(temp <* USEDIN(SELF, 'IFC4X3_DEV.IFCRELASSOCIATES.RELATEDOBJECTS') |
-              ('IFC4X3_DEV.IFCRELASSOCIATESMATERIAL' IN TYPEOF(temp)) AND
-              ('IFC4X3_DEV.IFCMATERIALLAYERSETUSAGE' IN TYPEOF(temp.RelatingMaterial))
-              )) = 1;
-END_ENTITY;
-
 ENTITY IfcSlabType
  SUBTYPE OF (IfcBuiltElementType);
    PredefinedType : IfcSlabTypeEnum;
  WHERE
    CorrectPredefinedType : (PredefinedType <> IfcSlabTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcSlabTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcElementType.ElementType));
 END_ENTITY;

 ENTITY IfcSlippageConnectionCondition
  SUBTYPE OF (IfcStructuralConnectionCondition);
@@ -12109,38 +12035,31 @@
    PredefinedType : OPTIONAL IfcVoidingFeatureTypeEnum;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcVoidingFeatureTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcVoidingFeatureTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
    HasObjectType : NOT EXISTS(PredefinedType) OR (PredefinedType <> IfcVoidingFeatureTypeEnum.USERDEFINED) OR EXISTS(SELF\IfcObject.ObjectType);
 END_ENTITY;

 ENTITY IfcWall
  SUPERTYPE OF (ONEOF
-   (IfcWallElementedCase
-   ,IfcWallStandardCase))
+   (IfcWallStandardCase))
  SUBTYPE OF (IfcBuiltElement);
    PredefinedType : OPTIONAL IfcWallTypeEnum;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcWallTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcWallTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
    CorrectTypeAssigned : (SIZEOF(IsTypedBy) = 0) OR
   ('IFC4X3_DEV.IFCWALLTYPE' IN TYPEOF(SELF\IfcObject.IsTypedBy[1].RelatingType));
 END_ENTITY;

-ENTITY IfcWallElementedCase
- SUBTYPE OF (IfcWall);
- WHERE
-   HasDecomposition : HIINDEX(SELF\IfcObjectDefinition.IsDecomposedBy) > 0;
-END_ENTITY;
-
 ENTITY IfcWallStandardCase
  SUBTYPE OF (IfcWall);
  WHERE
    HasMaterialLayerSetUsage : SIZEOF (QUERY(temp <* USEDIN(SELF, 'IFC4X3_DEV.IFCRELASSOCIATES.RELATEDOBJECTS') |
               ('IFC4X3_DEV.IFCRELASSOCIATESMATERIAL' IN TYPEOF(temp)) AND
               ('IFC4X3_DEV.IFCMATERIALLAYERSETUSAGE' IN TYPEOF(temp.RelatingMaterial))
               )) = 1;
 END_ENTITY;

 ENTITY IfcWallType
@@ -12168,22 +12087,20 @@
  WHERE
    CorrectPredefinedType : (PredefinedType <> IfcWasteTerminalTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcWasteTerminalTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcElementType.ElementType));
 END_ENTITY;

 ENTITY IfcWaterStratum
  SUBTYPE OF (IfcGeotechnicalStratum);
 END_ENTITY;

 ENTITY IfcWindow
- SUPERTYPE OF (ONEOF
-   (IfcWindowStandardCase))
  SUBTYPE OF (IfcBuiltElement);
    OverallHeight : OPTIONAL IfcPositiveLengthMeasure;
    OverallWidth : OPTIONAL IfcPositiveLengthMeasure;
    PredefinedType : OPTIONAL IfcWindowTypeEnum;
    PartitioningType : OPTIONAL IfcWindowTypePartitioningEnum;
    UserDefinedPartitioningType : OPTIONAL IfcLabel;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcWindowTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcWindowTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
@@ -12228,24 +12145,20 @@
  WHERE
    ApplicableToType : (EXISTS(SELF\IfcPropertySetDefinition.DefinesType[1])) 
 AND 
 (
  ('IFC4X3_DEV.IFCWINDOWTYPE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
   OR
  ('IFC4X3_DEV.IFCWINDOWSTYLE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
 );
 END_ENTITY;

-ENTITY IfcWindowStandardCase
- SUBTYPE OF (IfcWindow);
-END_ENTITY;
-
 ENTITY IfcWindowType
  SUBTYPE OF (IfcBuiltElementType);
    PredefinedType : IfcWindowTypeEnum;
    PartitioningType : IfcWindowTypePartitioningEnum;
    ParameterTakesPrecedence : OPTIONAL IfcBoolean;
    UserDefinedPartitioningType : OPTIONAL IfcLabel;
  WHERE
    CorrectPredefinedType : (PredefinedType <> IfcWindowTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcWindowTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcElementType.ElementType));
 END_ENTITY;