Logic of TupleForceCalculator were changed

This commit is contained in:
RedikultsevEvg
2024-07-28 22:34:21 +05:00
parent 09b53ac4e3
commit 732af8bc09

View File

@@ -16,40 +16,26 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
/// <summary> /// <summary>
/// Logic of checking of input data for crack calcultor /// Logic of checking of input data for crack calcultor
/// </summary> /// </summary>
public class CheckCrackCalculatorInputDataLogic : ICheckInputDataLogic public class CheckCrackCalculatorInputDataLogic : ICheckInputDataLogic<CrackInputData>
{ {
private string checkResult;
private CrackInputData inputData;
private bool result; private bool result;
public IInputData InputData public CrackInputData InputData { get; set; }
{
get => inputData;
set
{
if (value is CrackInputData data)
{
inputData = data;
}
else
{
throw new StructureHelperException(ErrorStrings.ExpectedWas(typeof(CrackInputData), value));
}
}
}
public string CheckResult => checkResult;
public string CheckResult { get; private set; }
public IShiftTraceLogger? TraceLogger { get; set; } public IShiftTraceLogger? TraceLogger { get; set; }
public CheckCrackCalculatorInputDataLogic(CrackInputData inputData) public CheckCrackCalculatorInputDataLogic(CrackInputData inputData)
{ {
this.inputData = inputData; InputData = inputData;
CheckResult = string.Empty;
} }
public bool Check() public bool Check()
{ {
TraceLogger?.AddMessage(LoggerStrings.CalculatorType(this), TraceLogStatuses.Debug); TraceLogger?.AddMessage(LoggerStrings.CalculatorType(this), TraceLogStatuses.Debug);
result = true; result = true;
checkResult = string.Empty; CheckResult = string.Empty;
CheckPrimitives(); CheckPrimitives();
CheckActions(); CheckActions();
return result; return result;
@@ -57,27 +43,27 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
private void CheckActions() private void CheckActions()
{ {
if (inputData.ForceActions is null || (!inputData.ForceActions.Any())) if (InputData.ForceActions is null || (!InputData.ForceActions.Any()))
{ {
result = false; result = false;
string message = "Calculator does not contain any actions\n"; string message = "Calculator does not contain any actions\n";
checkResult += message; CheckResult += message;
TraceLogger?.AddMessage(message, TraceLogStatuses.Error); TraceLogger?.AddMessage(message, TraceLogStatuses.Error);
}; };
} }
private void CheckPrimitives() private void CheckPrimitives()
{ {
if (inputData.Primitives is null || (!inputData.Primitives.Any())) if (InputData.Primitives is null || (!InputData.Primitives.Any()))
{ {
result = false; result = false;
string message = "Calculator does not contain any primitives\n"; string message = "Calculator does not contain any primitives\n";
checkResult += message; CheckResult += message;
TraceLogger?.AddMessage(message, TraceLogStatuses.Error); TraceLogger?.AddMessage(message, TraceLogStatuses.Error);
} }
else else
{ {
foreach (var primitive in inputData.Primitives) foreach (var primitive in InputData.Primitives)
{ {
if (primitive is RebarPrimitive rebar) if (primitive is RebarPrimitive rebar)
{ {
@@ -93,12 +79,12 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
{ {
result = false; result = false;
string message = $"Primitive {rebar.Name} does not have a host\n"; string message = $"Primitive {rebar.Name} does not have a host\n";
checkResult += message; CheckResult += message;
TraceLogger?.AddMessage(message, TraceLogStatuses.Error); TraceLogger?.AddMessage(message, TraceLogStatuses.Error);
} }
else else
{ {
bool isPrimitivesContainRebarHost = inputData.Primitives.Contains(rebar.HostPrimitive); bool isPrimitivesContainRebarHost = InputData.Primitives.Contains(rebar.HostPrimitive);
if (isPrimitivesContainRebarHost == false) if (isPrimitivesContainRebarHost == false)
{ {
result = false; result = false;