Merge branch 'development' into preview

Author: civilx64

features/environment.py

@@ -52,6 +52,40 @@ def set_logger(context):
 
     return logger
 
+
+
+def _read_proc_kb(field, path='/proc/self/status'):
+    """Read a '<field>: <n> kB' line from /proc. Returns None when unavailable."""
+    try:
+        with open(path) as f:
+            for line in f:
+                if line.startswith(field + ':'):
+                    return int(line.split()[1])
+    except (OSError, ValueError, IndexError):
+        pass
+    return None
+
+
+def _reset_peak_rss():
+    """Reset the kernel peak-memory counter (VmHWM) to the current RSS. Linux-only."""
+    try:
+        with open('/proc/self/clear_refs', 'w') as f:
+            f.write('5')
+        return True
+    except OSError:
+        return False
+
+
+def _feature_mem_txt(context):
+    """Peak memory for this feature: the high-water mark since before_feature,
+    and how much that is above the memory at feature start. Empty if /proc is unusable."""
+    peak_kb = _read_proc_kb('VmHWM')
+    start_kb = getattr(context, 'feature_rss_start_kb', None)
+    if peak_kb and start_kb and getattr(context, 'feature_peak_reset', False):
+        delta_mb = (peak_kb - start_kb) / 1024
+        return f" Peak RSS: {peak_kb/1024:.0f} MB (delta {delta_mb:+.0f} MB)."
+    return ""
+
 def before_feature(context, feature):
     #@todo incorporate into gherkin error handling
     # assert protocol.enforce(context, feature), 'failed'
@@ -62,7 +96,12 @@ def before_feature(context, feature):
     except KeyError: # run via console, task_id not provided
         context.validation_task_id = None
     Scenario.continue_after_failed_step = False
-    
+
+    # note current RSS and reset the kernel peak counter so that VmHWM in
+    # after_feature reflects the peak of *this* feature only.
+    context.feature_rss_start_kb = _read_proc_kb('VmRSS')
+    context.feature_peak_reset = _reset_peak_rss()
+
     execution_mode = context.config.userdata.get('execution_mode')
     if execution_mode and execution_mode == 'ExecutionMode.PRODUCTION':
         context.feature_start_time = time.process_time()
@@ -177,7 +216,7 @@ def reduce_db_outcomes(feature_outcomes):
         end_time = time.process_time()
         elapsed_time = end_time - context.feature_start_time
         logger = set_logger(context)
-        logger.info(f"Feature '{feature.name}' completed. Elapsed process time: {elapsed_time:.2f} seconds.")
+        logger.info(f"Feature '{feature.name}' completed. Elapsed process time: {elapsed_time:.2f} seconds.{_feature_mem_txt(context)}")
 
     else: # invoked via console or CI/CD pipeline
         outcomes = [outcome.to_dict() for outcome in context.gherkin_outcomes]

features/rules/IFC/IFC430_Entities-in-scope-for-IFC-4X3-ReferenceView-MVD.feature

@@ -1,5 +1,5 @@
 @IFC
-@version1
+@version2
 @industry-practice
 Feature: IFC430 - Entities in scope for IFC 4X3 ReferenceView MVD
 
@@ -131,6 +131,7 @@ do not export any entities that are outside the scope of this MVD.
       | IfcLinearPlacement                           |
       | IfcLoop                                      |
       | IfcLShapeProfileDef                          |
+      | IfcMapConversionScaled
       | IfcMaterialClassificationRelationship        |
       | IfcMaterialDefinitionRepresentation          |
       | IfcMaterialLayerSetUsage                     |

features/rules/IFC/IFC431_Entities-in-scope-for-IFC-4X3-Alignment-basedView-MVD.feature

@@ -1,5 +1,5 @@
 @IFC
-@version1
+@version2
 @industry-practice
 Feature: IFC431 - Entities in scope for IFC 4X3 Alignment-basedView MVD
 
@@ -126,6 +126,7 @@ do not export any entities that are outside the scope of this MVD.
       | IfcMaterialProfileWithOffsets                |
       | IfcMaterialRelationship                      |
       | IfcMaterialUsageDefinition                   |
+      | IfcMapConversionScaled
       | IfcMetric                                    |
       | IfcMirroredProfileDef                        |
       | IfcObjective                                 |

