Change inclined section viewer

StructureHelperLogics/Models/BeamShears/Logics/BeamShearSectionLogic.cs

@@ -12,7 +12,7 @@ namespace StructureHelperLogics.Models.BeamShears
     {
         private BeamShearSectionLogicResult result;
         private ISectionEffectiveness sectionEffectiveness;
-        private ConcreteStrengthLogic concreteLogic;
+        private ConcreteShearStrengthLogic concreteLogic;
         private StirrupStrengthLogic stirrupLogic;
         private IGetLongitudinalForceFactorLogic getLongitudinalForceFactorLogic;
         private string sectionMessage;
@@ -92,8 +92,8 @@ namespace StructureHelperLogics.Models.BeamShears
             SetLongitudinalForce();
             double factorOfLongitudinalForce = getLongitudinalForceFactorLogic.GetFactor();
             localTraceLogger?.AddMessage($"Factor of  longitudinal force = {factorOfLongitudinalForce}, (dimensionless)");
-            concreteStrength = concreteLogic.GetShearStrength();
-            stirrupStrength = stirrupLogic.GetShearStrength();
+            concreteStrength = concreteLogic.CalculateShearStrength();
+            stirrupStrength = stirrupLogic.CalculateShearStrength();
             if (stirrupStrength > concreteStrength)
             {      
                 localTraceLogger?.AddMessage($"Shear reinforcement strength Qsw = {stirrupStrength} is greater than concrete strength for shear Qb = {concreteStrength}, shear reinforcement strength has to be restricted.");
@@ -132,7 +132,7 @@ namespace StructureHelperLogics.Models.BeamShears
                 InputData = result.ResultInputData,
                 SectionEffectiveness = sectionEffectiveness
             };
-            double stirrupStrength = logic.GetShearStrength();
+            double stirrupStrength = logic.CalculateShearStrength();
             localTraceLogger?.AddMessage($"Stirrup strength was restricted as Qsw,restricted = {stirrupStrength}(N)");
             result.ResultInputData.InclinedCrack = logic.InclinedCrack;
             return stirrupStrength;

StructureHelperLogics/Models/BeamShears/Logics/ConcreteStrengthLogic.cs

@@ -1,79 +0,0 @@
-using StructureHelperCommon.Models;
-using StructureHelperCommon.Models.Loggers;
-using StructureHelperLogics.Models.BeamShears.Logics;
-
-namespace StructureHelperLogics.Models.BeamShears
-{
-    public class ConcreteStrengthLogic : IBeamShearStrenghLogic
-    {
-        private readonly ISectionEffectiveness sectionEffectiveness;
-        private readonly IInclinedSection inclinedSection;
-        
-
-        private double crackLength;
-
-        public ConcreteStrengthLogic(
-            ISectionEffectiveness sectionEffectiveness,
-            IInclinedSection inclinedSection,
-            IShiftTraceLogger? traceLogger)
-        {
-            this.sectionEffectiveness = sectionEffectiveness;
-            this.inclinedSection = inclinedSection;
-            TraceLogger = traceLogger;
-        }
-
-        public IShiftTraceLogger? TraceLogger { get; set; }
-
-        public double GetShearStrength()
-        {
-            TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
-            InitializeStrategies();
-            TraceLogger?.AddMessage($"Base shape factor = {sectionEffectiveness.BaseShapeFactor}, (dimensionless)");
-            TraceLogger?.AddMessage($"Section shape factor = {sectionEffectiveness.ShapeFactor}, (dimensionless)");
-            TraceLogger?.AddMessage($"Effective depth = {inclinedSection.EffectiveDepth}, (m)");
-            crackLength = inclinedSection.EndCoord - inclinedSection.StartCoord;
-            TraceLogger?.AddMessage($"Absolute crack length c = {inclinedSection.EndCoord} - {inclinedSection.StartCoord} = {crackLength}, (m)");
-            TraceLogger?.AddMessage($"Relative crack length c/d = {crackLength} / {inclinedSection.EffectiveDepth} = {crackLength/ inclinedSection.EffectiveDepth},(dimensionless)");
-            RestrictCrackLength();
-
-
-            double concreteMoment = 
-                sectionEffectiveness.BaseShapeFactor
-                * sectionEffectiveness.ShapeFactor 
-                * inclinedSection.ConcreteTensionStrength 
-                * inclinedSection.WebWidth 
-                * inclinedSection.EffectiveDepth 
-                * inclinedSection.EffectiveDepth;
-            double shearStrength = concreteMoment / crackLength;
-            TraceLogger?.AddMessage($"Shear strength of concrete = {sectionEffectiveness.BaseShapeFactor} * {sectionEffectiveness.ShapeFactor} * {inclinedSection.ConcreteTensionStrength} * {inclinedSection.WebWidth} * {inclinedSection.EffectiveDepth} ^ 2 / {crackLength} = {shearStrength}, (N)");
-            return shearStrength;
-        }
-
-        private void InitializeStrategies()
-        {
-            
-        }
-
-
-
-        private void RestrictCrackLength()
-        {
-            double maxCrackLength = sectionEffectiveness.MaxCrackLengthRatio * inclinedSection.EffectiveDepth;
-            if (crackLength > maxCrackLength)
-            {
-                TraceLogger?.AddMessage($"Crack length c = {crackLength} is greater than maximum crack length = {maxCrackLength}");
-                crackLength = maxCrackLength;
-                TraceLogger?.AddMessage($"Crack length = {crackLength}");
-                return;
-            }
-            double minCrackLength = sectionEffectiveness.MinCrackLengthRatio * inclinedSection.EffectiveDepth;
-            if (crackLength < minCrackLength)
-            {
-                TraceLogger?.AddMessage($"Crack length c = {crackLength} is less than minimum crack length = {minCrackLength}");
-                crackLength = minCrackLength;
-                TraceLogger?.AddMessage($"Crack length = {crackLength}");
-            }
-            return;
-        }
-    }
-}

StructureHelperLogics/Models/BeamShears/Logics/IBeamShearStrengthLogic.cs

@@ -10,12 +10,12 @@ namespace StructureHelperLogics.Models.BeamShears
     /// <summary>
     /// Implement logic for calculation of bearing capacity of inclined section for shear
     /// </summary>
-    public interface IBeamShearStrenghLogic : ILogic
+    public interface IBeamShearStrengthLogic : ILogic
     {
         /// <summary>
         /// Returns Bearing capacity of inclined section for shear
         /// </summary>
         /// <returns>Bearing capacity of inclined section for shear, N</returns>
-        double GetShearStrength();
+        double CalculateShearStrength();
     }
 }

