short and code designation methods, clean interfaces

MagmaWorks · Dec 4, 2024 · 4f8c0b9 · 4f8c0b9
1 parent 123dadb
commit 4f8c0b9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/Materials/IMaterials/StandardMaterials/En/IEnSteelMaterial.cs b/Materials/IMaterials/StandardMaterials/En/IEnSteelMaterial.cs
@@ -21,7 +21,5 @@ public interface IEnSteelMaterial : IEnMaterial
         /// γM2 partial factor for resistance of cross-sections in tension to fracture
         /// </summary>
         Ratio TensionFracturePartialFactor { get; }
-
-        string GetDesignation();
     }
 }
diff --git a/Materials/IMaterials/StandardMaterials/En/IEnSteelSpecification.cs b/Materials/IMaterials/StandardMaterials/En/IEnSteelSpecification.cs
@@ -12,7 +12,5 @@ public interface IEnSteelSpecification : ITaxonomySerializable
         EnSteelImpactTemperatureProperty ImpactTemperatureProperty { get; set; }
         EnSteelQuality Quality { get; set; }
         bool HollowSection { get; set; }
-
-        string GetDesignation(EnSteelGrade grade);
     }
 }
diff --git a/Materials/MaterialTests/StandardMaterials/En/EnSteelSpecificationTests.cs b/Materials/MaterialTests/StandardMaterials/En/EnSteelSpecificationTests.cs
@@ -207,7 +207,7 @@ public void GetSpecificationDesignationTests(string steelDesignation, string exp
             Assert.True(EnSteelMaterial.TryCreateFromDesignition(steelDesignation, nationalAnnex, out EnSteelMaterial material));
 
             // Assert
-            Assert.Equal(expected, material.GetDesignation());
+            Assert.Equal(expected, material.GetCodeDesignation());
         }
 
         [Fact]

diff --git a/Materials/Materials/StandardMaterials/En/EnSteelMaterial.cs b/Materials/Materials/StandardMaterials/En/EnSteelMaterial.cs
@@ -103,9 +103,14 @@ public static bool TryCreateFromDesignition(string designition, NationalAnnex na
             }
         }
 
-        public string GetDesignation()
+        public string GetShortDesignation()
         {
-            return Specification.GetDesignation(Grade);
+            return ((EnSteelSpecification)Specification).GetShortDesignation(Grade);
+        }
+
+        public string GetCodeDesignation()
+        {
+            return ((EnSteelSpecification)Specification).GetCodeDesignation(Grade);
         }
 
         private void SetPartialFactors(NationalAnnex nationalAnnex)

diff --git a/Materials/Materials/StandardMaterials/En/EnSteelSpecification.cs b/Materials/Materials/StandardMaterials/En/EnSteelSpecification.cs
@@ -13,7 +13,7 @@ public class EnSteelSpecification : IEnSteelSpecification
 
         internal EnSteelSpecification() { }
 
-        public void Validate(EnSteelGrade grade)
+        internal void Validate(EnSteelGrade grade)
         {
             if (CorrosionResistance != EnSteelCorrosionResistance.None)
             {
@@ -147,7 +147,7 @@ public void Validate(EnSteelGrade grade)
             }
         }
 
-        public string GetDesignation(EnSteelGrade grade)
+        internal string GetShortDesignation(EnSteelGrade grade)
         {
             Validate(grade);
             string j0 = Quality.ToString();
@@ -169,25 +169,35 @@ public string GetDesignation(EnSteelGrade grade)
                     description = (j0 + w + n + l + h).Replace("None", string.Empty);
                 }
 
-                return $"Steel EN 10025-5 - {grade}{description}";
+            }
+
+            return $"{grade}{description}";
+        }
+
+        internal string GetCodeDesignation(EnSteelGrade grade)
+        {
+            string designation = GetShortDesignation(grade);
+            if (CorrosionResistance != EnSteelCorrosionResistance.None)
+            {
+                return $"Steel EN 10025-5 - {designation}";
             }
 
             switch (DeliveryCondition)
             {
                 case EnSteelDeliveryCondition.AR:
-                    return $"Steel EN 10025-2 - {grade}{description}";
+                    return $"Steel EN 10025-2 - {designation}";
 
                 case EnSteelDeliveryCondition.N:
-                    return $"Steel EN 10025-3 - {grade}{description}";
+                    return $"Steel EN 10025-3 - {designation}";
 
                 case EnSteelDeliveryCondition.M:
-                    return $"Steel EN 10025-4 - {grade}{description}";
+                    return $"Steel EN 10025-4 - {designation}";
 
                 case EnSteelDeliveryCondition.Q:
-                    return $"Steel EN 10025-6 - {grade}{description}";
+                    return $"Steel EN 10025-6 - {designation}";
 
                 default:
-                    return $"Steel EN 10025 - {grade}{description}";
+                    return $"Steel EN 10025 - {designation}";
             }
         }
     }