features/rules/TAS/TAS000_Tessellated-Geometry.feature

@@ -0,0 +1,18 @@
+@implementer-agreement
+@TAS
+@version1
+Feature: TAS000 - Tessellated Geometry
+The rule verifies the presence of IFC entities used to define tessellated geometry (i.e. meshes) used as shape representations.
+
+
+Background: 
+
+    Given A model with Schema 'IFC4' or 'IFC4.3'
+
+
+    Scenario: Shape representation via Tessellated Item
+
+        Given An .IfcTessellatedItem.
+
+        Then The IFC model contains information on the selected functional part
+

ifc_validation_models

@@ -0,0 +1,58 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [ReferenceView]'),'2;1');
+FILE_NAME('na-tas000-no_tessellated_items.ifc','2024-06-12T09:50:55',(''),(''),'redacted','redacted - redacted - 3.14159','');
+FILE_SCHEMA(('IFC4X3_ADD2'));
+ENDSEC;
+DATA;
+
+/* PROJECT CONTEXT  */
+#1= IFCPROJECT('2eS$fZmw9QmetNIywDEzSR',#2,'redacted',$,$,$,$,(#10),#120);
+#2= IFCOWNERHISTORY(#3,#6,$,.NOCHANGE.,$,$,$,152828);
+#3= IFCPERSONANDORGANIZATION(#4,#5,$);
+#4= IFCPERSON($,'','redacted',$,$,$,$,$);
+#5= IFCORGANIZATION($,'redacted',$,$,$);
+#6= IFCAPPLICATION(#5,'redacted','redacted','redacted');
+
+#10= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.0E-05,#11,$);
+#11= IFCAXIS2PLACEMENT3D(#12,$,$);
+#12= IFCCARTESIANPOINT((0.,0.,0.));
+
+
+#20=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Axis','Model',*,*,*,*,#10,$,.MODEL_VIEW.,$);
+
+/* SITES AGGREGATED TO PROJECT */
+#29=IFCRELAGGREGATES('2te7nJfPvJyvPEahDDrZW0',#2,'ProjectContainer',$,#1,(#29990));
+#31=IFCLOCALPLACEMENT($,#11);
+
+#101= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#102= IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#103= IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#104= IFCSIUNIT(*,.MASSUNIT.,.KILO.,.GRAM.);
+#105= IFCSIUNIT(*,.TIMEUNIT.,$,.SECOND.);
+#106= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#107= IFCSIUNIT(*,.SOLIDANGLEUNIT.,$,.STERADIAN.);
+#108= IFCSIUNIT(*,.POWERUNIT.,$,.WATT.);
+#109= IFCSIUNIT(*,.THERMODYNAMICTEMPERATUREUNIT.,$,.KELVIN.);
+
+#120= IFCUNITASSIGNMENT((#101,#102,#103,#104,#105,#106,#107,#108,#109));
+
+
+#2658= IFCBUILDING('1q4MsgfUf4Metm2lRt$BR5',#2,'','',$,#31,$,$,.ELEMENT.,$,$,$);
+#2659= IFCRELAGGREGATES('2te7nJfPvHzxPEahDDrZW0',#2,'BuildingToSite',$,#29990,(#2658));
+
+#2660= IFCBUILDINGSTOREY('0xuqbikJfFxhmSCs$dJm45',#2,'','',$,#31,$,$,.ELEMENT.,0.);
+#2661= IFCRELAGGREGATES('2te8MJfPvJyvPEahDDrZW0',#2,'StoreyToBuilding',$,#2658,(#2660));
+
+
+#2698= IFCSLAB('3t_W_rZgvCfQ$zs2L2Bu$9',#2,'None',$,$,$,$,$,$);
+#2699= IFCPROPERTYBOUNDEDVALUE('TemperatureSetPoint',$,IFCTHERMODYNAMICTEMPERATUREMEASURE(100.),IFCTHERMODYNAMICTEMPERATUREMEASURE(0.),$,IFCTHERMODYNAMICTEMPERATUREMEASURE(50.));
+#2700= IFCPROPERTYSET('3DbfSRjZfDAPy34OG_JZ9j',$,'Properties',$,(#2699));
+#2701= IFCRELDEFINESBYPROPERTIES('2Bjmd6iZnFueQWNGcZluMM',#2,'Object to Properties','Object to Properties Relation',(#2698),#2700);
+
+#2812= IFCRELCONTAINEDINSPATIALSTRUCTURE('1ejyelJ$TEWPzK6IRogGcX', #2, '', 'Slab to Storey', (#2698), #2660);
+
+
+#29990=IFCSITE('14oxcl5LHMZQ6iCWJKpe5w',#2,'SITE_withCorrectGuid',$,$,#31,$,$,.COMPLEX.,$,$,$,$,$);
+ENDSEC;
+END-ISO-10303-21;