StructureHelperLogics/Models/BeamShears/Logics/StirrupBySearchLogic.cs

@@ -4,9 +4,9 @@ using StructureHelperCommon.Models.Calculators;
 
 namespace StructureHelperLogics.Models.BeamShears
 {
-    internal class StirrupBySearchLogic : IBeamShearStrenghLogic
+    internal class StirrupBySearchLogic : IBeamShearStrengthLogic
     {
-        private ConcreteStrengthLogic concreteLogic;
+        private ConcreteShearStrengthLogic concreteLogic;
         private StirrupStrengthLogic stirrupLogic;
         private IFindParameterCalculator parameterCalculator;
 
@@ -19,14 +19,14 @@ namespace StructureHelperLogics.Models.BeamShears
             TraceLogger = traceLogger;
         }
 
-        public double GetShearStrength()
+        public double CalculateShearStrength()
         {
             double parameter = GetCrackLengthRatio();
             BeamShearSectionLogicInputData newInputData = GetNewInputDataByCrackLengthRatio(parameter);
             InclinedCrack = newInputData.InclinedCrack;
             TraceLogger?.AddMessage($"New value of dangerous inclinated crack has been obtained: start point Xstart = {newInputData.InclinedSection.StartCoord}(m), end point Xend = {newInputData.InclinedSection.EndCoord}(m)");
             stirrupLogic = new(newInputData, TraceLogger);
-            double stirrupStrength = stirrupLogic.GetShearStrength();
+            double stirrupStrength = stirrupLogic.CalculateShearStrength();
             return stirrupStrength;
         }
 
@@ -69,8 +69,8 @@ namespace StructureHelperLogics.Models.BeamShears
             BeamShearSectionLogicInputData newInputData = GetNewInputDataByCrackLengthRatio(crackLengthRatio);
             concreteLogic = new(SectionEffectiveness, newInputData.InclinedCrack, null);
             stirrupLogic = new(newInputData, null);
-            double concreteStrength = concreteLogic.GetShearStrength();
-            double stirrupStrength = stirrupLogic.GetShearStrength();
+            double concreteStrength = concreteLogic.CalculateShearStrength();
+            double stirrupStrength = stirrupLogic.CalculateShearStrength();
             bool predicateResult = stirrupStrength > concreteStrength;
             if (crackLengthRatio == 1 & predicateResult == false)
             {

StructureHelperLogics/Models/BeamShears/Logics/StrengthLogics/ConcreteShearStrengthLogic.cs

@@ -0,0 +1,74 @@
+using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Models;
+using StructureHelperCommon.Models.Loggers;
+using StructureHelperCommon.Services.Units;
+using StructureHelperLogics.Models.BeamShears.Logics;
+
+namespace StructureHelperLogics.Models.BeamShears
+{
+    public class ConcreteShearStrengthLogic : IBeamShearStrengthLogic
+    {
+        private readonly ISectionEffectiveness sectionEffectiveness;
+        private readonly IInclinedSection inclinedSection;
+
+        public IShiftTraceLogger? TraceLogger { get; set; }
+
+        public ConcreteShearStrengthLogic(
+            ISectionEffectiveness sectionEffectiveness,
+            IInclinedSection inclinedSection,
+            IShiftTraceLogger? traceLogger = null)
+        {
+            this.sectionEffectiveness = sectionEffectiveness ?? throw new StructureHelperException("Section effectiveness cannot be null.");
+            this.inclinedSection = inclinedSection ?? throw new StructureHelperException("Inclined section cannot be null.");
+            TraceLogger = traceLogger;
+        }
+
+        public double CalculateShearStrength()
+        {
+            TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
+            ValidateInput();
+
+            double rawCrackLength = inclinedSection.EndCoord - inclinedSection.StartCoord;
+            double crackLength = RestrictCrackLength(rawCrackLength);
+
+            double concreteMoment = CalculateConcreteMoment();
+            double shearStrength = concreteMoment / crackLength;
+
+            TraceLogger?.AddMessage($"Shear strength = {concreteMoment} / {crackLength} = {shearStrength} {UnitsOfSI.Newtons}");
+            return shearStrength;
+        }
+
+        private double CalculateConcreteMoment() =>
+            sectionEffectiveness.BaseShapeFactor
+            * sectionEffectiveness.ShapeFactor
+            * inclinedSection.ConcreteTensionStrength
+            * inclinedSection.WebWidth
+            * inclinedSection.EffectiveDepth
+            * inclinedSection.EffectiveDepth;
+
+        private double RestrictCrackLength(double length)
+        {
+            double max = sectionEffectiveness.MaxCrackLengthRatio * inclinedSection.EffectiveDepth;
+            double min = sectionEffectiveness.MinCrackLengthRatio * inclinedSection.EffectiveDepth;
+
+            if (length > max)
+            {
+                TraceLogger?.AddMessage($"Crack length reduced from {length} to {max}");
+                return max;
+            }
+            if (length < min)
+            {
+                TraceLogger?.AddMessage($"Crack length increased from {length} to {min}");
+                return min;
+            }
+            return length;
+        }
+
+        private void ValidateInput()
+        {
+            if (inclinedSection.EffectiveDepth <= 0)
+                throw new StructureHelperException("Effective depth must be greater than zero.");
+        }
+    }
+
+}

StructureHelperLogics/Models/BeamShears/Logics/StrengthLogics/StirrupByDensityStrengthLogic.cs

@@ -9,7 +9,7 @@ using StructureHelperLogics.Models.BeamShears.Logics;
 namespace StructureHelperLogics.Models.BeamShears
 {
     /// <inheritdoc/>
-    public class StirrupByDensityStrengthLogic : IBeamShearStrenghLogic
+    public class StirrupByDensityStrengthLogic : IBeamShearStrengthLogic
     {
         private readonly IStirrupEffectiveness stirrupEffectiveness;
         private readonly IStirrupByDensity stirrupByDensity;
@@ -30,7 +30,7 @@ namespace StructureHelperLogics.Models.BeamShears
 
         public IShiftTraceLogger? TraceLogger { get; set; }
         /// <inheritdoc/>
-        public double GetShearStrength()
+        public double CalculateShearStrength()
         {
             Check();
             TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);

StructureHelperLogics/Models/BeamShears/Logics/StrengthLogics/StirrupByInclinedRebarStrengthLogic.cs

@@ -6,7 +6,7 @@ using StructureHelperLogics.Models.Materials;
 
 namespace StructureHelperLogics.Models.BeamShears
 {
-    public class StirrupByInclinedRebarStrengthLogic : IBeamShearStrenghLogic
+    public class StirrupByInclinedRebarStrengthLogic : IBeamShearStrengthLogic
     {
         const double stirrupEffectivenessFactor = 0.75;
         private readonly IStirrupByInclinedRebar inclinedRebar;
@@ -47,7 +47,7 @@ namespace StructureHelperLogics.Models.BeamShears
             TraceLogger = traceLogger;
         }
 
-        public double GetShearStrength()
+        public double CalculateShearStrength()
         {
             GetGeometry();
             if (inclinedSection.StartCoord > rebarEndPoint)

StructureHelperLogics/Models/BeamShears/Logics/StrengthLogics/StirrupByRebarStrengthLogic.cs

@@ -7,14 +7,14 @@ using StructureHelperCommon.Models.Forces;
 
 namespace StructureHelperLogics.Models.BeamShears
 {
-    public class StirrupByRebarStrengthLogic : IBeamShearStrenghLogic
+    public class StirrupByRebarStrengthLogic : IBeamShearStrengthLogic
     {
         private IStirrupEffectiveness stirrupEffectiveness;
         private IStirrupByRebar stirrupByRebar;
         private IInclinedSection inclinedSection;
         private readonly IForceTuple forceTuple;
         private StirrupByDensityStrengthLogic stirrupDensityStrengthLogic;
-        private IConvertStrategy<IStirrupByDensity, IStirrupByRebar> convertStrategy;
+        private IObjectConvertStrategy<IStirrupByDensity, IStirrupByRebar> convertStrategy;
         public IShiftTraceLogger? TraceLogger { get; set; }
 
         public StirrupByRebarStrengthLogic(
@@ -23,7 +23,7 @@ namespace StructureHelperLogics.Models.BeamShears
             IInclinedSection inclinedSection,
             IForceTuple forceTuple,
             StirrupByDensityStrengthLogic stirrupDensityStrengthLogic,
-            IConvertStrategy<IStirrupByDensity, IStirrupByRebar> convertStrategy,
+            IObjectConvertStrategy<IStirrupByDensity, IStirrupByRebar> convertStrategy,
             IShiftTraceLogger? traceLogger)
         {
             this.stirrupEffectiveness = stirrupEffectiveness;
@@ -49,7 +49,7 @@ namespace StructureHelperLogics.Models.BeamShears
             TraceLogger = traceLogger;
         }
 
-        public double GetShearStrength()
+        public double CalculateShearStrength()
         {
             InitializeStrategies();
             if (stirrupByRebar.EndCoordinate < inclinedSection.StartCoord)
@@ -76,7 +76,7 @@ namespace StructureHelperLogics.Models.BeamShears
                 TraceLogger?.AddMessage($"Stirrup spacing S = {stirrupByRebar.Spacing}(m) is greater than max stirrup spacing Smax = {maxStirrupSpacingByEffectibeDepth}(m), stirrups are ignored", TraceLogStatuses.Warning);
                 return 0;
             }
-            double shearStrength = stirrupDensityStrengthLogic.GetShearStrength();
+            double shearStrength = stirrupDensityStrengthLogic.CalculateShearStrength();
             return shearStrength;
         }
 

StructureHelperLogics/Models/BeamShears/Logics/StrengthLogics/StirrupByRebarToDensityConvertStrategy.cs

@@ -5,13 +5,12 @@ using StructureHelperCommon.Models;
 
 namespace StructureHelperLogics.Models.BeamShears
 {
-    public class StirrupByRebarToDensityConvertStrategy : IConvertStrategy<IStirrupByDensity, IStirrupByRebar>
+    public class StirrupByRebarToDensityConvertStrategy : IObjectConvertStrategy<IStirrupByDensity, IStirrupByRebar>
     {
         private const double stirrupStrengthFactor = 0.8d;
         private const double maxStirrupStrength = 3e8;
         private IInclinedSection inclinedSection;
         private IUpdateStrategy<IStirrup> updateStrategy;
-        public Dictionary<(Guid id, Type type), ISaveable> ReferenceDictionary { get; set; }
         public IShiftTraceLogger TraceLogger { get; set; }
 
         public StirrupByRebarToDensityConvertStrategy(IShiftTraceLogger traceLogger, IInclinedSection inclinedSection)
@@ -77,7 +76,7 @@ namespace StructureHelperLogics.Models.BeamShears
             TraceLogger?.AddMessage($"Spiral spacing = {spiralSpacing}(m)");
             double spiralAng = Math.Atan2(spiralHeight, spiralSpacing);
             double spriralEffectiveness = Math.Sin(spiralAng);
-            double spiralAngInDegrees = 180 / (Math.PI) * spiralAng;
+            double spiralAngInDegrees = 57.29578 * spiralAng; // 180/PI
             TraceLogger?.AddMessage($"Spiral effectiveness factor = sin({spiralAngInDegrees}(deg)) = {spriralEffectiveness}");
             return spriralEffectiveness;
         }

StructureHelperLogics/Models/BeamShears/Logics/StrengthLogics/StirrupGroupStrengthLogic.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace StructureHelperLogics.Models.BeamShears
 {
-    internal class StirrupGroupStrengthLogic : IBeamShearStrenghLogic
+    internal class StirrupGroupStrengthLogic : IBeamShearStrengthLogic
     {
         private readonly IBeamShearSectionLogicInputData sourceInputData;
         private IBeamShearSectionLogicInputData localInputData;
@@ -25,7 +25,7 @@ namespace StructureHelperLogics.Models.BeamShears
 
         public IShiftTraceLogger? TraceLogger { get; set; }
 
-        public double GetShearStrength()
+        public double CalculateShearStrength()
         {
             Check();
             if (!stirrupGroup.Stirrups.Any()) { return 0.0; }
@@ -35,7 +35,7 @@ namespace StructureHelperLogics.Models.BeamShears
             {
                 localInputData.Stirrup = item;
                 var stirrupSrengthLogic = new StirrupStrengthLogic(localInputData, TraceLogger?.GetSimilarTraceLogger(50));
-                shearStrength += stirrupSrengthLogic.GetShearStrength();
+                shearStrength += stirrupSrengthLogic.CalculateShearStrength();
             }
             TraceLogger?.AddMessage($"Total bearing capacity of group {stirrupGroup.Name} for shear Vtot = {shearStrength}(N)");
             return shearStrength;

StructureHelperLogics/Models/BeamShears/Logics/StrengthLogics/StirrupStrengthLogic.cs

@@ -4,14 +4,14 @@ using StructureHelperCommon.Models.Shapes;
 
 namespace StructureHelperLogics.Models.BeamShears
 {
-    internal class StirrupStrengthLogic : IBeamShearStrenghLogic
+    internal class StirrupStrengthLogic : IBeamShearStrengthLogic
     {
         private readonly IBeamShearSectionLogicInputData inputData;
         private IStirrup stirrup => inputData.Stirrup;
         private IInclinedSection inclinedSection => inputData.InclinedCrack;
-        private IBeamShearStrenghLogic stirrupByDensityStrengthLogic;
-        private IBeamShearStrenghLogic stirrupGroupStrengthLogic;
-        private IBeamShearStrenghLogic stirrupByInclinedRebarStrengthLogic;
+        private IBeamShearStrengthLogic stirrupByDensityStrengthLogic;
+        private IBeamShearStrengthLogic stirrupGroupStrengthLogic;
+        private IBeamShearStrengthLogic stirrupByInclinedRebarStrengthLogic;
         private IStirrupEffectiveness stirrupEffectiveness;
 
         public StirrupStrengthLogic(IBeamShearSectionLogicInputData inputData, IShiftTraceLogger? traceLogger)
@@ -22,32 +22,32 @@ namespace StructureHelperLogics.Models.BeamShears
 
         public IShiftTraceLogger? TraceLogger { get; set; }
 
-        public double GetShearStrength()
+        public double CalculateShearStrength()
         {
             GetStirrupEffectiveness();
             if (stirrup is IStirrupByRebar stirrupByRebar)
             {
                 TraceLogger?.AddMessage($"Stirrups type is stirrup by rebar Name = {stirrupByRebar.Name}");
                 stirrupByDensityStrengthLogic = new StirrupByRebarStrengthLogic(stirrupEffectiveness, stirrupByRebar, inclinedSection, inputData.ForceTuple, TraceLogger);
-                return stirrupByDensityStrengthLogic.GetShearStrength();
+                return stirrupByDensityStrengthLogic.CalculateShearStrength();
             }
             else if (stirrup is IStirrupGroup stirrupGroup)
             {
                 TraceLogger?.AddMessage($"Stirrups type is stirrup group Name = {stirrupGroup.Name}");
                 stirrupGroupStrengthLogic ??= new StirrupGroupStrengthLogic(inputData, stirrupGroup, TraceLogger);
-                return stirrupGroupStrengthLogic.GetShearStrength();
+                return stirrupGroupStrengthLogic.CalculateShearStrength();
             }
             else if (stirrup is IStirrupByDensity stirrupByDensity)
             {
                 TraceLogger?.AddMessage($"Stirrups type is stirrup by density Name = {stirrupByDensity.Name}");
                 stirrupByDensityStrengthLogic = new StirrupByDensityStrengthLogic(stirrupEffectiveness, stirrupByDensity, inclinedSection, TraceLogger);
-                return stirrupByDensityStrengthLogic.GetShearStrength();
+                return stirrupByDensityStrengthLogic.CalculateShearStrength();
             }
             else if (stirrup is IStirrupByInclinedRebar inclinedRebar)
             {
                 TraceLogger?.AddMessage($"Stirrups type is inclined rebar Name = {inclinedRebar.Name}");
                 stirrupByInclinedRebarStrengthLogic ??= new StirrupByInclinedRebarStrengthLogic(inclinedSection, inclinedRebar, TraceLogger);
-                return stirrupByInclinedRebarStrengthLogic.GetShearStrength();
+                return stirrupByInclinedRebarStrengthLogic.CalculateShearStrength();
             }
             else
             {

StructureHelperLogics/Models/BeamShears/Logics/UpdateLogics/BeamShearSectionLogicInputDataUpdateStrategy.cs

@@ -11,6 +11,7 @@ namespace StructureHelperLogics.Models.BeamShears
             CheckObject.IsNull(sourceObject, ErrorStrings.SourceObject);
             CheckObject.IsNull(targetObject, ErrorStrings.TargetObject);
             if (ReferenceEquals(targetObject, sourceObject)) { return; }
+            targetObject.BeamShearAction = sourceObject.BeamShearAction;
             targetObject.InclinedSection = sourceObject.InclinedSection;
             targetObject.InclinedCrack = sourceObject.InclinedCrack;
             targetObject.Stirrup = sourceObject.Stirrup;