Merge pull request #21 from andyward/fix/SchemaInfoParents

Fix for #20. Remove all subclasses when getting attributes.
buildingSMART · Nov 21, 2023 · 358507e · 358507e
2 parents 11376da + e6a6eb6
commit 358507e
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 56 deletions.
diff --git a/ids-lib.codegen/IfcSchema_AttributesGenerator.cs b/ids-lib.codegen/IfcSchema_AttributesGenerator.cs
@@ -44,20 +44,26 @@ static public string Execute()
             {
                 var attribute = $"\"{pair.Key}\"";
                 // trying to remove all subclasses
-                var OnlyTopClasses = pair.Value.ToList();
-                for (int i = 0; i < OnlyTopClasses.Count; i++)
+                var toRemove = new HashSet<string>();
+                var onlyTopClasses = pair.Value.ToList();
+                for (int i = 0; i < onlyTopClasses.Count; i++)
                 {
-                    var thisClassName = OnlyTopClasses[i];
+                    var thisClassName = onlyTopClasses[i];
                     var thisClass = metaD.ExpressType(thisClassName.ToUpperInvariant());
 
                     foreach (var sub in thisClass.AllSubTypes)
                     {
-                        OnlyTopClasses.Remove(sub.ExpressNameUpper);
+                        if(!toRemove.Contains(sub.ExpressNameUpper))
+                        {
+                            toRemove.Add(sub.ExpressNameUpper);
+                        }
                     }
                 }
 
                 var classesInQuotes = pair.Value.Select(x => $"\"{x}\"").ToArray();
-                var topClassesInQuotes = OnlyTopClasses.Select(x => $"\"{x}\"").ToArray();
+                var topClassesInQuotes = onlyTopClasses
+                    .Where(c=> !toRemove.Contains(c))
+                        .Select(x => $"\"{x}\"").ToArray();
                 var line = $"\t\t\tdestinationSchema.AddAttribute({attribute}, new[] {{ {string.Join(", ", topClassesInQuotes)} }}, new[] {{ {string.Join(", ", classesInQuotes)} }});";
 
                 sb.AppendLine(line);

diff --git a/ids-lib/IfcSchema/SchemaInfo.Attributes.g.cs b/ids-lib/IfcSchema/SchemaInfo.Attributes.g.cs
diff --git a/ids-lib/LibraryInformation.cs b/ids-lib/LibraryInformation.cs
@@ -32,6 +32,6 @@ public static class LibraryInformation
 		/// <summary>
 		/// Static field with hardcoded DLL version number. 
 		/// </summary>
-		public static string AssemblyVersion => "1.0.55";
+		public static string AssemblyVersion => "1.0.56";
 	}
 }
diff --git a/ids-lib/ids-lib.csproj b/ids-lib/ids-lib.csproj
@@ -20,7 +20,7 @@
 		<PackageReleaseNotes>First implementation.</PackageReleaseNotes>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<!-- Github actions are setup so that when this version is bumped the nuget package is uploaded -->
-		<AssemblyVersion>1.0.55</AssemblyVersion>
+		<AssemblyVersion>1.0.56</AssemblyVersion>
 		<FileVersion>$(AssemblyVersion)</FileVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/ids-tool.tests/IfcSchemaTests.cs b/ids-tool.tests/IfcSchemaTests.cs
@@ -157,6 +157,19 @@ public void CanGetTopLevelClassesByAttribute()
 
     }
 
+    [Fact]
+    public void OnlyTopLevelClassesShouldRemoveAllSubClasses()
+    {
+        // Issue #20
+
+        var topLevelClasses = SchemaInfo.SchemaIfc4.GetAttributeClasses("ObjectType", onlyTopClasses: true);
+
+        topLevelClasses.Should().Contain("IFCOBJECT");
+
+        topLevelClasses.Should().NotContain("IFCPRODUCT");
+
+    }
+
 
 
 }
diff --git a/ids-tool/ids-tool.csproj b/ids-tool/ids-tool.csproj
@@ -16,7 +16,7 @@
 		<PackageIcon>icon.png</PackageIcon>
 		<PackageTags>IDS, buildingSmart</PackageTags>
 		<!-- Github actions are setup so that when this version is bumped the nuget package is uploaded -->
-		<AssemblyVersion>1.0.55</AssemblyVersion>
+		<AssemblyVersion>1.0.56</AssemblyVersion>
 		<FileVersion>$(AssemblyVersion)</FileVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<RepositoryUrl>https://github.com/buildingSMART/IDS-Audit-tool.git</RepositoryUrl>