test/files/TAS/tas000/na-tas000-no_tesselated_items.ifc

@@ -0,0 +1,51 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [ReferenceView_V1.2]'),'2;1');
+FILE_NAME('pass-tas00--PolygonalFaceSet_rect.ifc','2024-10-08T20:16:01',(''),(''),'','redacted - redacted - 3.14159','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'0.7.11-d51fa2c5f','redacted','');
+#5=IFCOWNERHISTORY(#3,#4,$,.NOTDEFINED.,$,#3,#4,1728418561);
+#6=IFCDIRECTION((1.,0.,0.));
+#7=IFCDIRECTION((0.,0.,1.));
+#8=IFCCARTESIANPOINT((0.,0.,0.));
+#9=IFCAXIS2PLACEMENT3D(#8,#7,#6);
+#10=IFCDIRECTION((0.,1.));
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#9,#10);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#14=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#15=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#16=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#17=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453292519943295),#16);
+#19=IFCUNITASSIGNMENT((#13,#14,#15,#16));
+#20=IFCPROJECT('0c1kJn_Qb6lxCutc7bMdzD',#5,'',$,$,$,$,(#11),#19);
+#21=IFCSITE('0U$cKviQP13wtOZUMKDIyS',$,'MySite','{ProxySite}',$,$,$,$,.ELEMENT.,$,$,$,'1234',$);
+#22=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#11,0.01,.MODEL_VIEW.,$);
+#23=IFCCARTESIANPOINT((0.,0.,0.));
+#24=IFCAXIS2PLACEMENT3D(#23,$,$);
+#25=IFCLOCALPLACEMENT($,#24);
+#26=IFCBUILDING('0irtZ8nxzFvRcKTOGXgg4g',$,'MyBuilding','ProxyHolder',$,#25,$,$,$,$,$,$);
+#27=IFCRELAGGREGATES('2xKsyZHRjC3fxCBLloBBfc',$,$,$,#21,(#26));
+#28=IFCRELAGGREGATES('2T4mGks3r8LgFvcmA7ZUL2',$,$,$,#20,(#21));
+#29=IFCINDEXEDPOLYGONALFACE((2,1,5,6));
+#30=IFCINDEXEDPOLYGONALFACE((3,2,6,7));
+#31=IFCINDEXEDPOLYGONALFACE((4,3,7,8));
+#32=IFCINDEXEDPOLYGONALFACE((1,4,8,5));
+#33=IFCINDEXEDPOLYGONALFACE((4,3,2,1));
+#34=IFCINDEXEDPOLYGONALFACE((5,6,7,8));
+#35=IFCCARTESIANPOINTLIST3D(((0.,0.,0.),(1.,0.,0.),(1.,1.,0.),(0.,1.,0.),(0.,0.,1.),(1.,0.,1.),(1.,1.,1.),(0.,1.,1.)));
+#36=IFCPOLYGONALFACESET(#35,.F.,(#29,#30,#31,#32,#33,#34),$);
+#37=IFCSHAPEREPRESENTATION(#11,'Body','Tessellation',(#36));
+#38=IFCPRODUCTDEFINITIONSHAPE($,$,(#37));
+#39=IFCCARTESIANPOINT((0.,0.,0.));
+#40=IFCAXIS2PLACEMENT3D(#39,$,$);
+#41=IFCLOCALPLACEMENT($,#40);
+#42=IFCBUILDINGELEMENTPROXY('0A1CD3BUf5vfG_FwB3FzLd',$,'Proxy',$,$,#41,#38,$,$);
+#43=IFCRELCONTAINEDINSPATIALSTRUCTURE('0hoRQKeHr6FgZfPsvI5prc',$,'Building','Building Container For Elements',(#42),#26);
+ENDSEC;
+END-ISO-10303-21;