🐛 add missing range check for punching parameters

#1077
strusoft · Aug 26, 2024 · a46b1e2 · a46b1e2
1 parent 5dd9516
commit a46b1e2
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/FemDesign.Core/GenericClasses/RestrictedDouble.cs b/FemDesign.Core/GenericClasses/RestrictedDouble.cs
@@ -126,6 +126,22 @@ internal static double NonNegMax_10(double val)
         {
             return RestrictedDouble.ValueInClosedInterval(val, 0, 10);
         }
+
+        /// <summary>
+        /// non_zero_max_10_1
+        /// </summary>
+        internal static double NonZeroMax_10_1(double val)
+        {
+            return RestrictedDouble.ValueInClosedInterval(val, 0.02, 10);
+        }
+
+        /// <summary>
+        /// non_zero_max_10_1
+        /// </summary>
+        internal static double NonZeroMax_10_2(double val)
+        {
+            return RestrictedDouble.ValueInClosedInterval(val, 0.03, 10);
+        }
 
         /// <summary>
         /// non_neg_max_10

diff --git a/FemDesign.Core/Reinforcement/PunchingReinforcement.cs b/FemDesign.Core/Reinforcement/PunchingReinforcement.cs
@@ -133,13 +133,34 @@ public partial class StudRails
         public string Patter { get; set; }
 
         [XmlAttribute("s0")]
-        public double S0 { get; set; }
+        public double _s0 { get; set; }
+
+        [XmlIgnore]
+        public double S0 
+        {
+            get => _s0;
+            set => _s0 = RestrictedDouble.NonZeroMax_10_1(value);
+        }
 
         [XmlAttribute("s1")]
-        public double S1 { get; set; }
+        public double _s1 { get; set; }
+
+        [XmlIgnore]
+        public double S1
+        {
+            get => _s1;
+            set => _s1 = RestrictedDouble.NonZeroMax_10_2(value);
+        }
 
         [XmlAttribute("s2")]
-        public double S2 { get; set; }
+        public double _s2 { get; set; }
+
+        [XmlIgnore]
+        public double S2
+        {
+            get => _s2;
+            set => _s2 = RestrictedDouble.NonZeroMax_10_2(value);
+        }
 
         [XmlAttribute("rails_on_circle")]
         public string _railsOnCircle;