Add inclined rebar
This commit is contained in:
@@ -72,7 +72,7 @@ namespace StructureHelperLogics.Models.BeamShears
|
||||
|
||||
private void InitializeStrategies()
|
||||
{
|
||||
convertStrategy ??= new StirrupByRebarToDensityConvertStrategy(TraceLogger);
|
||||
convertStrategy ??= new StirrupByRebarToDensityConvertStrategy(TraceLogger, inclinedSection);
|
||||
IStirrupByDensity stirrupByDensity = convertStrategy.Convert(stirrupByRebar);
|
||||
stirrupDensityStrengthLogic ??= new(stirrupEffectiveness, stirrupByDensity, inclinedSection, TraceLogger);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using StructureHelperCommon.Infrastructures.Enums;
|
||||
using StructureHelperCommon.Infrastructures.Exceptions;
|
||||
using StructureHelperCommon.Infrastructures.Interfaces;
|
||||
using StructureHelperCommon.Models;
|
||||
|
||||
@@ -8,13 +9,15 @@ namespace StructureHelperLogics.Models.BeamShears
|
||||
{
|
||||
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)
|
||||
public StirrupByRebarToDensityConvertStrategy(IShiftTraceLogger traceLogger, IInclinedSection inclinedSection)
|
||||
{
|
||||
TraceLogger = traceLogger;
|
||||
this.inclinedSection = inclinedSection;
|
||||
}
|
||||
|
||||
public StirrupByRebarToDensityConvertStrategy(IUpdateStrategy<IStirrup> updateStrategy, IShiftTraceLogger traceLogger)
|
||||
@@ -42,9 +45,33 @@ namespace StructureHelperLogics.Models.BeamShears
|
||||
TraceLogger?.AddMessage($"Strength of rebar Rsw = {stirrupStrengthFactor} * {materialStrength} = {stirrupStrength}(Pa)");
|
||||
double minimizedStrength = Math.Min(stirrupStrength, maxStirrupStrength);
|
||||
TraceLogger?.AddMessage($"Strength of rebar Rsw = Min({stirrupStrength}, {maxStirrupStrength})= {minimizedStrength}(Pa)");
|
||||
double density = minimizedStrength * area * source.LegCount / source.Spacing;
|
||||
TraceLogger?.AddMessage($"Density of stirrups = {minimizedStrength} * {area} * {source.LegCount} / {source.Spacing} = {density}(N/m)");
|
||||
double spiralEffectiveness = 1;
|
||||
if (source.IsSpiral = true)
|
||||
{
|
||||
spiralEffectiveness = GetSpiralEffectiveness(source);
|
||||
}
|
||||
double density = minimizedStrength * area * source.LegCount / source.Spacing * spiralEffectiveness;
|
||||
TraceLogger?.AddMessage($"Density of stirrups = {minimizedStrength} * {area} * {source.LegCount} / {source.Spacing} * {spiralEffectiveness} = {density}(N/m)");
|
||||
return density;
|
||||
}
|
||||
|
||||
private double GetSpiralEffectiveness(IStirrupByRebar source)
|
||||
{
|
||||
if (inclinedSection is null)
|
||||
{
|
||||
string errorString = ErrorStrings.ParameterIsNull + ": Inclined Section";
|
||||
TraceLogger?.AddMessage(errorString, TraceLogStatuses.Error);
|
||||
throw new StructureHelperException(errorString);
|
||||
}
|
||||
double spiralHeight = inclinedSection.EffectiveDepth - (inclinedSection.FullDepth - inclinedSection.EffectiveDepth);
|
||||
TraceLogger?.AddMessage($"Spiral height = {spiralHeight}(m)");
|
||||
double spiralSpacing = source.Spacing;
|
||||
TraceLogger?.AddMessage($"Spiral spacing = {spiralSpacing}(m)");
|
||||
double spiralAng = Math.Atan2(spiralHeight, spiralSpacing);
|
||||
double spriralEffectiveness = Math.Sin(spiralAng);
|
||||
double spiralAngInDegrees = 180 / (Math.PI) * spiralAng;
|
||||
TraceLogger?.AddMessage($"Spiral effectiveness factor = sin({spiralAngInDegrees}(deg)) = {spriralEffectiveness}");
|
||||
return spriralEffectiveness;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ namespace StructureHelperLogics.Models.BeamShears
|
||||
targetObject.Diameter = sourceObject.Diameter;
|
||||
targetObject.LegCount = sourceObject.LegCount;
|
||||
targetObject.Spacing = sourceObject.Spacing;
|
||||
targetObject.IsSpiral = sourceObject.IsSpiral;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,49 +13,74 @@ namespace StructureHelperLogics.Models.BeamShears.Logics
|
||||
{
|
||||
private IUpdateStrategy<IStirrupByDensity> densityUpdateStrategy;
|
||||
private IUpdateStrategy<IStirrupByRebar> uniformUpdateStrategy;
|
||||
private IUpdateStrategy<IStirrupGroup> groupUpdateStrategy;
|
||||
private IUpdateStrategy<IStirrupByInclinedRebar> inclinedUpdateStrategy;
|
||||
|
||||
public void Update(IStirrup targetObject, IStirrup sourceObject)
|
||||
{
|
||||
CheckObject.IsNull(targetObject);
|
||||
CheckObject.IsNull(sourceObject);
|
||||
if (ReferenceEquals(targetObject, sourceObject)) { return; }
|
||||
if (sourceObject is IStirrupByDensity density)
|
||||
if (sourceObject is IStirrupGroup group)
|
||||
{
|
||||
UpdateByDensity(targetObject, density);
|
||||
UpdateGroup(targetObject, group);
|
||||
}
|
||||
else if (sourceObject is IStirrupByRebar stirrupByUniformRebar)
|
||||
{
|
||||
UpdateByUniformRebar(targetObject, stirrupByUniformRebar);
|
||||
}
|
||||
else if (sourceObject is IStirrupByDensity density)
|
||||
{
|
||||
UpdateByDensity(targetObject, density);
|
||||
}
|
||||
else if (sourceObject is IStirrupByInclinedRebar inclinedRebar)
|
||||
{
|
||||
UpdateByInclinedRebar(targetObject, inclinedRebar);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(sourceObject));
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateByUniformRebar(IStirrup targetObject, IStirrupByRebar stirrupByUniformRebar)
|
||||
private void UpdateByInclinedRebar(IStirrup targetObject, IStirrupByInclinedRebar surceInclinedRebar)
|
||||
{
|
||||
uniformUpdateStrategy ??= new StirrupByRebarUpdateStrategy();
|
||||
if (targetObject is IStirrupByRebar targetUniformRebar)
|
||||
{
|
||||
uniformUpdateStrategy.Update(targetUniformRebar, stirrupByUniformRebar);
|
||||
}
|
||||
else
|
||||
if (targetObject is not IStirrupByInclinedRebar targetInclinedRebar)
|
||||
{
|
||||
throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(targetObject));
|
||||
}
|
||||
inclinedUpdateStrategy ??= new StirrupByInclinedRebarUpdateStrategy();
|
||||
inclinedUpdateStrategy.Update(targetInclinedRebar, surceInclinedRebar);
|
||||
}
|
||||
|
||||
private void UpdateGroup(IStirrup targetObject, IStirrupGroup sourceGroup)
|
||||
{
|
||||
if (targetObject is not IStirrupGroup targetGroup)
|
||||
{
|
||||
throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(targetObject));
|
||||
}
|
||||
groupUpdateStrategy ??= new StirrupGroupUpdateStrategy();
|
||||
groupUpdateStrategy.Update(targetGroup, sourceGroup);
|
||||
}
|
||||
|
||||
private void UpdateByUniformRebar(IStirrup targetObject, IStirrupByRebar stirrupByUniformRebar)
|
||||
{
|
||||
if (targetObject is not IStirrupByRebar targetUniformRebar)
|
||||
{
|
||||
throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(targetObject));
|
||||
}
|
||||
uniformUpdateStrategy ??= new StirrupByRebarUpdateStrategy();
|
||||
uniformUpdateStrategy.Update(targetUniformRebar, stirrupByUniformRebar);
|
||||
}
|
||||
|
||||
private void UpdateByDensity(IStirrup targetObject, IStirrupByDensity density)
|
||||
{
|
||||
densityUpdateStrategy ??= new StirrupByDensityUpdateStrategy();
|
||||
if (targetObject is IStirrupByDensity targetDensity)
|
||||
{
|
||||
densityUpdateStrategy.Update(targetDensity, density);
|
||||
}
|
||||
else
|
||||
if (targetObject is not IStirrupByDensity targetDensity)
|
||||
{
|
||||
throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(targetObject));
|
||||
}
|
||||
densityUpdateStrategy ??= new StirrupByDensityUpdateStrategy();
|
||||
densityUpdateStrategy.Update(targetDensity, density);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
using StructureHelperCommon.Infrastructures.Exceptions;
|
||||
using StructureHelperCommon.Infrastructures.Interfaces;
|
||||
using StructureHelperCommon.Services;
|
||||
using StructureHelperLogics.NdmCalculations.Primitives;
|
||||
|
||||
namespace StructureHelperLogics.Models.BeamShears
|
||||
{
|
||||
public class StirrupByInclinedRebarUpdateStrategy : IUpdateStrategy<IStirrupByInclinedRebar>
|
||||
{
|
||||
private IUpdateStrategy<IStirrup>? baseUpdateStrategy;
|
||||
public void Update(IStirrupByInclinedRebar targetObject, IStirrupByInclinedRebar sourceObject)
|
||||
{
|
||||
CheckObject.IsNull(sourceObject, ErrorStrings.SourceObject);
|
||||
CheckObject.IsNull(targetObject, ErrorStrings.TargetObject);
|
||||
if (ReferenceEquals(targetObject, sourceObject)) { return; }
|
||||
baseUpdateStrategy ??= new StirrupBaseUpdateStrategy();
|
||||
baseUpdateStrategy.Update(targetObject, sourceObject);
|
||||
targetObject.StartCoordinate = sourceObject.StartCoordinate;
|
||||
targetObject.OffSet = sourceObject.OffSet;
|
||||
targetObject.AngleOfInclination = sourceObject.AngleOfInclination;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
using StructureHelperCommon.Infrastructures.Exceptions;
|
||||
using StructureHelperCommon.Infrastructures.Interfaces;
|
||||
using StructureHelperCommon.Services;
|
||||
using StructureHelperLogics.NdmCalculations.Primitives;
|
||||
|
||||
namespace StructureHelperLogics.Models.BeamShears
|
||||
{
|
||||
public class StirrupGroupUpdateStrategy : IUpdateStrategy<IStirrupGroup>
|
||||
{
|
||||
private StirrupBaseUpdateStrategy baseUpdateStrategy;
|
||||
|
||||
public void Update(IStirrupGroup targetObject, IStirrupGroup sourceObject)
|
||||
{
|
||||
CheckObject.IsNull(sourceObject, ErrorStrings.SourceObject);
|
||||
CheckObject.IsNull(targetObject, ErrorStrings.TargetObject);
|
||||
if (ReferenceEquals(targetObject, sourceObject)) { return; }
|
||||
baseUpdateStrategy ??= new StirrupBaseUpdateStrategy();
|
||||
baseUpdateStrategy.Update(targetObject, sourceObject);
|
||||
CheckObject.IsNull(sourceObject.Stirrups);
|
||||
CheckObject.IsNull(targetObject.Stirrups);
|
||||
targetObject.Stirrups.Clear();
|
||||
foreach (var item in sourceObject.Stirrups)
|
||||
{
|
||||
IStirrup? newItem = item.Clone() as IStirrup;
|
||||
targetObject.Stirrups.Add(newItem);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user