avpon/StructureHelper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix BeamShearCalculatorLogic

Browse Source
This commit is contained in:
Evgeny Redikultsev
2025-05-11 22:00:22 +05:00
parent 2269b2ea07
commit b38bad251d
26 changed files with 244 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
StructureHelperCommon/Models/Forces/ForceFactoredList.cs
View File

@@ -11,7 +11,7 @@ namespace StructureHelperCommon.Models.Forces
{
readonly IUpdateStrategy<IForceFactoredList> updateStrategy = new ForceFactoredListUpdateStrategy();
private List<IForceCombinationList> result;
private IGetCombinationByFactoredTupleLogic getCombinationLogic = new GetCombinationByFactoredTupleLogic();
private IGetCombinationsByFactoredTupleLogic getCombinationLogic = new GetCombinationsByFactoredTupleLogic();
/// <inheritdoc/>
public Guid Id { get; }

8
StructureHelperCommon/Models/Forces/Logics/GetCombinationByFactoredTupleLogic.cs → StructureHelperCommon/Models/Forces/Logics/GetCombinationsByFactoredTupleLogic.cs
View File

@@ -2,6 +2,7 @@
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Models.Calculators;
using StructureHelperCommon.Models.Shapes;
using StructureHelperCommon.Services.Forces;
using System;
using System.Collections.Generic;
@@ -9,9 +10,12 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
//Copyright (c) 2025 Redikultsev Evgeny, Ekaterinburg, Russia
//All rights reserved.
namespace StructureHelperCommon.Models.Forces.Logics
{
public class GetCombinationByFactoredTupleLogic : IGetCombinationByFactoredTupleLogic
public class GetCombinationsByFactoredTupleLogic : IGetCombinationsByFactoredTupleLogic
{
private ForceCombinationList? result;
private IForceTuple? fullSLSTuple;
@@ -20,7 +24,7 @@ namespace StructureHelperCommon.Models.Forces.Logics
public IForceTuple? SourceForceTuple { get; set; }
public IFactoredCombinationProperty? CombinationProperty { get; set; }
public IForceActionProperty? ForceActionProperty { get; set; }
public IForceActionProperty? ForceActionProperty { get; set; } = new ForceActionProperty() { ForcePoint = new Point2D(), SetInGravityCenter = false };
public IForceCombinationList GetCombinationList()
{
Check();

3
StructureHelperCommon/Models/Forces/Logics/GetFactorByFactoredCombinationProperty.cs
View File

@@ -5,6 +5,7 @@
namespace StructureHelperCommon.Models.Forces.Logics
{
/// <inheritdoc/>
public class GetFactorByFactoredCombinationProperty : IGetLoadFactor
{
private const double defaultSLSfactor = 1d;
@@ -13,7 +14,7 @@ namespace StructureHelperCommon.Models.Forces.Logics
public IFactoredCombinationProperty CombinationProperty { get; set; }
public LimitStates LimitState { get; set; }
public CalcTerms CalcTerm { get; set; }
/// <inheritdoc/>
public double GetFactor()
{
double stateFactor = CombinationProperty.LimitState is LimitStates.SLS ? defaultSLSfactor : (1d / CombinationProperty.ULSFactor);

42
StructureHelperCommon/Models/Forces/Logics/GetForceTupleByFactoredTupleLogic.cs Normal file
View File

@@ -0,0 +1,42 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Models.Calculators;
using StructureHelperCommon.Services.Forces;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperCommon.Models.Forces.Logics
{
public class GetForceTupleByFactoredTupleLogic : IGetForceTupleByFactoredTupleLogic
{
private IGetLoadFactor getFactorLogic;
public GetForceTupleByFactoredTupleLogic(IGetLoadFactor getFactorLogic)
{
this.getFactorLogic = getFactorLogic;
}
public GetForceTupleByFactoredTupleLogic()
{
}
public IFactoredForceTuple FactoredForceTuple { get; set; }
public LimitStates LimitState { get; set; }
public CalcTerms CalcTerm { get; set; }
public IForceTuple GetForceTuple()
{
getFactorLogic ??= new GetFactorByFactoredCombinationProperty()
{
CombinationProperty = FactoredForceTuple.CombinationProperty,
LimitState = LimitState,
CalcTerm = CalcTerm
};
double factor = getFactorLogic.GetFactor();
return ForceTupleService.MultiplyTupleByFactor(FactoredForceTuple.ForceTuple, factor);
}
}
}

12
StructureHelperCommon/Models/Forces/Logics/IGetCombinationByFactoredTupleLogic.cs → StructureHelperCommon/Models/Forces/Logics/IGetCombinationsByFactoredTupleLogic.cs
View File

@@ -1,16 +1,18 @@
namespace StructureHelperCommon.Models.Forces.Logics
{
/// <summary>
/// Return combinations for source combination and properties
/// Returns combinations for source combination and properties
/// </summary>
public interface IGetCombinationByFactoredTupleLogic
{
/// <summary>
public interface IGetCombinationsByFactoredTupleLogic
{ /// <summary>
/// Source combination of forces
/// </summary>
IForceTuple? SourceForceTuple { get; set; }
/// <inheritdoc/>
/// <summary>
/// Properties of combination for source combination of force
/// </summary>
IFactoredCombinationProperty? CombinationProperty { get; set; }
/// <inheritdoc/>
IForceActionProperty? ForceActionProperty { get; set; }
/// <summary>

11
StructureHelperCommon/Models/Forces/Logics/IGetForceTupleByFactoredTupleLogic.cs Normal file
View File

@@ -0,0 +1,11 @@
using StructureHelperCommon.Infrastructures.Enums;
namespace StructureHelperCommon.Models.Forces.Logics
{
public interface IGetForceTupleByFactoredTupleLogic : IGetForceTupleLogic
{
IFactoredForceTuple FactoredForceTuple { get; set; }
LimitStates LimitState { get; set; }
CalcTerms CalcTerm { get; set; }
}
}

18
StructureHelperCommon/Models/Forces/Logics/IGetForceTupleLogic.cs Normal file
View File

@@ -0,0 +1,18 @@
using StructureHelperCommon.Infrastructures.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperCommon.Models.Forces.Logics
{
public interface IGetForceTupleLogic
{
/// <summary>
/// Calculates force tuple
/// </summary>
/// <returns></returns>
IForceTuple GetForceTuple();
}
}

4
StructureHelperCommon/Models/Forces/Logics/IGetLoadFactor.cs
View File

@@ -8,6 +8,10 @@ namespace StructureHelperCommon.Models.Forces
/// </summary>
public interface IGetLoadFactor
{
/// <summary>
/// Returns factor for load
/// </summary>
/// <returns>Factor for load</returns>
double GetFactor();
}
}

2
StructureHelperLogics/Models/BeamShears/BeamShearCalculator.cs
View File

@@ -35,7 +35,7 @@ namespace StructureHelperLogics.Models.BeamShears
public void Run()
{
PrepareNewResult();
PrepareInputData();
//PrepareInputData();
try
{
InitializeStrategies();

75
StructureHelperLogics/Models/BeamShears/BeamShearCalculatorLogic.cs
View File

@@ -1,5 +1,7 @@
using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Models;
using StructureHelperCommon.Models.Forces;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -10,9 +12,13 @@ namespace StructureHelperLogics.Models.BeamShears
{
public class BeamShearCalculatorLogic : IGetResultByInputDataLogic<IBeamShearCalculatorInputData, IBeamShearCalculatorResult>
{
private const LimitStates CollapsLimitState = LimitStates.ULS;
private IBeamShearCalculatorResult result;
private IBeamShearSectionLogic beamShearSectionLogic;
private List<IBeamShearSectionLogicInputData> sectionInputDatas;
private IBeamShearCalculatorInputData inputData;
private List<CalcTerms> calcTerms = new() { CalcTerms.LongTerm, CalcTerms.ShortTerm };
public IShiftTraceLogger? TraceLogger { get; set; }
public BeamShearCalculatorLogic(IShiftTraceLogger? traceLogger)
@@ -23,11 +29,12 @@ namespace StructureHelperLogics.Models.BeamShears
public IBeamShearCalculatorResult GetResultByInputData(IBeamShearCalculatorInputData inputData)
{
this.inputData = inputData;
PrepareNewResult();
InitializeStrategies();
try
{
GetSectionInputDatas(inputData);
GetSectionInputDatas();
CalculateResult();
}
catch (Exception ex)
@@ -64,25 +71,53 @@ namespace StructureHelperLogics.Models.BeamShears
};
}
private void GetSectionInputDatas(IBeamShearCalculatorInputData inputData)
private void GetSectionInputDatas()
{
//sectionInputDatas = new();
//foreach (var beamShearSection in inputData.Sections)
//{
// foreach (var stirrup in inputData.Stirrups)
// {
// foreach (var beamShearAction in inputData.Actions)
// {
// BeamShearSectionLogicInputData newInputData = new(Guid.NewGuid())
// {
// BeamShearSection = beamShearSection,
// Stirrup = stirrup,
// BeamShearAction = beamShearAction
// };
// sectionInputDatas.Add(newInputData);
// }
// }
//}
sectionInputDatas = new();
foreach (var beamShearSection in inputData.Sections)
{
List<IInclinedSection> inclinedSections = GetInclinedSections(beamShearSection);
foreach (var inclinedSection in inclinedSections)
{
GetSections(inclinedSection);
}
}
}
private void GetSections(IInclinedSection inclinedSection)
{
foreach (var stirrup in inputData.Stirrups)
{
foreach (var beamShearAction in inputData.Actions)
{
foreach (var calcTerm in calcTerms)
{
IForceTuple forceTuple = GetForceTupleByShearAction(beamShearAction, inclinedSection, CollapsLimitState, calcTerm);
BeamShearSectionLogicInputData newInputData = new(Guid.NewGuid())
{
InclinedSection = inclinedSection,
Stirrup = stirrup,
ForceTuple = forceTuple,
LimitState = CollapsLimitState,
CalcTerm = calcTerm
};
sectionInputDatas.Add(newInputData);
}
}
}
}
private List<IInclinedSection> GetInclinedSections(IBeamShearSection beamShearSection)
{
IGetInclinedSectionListInputData inclinedSectionInputDataLogic = new GetInclinedSectionListInputData(beamShearSection);
IGetInclinedSectionListLogic getInclinedSectionListLogic = new GetInclinedSectionListLogic(inclinedSectionInputDataLogic, TraceLogger);
return getInclinedSectionListLogic.GetInclinedSections();
}
private IForceTuple GetForceTupleByShearAction(IBeamShearAction beamShearAction, IInclinedSection inclinedSection, LimitStates limitState, CalcTerms calcTerm)
{
IGetDirectShearForceLogic getDirectShearForceLogic = new GetDirectShearForceLogic(beamShearAction, inclinedSection, limitState, calcTerm, TraceLogger);
return getDirectShearForceLogic.CalculateShearForceTuple();
}
}
}

9
StructureHelperLogics/Models/BeamShears/BeamShearSectionLogicInputData.cs
View File

@@ -10,7 +10,9 @@ namespace StructureHelperLogics.Models.BeamShears
public class BeamShearSectionLogicInputData : IBeamShearSectionLogicInputData
{
/// <inheritdoc/>
public IBeamShearSection BeamShearSection { get; set; }
public Guid Id { get; }
/// <inheritdoc/>
public IInclinedSection InclinedSection { get; set; }
/// <inheritdoc/>
public IStirrup Stirrup { get; set; }
/// <inheritdoc/>
@@ -20,5 +22,10 @@ namespace StructureHelperLogics.Models.BeamShears
/// <inheritdoc/>
public IForceTuple ForceTuple { get; set; }
public BeamShearSectionLogicInputData(Guid id)
{
Id = id;
}
}
}

2
StructureHelperLogics/Models/BeamShears/IBeamShearSection.cs
View File

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
namespace StructureHelperLogics.Models.BeamShears
{
/// <summary>
/// Properties of concrete cross-section for shear strength of beam
/// Properties of RC cross-section for shear strength of beam
/// </summary>
public interface IBeamShearSection : ISaveable, ICloneable
{

19
StructureHelperLogics/Models/BeamShears/IBeamShearSectionLogicInputData.cs
View File

@@ -11,12 +11,27 @@ namespace StructureHelperLogics.Models.BeamShears
/// <summary>
/// Implements input data for calculating bearing capacity of cross-section of RC member for shear
/// </summary>
public interface IBeamShearSectionLogicInputData : IInputData
public interface IBeamShearSectionLogicInputData : IInputData, ISaveable
{
IBeamShearSection BeamShearSection { get; set; }
/// <summary>
/// Properties of RC cross-section
/// </summary>
IInclinedSection InclinedSection { get; set; }
/// <summary>
/// Properties of stirrups in cross-section
/// </summary>
IStirrup Stirrup { get; set; }
/// <summary>
/// Limit state for calculating
/// </summary>
LimitStates LimitState { get; set; }
/// <summary>
/// Term (Duration) for calculation
/// </summary>
CalcTerms CalcTerm { get; set; }
/// <summary>
/// Force tuple for calculation
/// </summary>
IForceTuple ForceTuple { get; set; }
}
}

4
StructureHelperLogics/Models/BeamShears/Logics/BeamShearCalculatorToLogicInputDataConvertStrategy.cs
View File

@@ -28,9 +28,9 @@ namespace StructureHelperLogics.Models.BeamShears
foreach (var calcTerm in calcTerms)
{
IForceTuple forceTuple = GetForceTuple(action, limitState, calcTerm);
BeamShearSectionLogicInputData newItem = new()
BeamShearSectionLogicInputData newItem = new(Guid.NewGuid())
{
BeamShearSection = section,
//BeamShearSection = section,
ForceTuple = forceTuple,
Stirrup = stirrup,
LimitState = limitState,

65
StructureHelperLogics/Models/BeamShears/Logics/GetDirectShearForceLogic.cs
View File

@@ -1,7 +1,11 @@
using StructureHelperCommon.Models;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Models;
using StructureHelperCommon.Models.Forces;
using StructureHelperCommon.Models.Forces.BeamShearActions;
using StructureHelperCommon.Models.Forces.Logics;
using StructureHelperCommon.Models.Loggers;
using StructureHelperCommon.Services.Forces;
using System.Security.Cryptography.X509Certificates;
//Copyright (c) 2025 Redikultsev Evgeny, Ekaterinburg, Russia
//All rights reserved.
@@ -15,42 +19,82 @@ namespace StructureHelperLogics.Models.BeamShears
/// <inheritdoc/>
public IShiftTraceLogger? TraceLogger { get; set; }
public IBeamShearAxisAction AxisAction { get; private set; }
public IInclinedSection InclinedSection { get; private set; }
public IBeamShearAction AxisAction { get; set; }
public IInclinedSection InclinedSection { get; set; }
public LimitStates LimitState { get; set; }
public CalcTerms CalcTerm { get; set; }
public GetDirectShearForceLogic(
IBeamShearAxisAction axisAction,
IInclinedSection inclinedSection,
IBeamShearAction axisAction,
IInclinedSection inclinedSection,
LimitStates limitState,
CalcTerms calcTerm,
IShiftTraceLogger? traceLogger)
{
AxisAction = axisAction;
InclinedSection = inclinedSection;
LimitState = limitState;
CalcTerm = calcTerm;
TraceLogger = traceLogger;
}
public GetDirectShearForceLogic(
IBeamShearAxisAction axisAction,
IBeamShearAction axisAction,
IInclinedSection inclinedSection,
LimitStates limitState,
CalcTerms calcTerm,
IShiftTraceLogger? traceLogger,
ISumForceByShearLoadLogic summaryForceLogic)
{
this.summaryForceLogic = summaryForceLogic;
AxisAction = axisAction;
InclinedSection = inclinedSection;
LimitState = limitState;
CalcTerm = calcTerm;
TraceLogger = traceLogger;
}
/// <inheritdoc/>
public IForceTuple CalculateShearForce()
public IForceTuple CalculateShearForceTuple()
{
IForceTuple externalTuple = CalculateExternalForceTuple();
IForceTuple internalTuple = CalculateInternalForceTuple();
IForceTuple totalTuple = ForceTupleService.SumTuples(internalTuple, externalTuple);
TraceLogger?.AddMessage($"Total longitudinal force = {totalTuple.Nz}(N)");
TraceLogger?.AddMessage($"Total shear force = {totalTuple.Qy}(N)");
return totalTuple;
}
private IForceTuple CalculateExternalForceTuple()
{
var forceTupleLogic = new GetForceTupleByFactoredTupleLogic()
{
FactoredForceTuple = AxisAction.ExternalForce,
LimitState = LimitState,
CalcTerm = CalcTerm
};
IForceTuple internalForceTuple = forceTupleLogic.GetForceTuple();
return internalForceTuple;
}
private IForceTuple CalculateInternalForceTuple()
{
TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
InitializeStrategies();
IForceTuple supportShearForce = AxisAction.SupportForce.ForceTuple;
TraceLogger?.AddMessage($"Shear force at support Qmax = {supportShearForce}(N)");
IBeamShearAxisAction beamShearAxisAction = AxisAction.SupportAction;
var forceTupleLogic = new GetForceTupleByFactoredTupleLogic()
{
FactoredForceTuple = beamShearAxisAction.SupportForce,
LimitState = LimitState,
CalcTerm = CalcTerm
};
IForceTuple supportShearForce= forceTupleLogic.GetForceTuple();
TraceLogger?.AddMessage($"Shear force at support Qmax = {supportShearForce.Qy}(N)");
TraceLogger?.AddMessage($"Start of inclined section a,start = {InclinedSection.StartCoord}(m)");
TraceLogger?.AddMessage($"End of inclined section a,end = {InclinedSection.EndCoord}(m)");
ForceTuple summarySpanShearForce = new (Guid.NewGuid());
foreach (var item in AxisAction.ShearLoads)
foreach (var item in beamShearAxisAction.ShearLoads)
{
IForceTuple summarySpanLoad = summaryForceLogic.GetSumShearForce(item, InclinedSection.StartCoord, InclinedSection.EndCoord);
ForceTupleService.SumTupleToTarget(summarySpanLoad, summarySpanShearForce);
@@ -65,5 +109,6 @@ namespace StructureHelperLogics.Models.BeamShears
{
summaryForceLogic ??= new SumForceByShearLoadLogic(TraceLogger);
}
}
}

1
StructureHelperLogics/Models/BeamShears/Logics/GetInclinedSectionListInputData.cs
View File

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
namespace StructureHelperLogics.Models.BeamShears
{
/// <inheritdoc/>
public class GetInclinedSectionListInputData : IGetInclinedSectionListInputData
{
public int StepCount { get; set; } = 50;

4
StructureHelperLogics/Models/BeamShears/Logics/GetInclinedSectionListLogic.cs
View File

@@ -7,7 +7,7 @@ namespace StructureHelperLogics.Models.BeamShears
{
public class GetInclinedSectionListLogic : IGetInclinedSectionListLogic
{
private readonly GetInclinedSectionListInputData inputData;
private readonly IGetInclinedSectionListInputData inputData;
private IGetInclinedSectionLogic inclinedSectionLogic;
private double depth;
private double effectiveDepth;
@@ -16,7 +16,7 @@ namespace StructureHelperLogics.Models.BeamShears
public IShiftTraceLogger? TraceLogger { get; set; }
public GetInclinedSectionListLogic(
GetInclinedSectionListInputData inputData,
IGetInclinedSectionListInputData inputData,
IShiftTraceLogger? traceLogger)
{
this.inputData = inputData;

1
StructureHelperLogics/Models/BeamShears/Logics/GetInclinedSectionLogic.cs
View File

@@ -4,6 +4,7 @@ using StructureHelperCommon.Models.Shapes;
namespace StructureHelperLogics.Models.BeamShears
{
/// <inheritdoc/>
public class GetInclinedSectionLogic : IGetInclinedSectionLogic
{
private readonly IBeamShearSection beamShearSection;

2
StructureHelperLogics/Models/BeamShears/Logics/IGetDirectShearForceLogic.cs
View File

@@ -12,6 +12,6 @@ namespace StructureHelperLogics.Models.BeamShears
/// Returns value of shear force at the end of inclined section
/// </summary>
/// <returns>Value of shear force at the end of inclined section</returns>
IForceTuple CalculateShearForce();
IForceTuple CalculateShearForceTuple();
}
}

2
StructureHelperLogics/Models/BeamShears/Logics/IGetInclinedSectionBySectionLogic.cs
View File

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace StructureHelperLogics.Models.BeamShears
{
/// <summary>
/// Implement logic for obtaining of inclined section
/// Implements logic for obtaining of inclined section
/// </summary>
public interface IGetInclinedSectionLogic : ILogic
{

4
StructureHelperLogics/Models/BeamShears/Logics/ShearForceLogic.cs
View File

@@ -37,7 +37,7 @@ namespace StructureHelperLogics.Models.BeamShears
TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
InitializeStrategies();
double factor = getFactorLogic.GetFactor();
IForceTuple directShearForce = getDirectShearForceLogic.CalculateShearForce();
IForceTuple directShearForce = getDirectShearForceLogic.CalculateShearForceTuple();
IForceTuple shearForce = ForceTupleService.MultiplyTupleByFactor(directShearForce,factor);
return shearForce;
}
@@ -50,7 +50,7 @@ namespace StructureHelperLogics.Models.BeamShears
LimitState = InputData.LimitState,
CalcTerm = InputData.CalcTerm
};
getDirectShearForceLogic ??= new GetDirectShearForceLogic(InputData.AxisAction, InputData.InclinedSection, TraceLogger);
//getDirectShearForceLogic ??= new GetDirectShearForceLogic(InputData.AxisAction, InputData.InclinedSection, TraceLogger);
}
}
}

2
StructureHelperLogics/Models/BeamShears/Logics/SumConcentratedForceLogic.cs
View File

@@ -65,7 +65,7 @@ namespace StructureHelperLogics.Models.BeamShears
if (concentratedForce.ForceCoordinate < limitCoordinate)
{
totalLoad = ForceTupleService.MultiplyTupleByFactor(concentratedForce.ForceValue, concentratedForce.LoadRatio);
TraceLogger?.AddMessage($"Total load Q,tot = {concentratedForce.ForceValue}(N) * {concentratedForce.LoadRatio} = {totalLoad}(N)");
TraceLogger?.AddMessage($"Total load Q,tot = {concentratedForce.ForceValue.Qy}(N) * {concentratedForce.LoadRatio} = {totalLoad}(N)");
}
else
{

2
StructureHelperLogics/Models/BeamShears/Logics/SumDistributedLoadLogic.cs
View File

@@ -57,7 +57,7 @@ namespace StructureHelperLogics.Models.BeamShears
TraceLogger?.AddMessage($"Total length L,tot = {loadEndCoord}(m) - {loadStartCoord}(m) = {loadLength}(m)");
double sumFactor = distributedLoad.LoadRatio * loadLength;
IForceTuple totalLoad = ForceTupleService.MultiplyTupleByFactor(distributedLoad.LoadValue, sumFactor);
TraceLogger?.AddMessage($"Total load Q,tot = {distributedLoad.LoadValue.Qy}(N/m) * {distributedLoad.LoadRatio} * {loadLength}(m) = {totalLoad}(N)");
TraceLogger?.AddMessage($"Total load Q,tot = {distributedLoad.LoadValue.Qy}(N/m) * {distributedLoad.LoadRatio} * {loadLength}(m) = {totalLoad.Qy}(N)");
return totalLoad;
}
}

4
StructureHelperLogics/Models/BeamShears/Logics/SumForceByShearLoadLogic.cs
View File

@@ -50,7 +50,7 @@ namespace StructureHelperLogics.Models.BeamShears
{
sumConcentratedForceLogic ??= new SumConcentratedForceLogic(TraceLogger);
IForceTuple sumForce = sumConcentratedForceLogic.GetSumShearForce(concenratedForce, startCoord, endCoord);
TraceLogger?.AddMessage($"Sum of uniformly distributed load Qud = {sumForce}(N)");
TraceLogger?.AddMessage($"Sum of concentrated force Qcf = {sumForce.Qy}(N)");
return sumForce;
}
@@ -58,7 +58,7 @@ namespace StructureHelperLogics.Models.BeamShears
{
sumDistributedLoadLogic ??= new SumDistributedLoadLogic(TraceLogger);
IForceTuple sumForce = sumDistributedLoadLogic.GetSumShearForce(distributedLoad, startCoord, endCoord);
TraceLogger?.AddMessage($"Sum of concentrated force Qcf = {sumForce}(N)");
TraceLogger?.AddMessage($"Sum of uniformly distributed load Qud = {sumForce.Qy}(N)");
return sumForce;
}

2
StructureHelperTests/UnitTests/BeamShearTests/GetDirectShearForceLogicTests.cs
View File

@@ -43,7 +43,7 @@ namespace StructureHelperTests.UnitTests.BeamShearTests
// Arrange
// Act
double result = _logic.CalculateShearForce().Qy;
double result = _logic.CalculateShearForceTuple().Qy;
// Assert
Assert.That(result, Is.EqualTo(150.0));

2
StructureHelperTests/UnitTests/BeamShearTests/GetShearForceLogicTests.cs
View File

@@ -35,7 +35,7 @@ namespace StructureHelperTests.UnitTests.BeamShearTests
{
// Arrange
_mockGetFactorLogic.Setup(f => f.GetFactor()).Returns(1.5);
_mockGetDirectShearForceLogic.Setup(d => d.CalculateShearForce()).Returns(new ForceTuple() { Qy = 100.0 });
_mockGetDirectShearForceLogic.Setup(d => d.CalculateShearForceTuple()).Returns(new ForceTuple() { Qy = 100.0 });
// Act
double result = _logic.GetShearForce().Qy;