From 732af8bc0988afb6e9afbc65b6057dec40b48828 Mon Sep 17 00:00:00 2001
From: RedikultsevEvg <effect-project@yandex.ru>
Date: Sun, 28 Jul 2024 22:34:21 +0500
Subject: [PATCH] Logic of TupleForceCalculator were changed

---
 .../CheckCrackCalculatorInputDataLogic.cs     | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

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