From 8d4c788a7e04dcf64d74e3bb93a6dbb537d9b0df Mon Sep 17 00:00:00 2001
From: ear <ear@REDIKULTSEV>
Date: Wed, 8 Oct 2025 19:19:42 +0500
Subject: [PATCH] Add option of strain control in force calculator

---
 .../NdmCrossSections/ForceCalculatorInputDataDTO.cs    |  2 ++
 DataAccess/DataAccess.csproj                           |  2 +-
 .../Documentation/Verification/Materials.shpj          |  2 +-
 .../Properties/PublishProfiles/FolderProfile.pubxml    |  4 ++--
 .../PublishProfiles/FolderProfile.pubxml.user          |  2 +-
 StructureHelper/StructureHelper.csproj                 |  2 +-
 .../ForceCalculatorViews/ForceCalculatorView.xaml      |  4 +++-
 .../Calculators/ForceCalculatorInputDataVM.cs          | 10 ++++++++++
 StructureHelperCommon/StructureHelperCommon.csproj     |  4 ++--
 .../Analyses/ByForces/ForceCalculatorInputData.cs      |  2 ++
 .../ByForces/ForceCalculatorInputDataUpdateStrategy.cs |  1 +
 .../Analyses/ByForces/ForceCalculatorLogic.cs          |  3 ++-
 .../Analyses/ByForces/ForceTupleInputData.cs           |  3 ++-
 .../Analyses/ByForces/IForceCalculatorInputData.cs     |  1 +
 .../Analyses/ByForces/IForceTupleInputData.cs          |  1 +
 .../Analyses/ByForces/Logics/ForceTupleCalcLogic.cs    |  5 ++++-
 .../Services/NdmCalculations/InterpolateService.cs     |  1 +
 StructureHelperTests/StructureHelperTests.csproj       |  4 ++--
 18 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/DataAccess/DTOs/DTOEntities/NdmCrossSections/ForceCalculatorInputDataDTO.cs b/DataAccess/DTOs/DTOEntities/NdmCrossSections/ForceCalculatorInputDataDTO.cs
index 0448737..b99d81d 100644
--- a/DataAccess/DTOs/DTOEntities/NdmCrossSections/ForceCalculatorInputDataDTO.cs
+++ b/DataAccess/DTOs/DTOEntities/NdmCrossSections/ForceCalculatorInputDataDTO.cs
@@ -24,6 +24,8 @@ namespace DataAccess.DTOs
         public IAccuracy Accuracy { get; set; }
         [JsonProperty("CompressedMember")]
         public ICompressedMember CompressedMember { get; set; } = new CompressedMemberDTO();
+        [JsonProperty("CheckStrainLimit")]
+        public bool CheckStrainLimit { get; set; } = true;
 
         public ForceCalculatorInputDataDTO(Guid id)
         {
diff --git a/DataAccess/DataAccess.csproj b/DataAccess/DataAccess.csproj
index 4aad7c0..2dd161f 100644
--- a/DataAccess/DataAccess.csproj
+++ b/DataAccess/DataAccess.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/StructureHelper/Documentation/Verification/Materials.shpj b/StructureHelper/Documentation/Verification/Materials.shpj
index 56d1163..64de14e 100644
--- a/StructureHelper/Documentation/Verification/Materials.shpj
+++ b/StructureHelper/Documentation/Verification/Materials.shpj
@@ -2,7 +2,7 @@
   "$id": "1",
   "$type": "RootObject",
   "FileVersion": {
-    "Id": "24d6a33c-a189-4b16-9d14-00e18b022698",
+    "Id": "0e4e721a-1df3-4693-999d-3670b14f7113",
     "VersionNumber": 1,
     "SubVersionNumber": 4
   },
diff --git a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml
index bafcfeb..f31a868 100644
--- a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml
@@ -6,10 +6,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\net6.0-windows7.0\win-x64\publish\win-x64\</PublishDir>
+    <PublishDir>bin\Release\publish\win-x64\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
-    <TargetFramework>net6.0-windows7.0</TargetFramework>
+    <TargetFramework>net9.0-windows7.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishReadyToRun>false</PublishReadyToRun>
diff --git a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user
index e8dd7a8..84cc092 100644
--- a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2025-09-01T13:13:26.2156933Z||;True|2025-09-01T10:22:19.7113160+05:00||;True|2025-07-21T11:22:35.9564230+05:00||;True|2025-01-27T14:32:31.9770658+05:00||;True|2024-12-29T20:48:11.7280613+05:00||;True|2024-12-27T13:24:44.0055462+05:00||;True|2024-11-13T09:16:22.8894163+05:00||;True|2024-08-13T14:00:35.8311260+05:00||;True|2024-08-12T12:59:16.1785759+05:00||;True|2024-03-11T20:33:14.1457807+05:00||;True|2024-03-10T19:11:27.6834663+05:00||;True|2024-02-02T12:22:50.1454015+05:00||;True|2023-02-25T13:37:39.2738786+05:00||;False|2023-02-25T13:37:24.0284261+05:00||;True|2023-02-25T13:34:01.6858860+05:00||;True|2023-02-25T13:31:18.8295711+05:00||;False|2023-02-25T13:25:21.5807199+05:00||;False|2023-02-25T13:24:41.7164398+05:00||;</History>
+    <History>True|2025-10-08T10:12:30.5384948Z||;False|2025-10-08T15:11:01.2672591+05:00||;True|2025-10-08T09:15:32.2315891+05:00||;False|2025-10-08T09:11:08.2259505+05:00||;False|2025-10-08T09:10:40.2008110+05:00||;False|2025-10-08T09:09:13.4947353+05:00||;True|2025-09-01T18:13:26.2156933+05:00||;True|2025-09-01T10:22:19.7113160+05:00||;True|2025-07-21T11:22:35.9564230+05:00||;True|2025-01-27T14:32:31.9770658+05:00||;True|2024-12-29T20:48:11.7280613+05:00||;True|2024-12-27T13:24:44.0055462+05:00||;True|2024-11-13T09:16:22.8894163+05:00||;True|2024-08-13T14:00:35.8311260+05:00||;True|2024-08-12T12:59:16.1785759+05:00||;True|2024-03-11T20:33:14.1457807+05:00||;True|2024-03-10T19:11:27.6834663+05:00||;True|2024-02-02T12:22:50.1454015+05:00||;True|2023-02-25T13:37:39.2738786+05:00||;False|2023-02-25T13:37:24.0284261+05:00||;True|2023-02-25T13:34:01.6858860+05:00||;True|2023-02-25T13:31:18.8295711+05:00||;False|2023-02-25T13:25:21.5807199+05:00||;False|2023-02-25T13:24:41.7164398+05:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/StructureHelper/StructureHelper.csproj b/StructureHelper/StructureHelper.csproj
index c2a2331..3732ff2 100644
--- a/StructureHelper/StructureHelper.csproj
+++ b/StructureHelper/StructureHelper.csproj
@@ -68,7 +68,7 @@
     <PackageReference Include="LiveCharts.Wpf.Core" Version="0.9.8" />
     <PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.8" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
   </ItemGroup>
 
diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorView.xaml b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorView.xaml
index 8c2867c..070acf7 100644
--- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorView.xaml
+++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorView.xaml
@@ -7,7 +7,7 @@
         xmlns:vm="clr-namespace:StructureHelper.Windows.ViewModels.Calculations.Calculators"
         d:DataContext="{d:DesignInstance vm:ForceCalculatorViewModel}"
         mc:Ignorable="d"
-        Title="Analysis by forces" Height="300" Width="400" MinHeight="300" MinWidth="400" WindowStartupLocation="CenterScreen" Closing="Window_Closing">
+        Title="Analysis by forces" Height="350" Width="400" MinHeight="350" MinWidth="400" WindowStartupLocation="CenterScreen" Closing="Window_Closing">
     <Window.Resources>
         <Style x:Key="cbStyle" TargetType="CheckBox">
             <Setter Property="Margin" Value="0,5,0,5"/>
@@ -28,6 +28,7 @@
                                 <CheckBox Style="{StaticResource cbStyle}" Content="Long Term" IsChecked="{Binding LongTerm}"/>
                             </StackPanel>
                         </GroupBox>
+                        <CheckBox Content="Check strain limit" IsChecked="{Binding CheckStrainLimit}"/>
                     </StackPanel>
                 </TabItem>
                 <TabItem Header="Forces">
@@ -78,6 +79,7 @@
                         <TextBox Style="{StaticResource ValidatedError}" Grid.Column="2" Grid.Row="1" Margin="5,5,5,5" Text="{Binding MaxIterationCount, ValidatesOnDataErrors=True}"/>
                     </Grid>
                 </TabItem>
+                
             </TabControl>
         </DataTemplate>
     </Window.Resources>
diff --git a/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForceCalculatorInputDataVM.cs b/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForceCalculatorInputDataVM.cs
index c021947..8568a38 100644
--- a/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForceCalculatorInputDataVM.cs
+++ b/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForceCalculatorInputDataVM.cs
@@ -17,6 +17,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
     {
         private IForceCalculatorInputData inputData;
         SecondOrderViewModel secondOrderViewModel;
+        private bool checkStrainLimit;
 
         public double IterationAccuracy
         {
@@ -36,6 +37,15 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
         public bool SLS { get; set; }
         public bool ShortTerm { get; set; }
         public bool LongTerm { get; set; }
+        public bool CheckStrainLimit
+        {
+            get => inputData.CheckStrainLimit;
+            set
+            {
+                inputData.CheckStrainLimit = value;
+                OnPropertyChanged(nameof(CheckStrainLimit));
+            }
+        }
 
         public SourceTargetVM<IForceAction> CombinationViewModel { get; }
         public SourceTargetVM<PrimitiveBase> PrimitivesViewModel { get; private set; }
diff --git a/StructureHelperCommon/StructureHelperCommon.csproj b/StructureHelperCommon/StructureHelperCommon.csproj
index e279ebb..7ea0afb 100644
--- a/StructureHelperCommon/StructureHelperCommon.csproj
+++ b/StructureHelperCommon/StructureHelperCommon.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExcelDataReader" Version="3.7.0" />
-    <PackageReference Include="NLog" Version="6.0.3" />
+    <PackageReference Include="ExcelDataReader" Version="3.8.0" />
+    <PackageReference Include="NLog" Version="6.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorInputData.cs b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorInputData.cs
index 73aa1d8..079053d 100644
--- a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorInputData.cs
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorInputData.cs
@@ -15,6 +15,8 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
         public List<INdmPrimitive> Primitives { get; private set; } = new();
         public ICompressedMember CompressedMember { get; set; } = new CompressedMember() { Buckling = false};
         public IAccuracy Accuracy { get; set; } = new Accuracy() {IterationAccuracy = 0.001d, MaxIterationCount = 1000};
+        public bool CheckStrainLimit { get; set; } = true;
+
         //public List<IForceCombinationList> ForceCombinationLists { get; set; }
 
         public ForceCalculatorInputData(Guid id)
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorInputDataUpdateStrategy.cs b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorInputDataUpdateStrategy.cs
index 206d0d0..6048620 100644
--- a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorInputDataUpdateStrategy.cs
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorInputDataUpdateStrategy.cs
@@ -44,6 +44,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
             CheckObject.IsNull(targetObject, sourceObject, "Force calculator input data");
             if (ReferenceEquals(targetObject, sourceObject)) { return; }
             targetObject.Accuracy ??= new Accuracy();
+            targetObject.CheckStrainLimit = sourceObject.CheckStrainLimit;
             accuracyUpdateStrategy.Update(targetObject.Accuracy, sourceObject.Accuracy);
             targetObject.CompressedMember ??= new CompressedMember();
             compressedMemberUpdateStrategy.Update(targetObject.CompressedMember, sourceObject.CompressedMember);
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorLogic.cs b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorLogic.cs
index f6db798..c1a47ca 100644
--- a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorLogic.cs
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculatorLogic.cs
@@ -223,7 +223,8 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
             {
                 NdmCollection = ndmCollection,
                 ForceTuple = tuple,
-                Accuracy = accuracy
+                Accuracy = accuracy,
+                CheckStrainLimit = InputData.CheckStrainLimit,
             };
             var calculator = new ForceTupleCalculator();
             calculator.InputData = inputData;
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceTupleInputData.cs b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceTupleInputData.cs
index 9b446d7..3e45ad1 100644
--- a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceTupleInputData.cs
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceTupleInputData.cs
@@ -18,7 +18,8 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
         public IForceTuple ForceTuple { get; set; }
         /// <inheritdoc/>
         public IAccuracy Accuracy { get; set; }
-        
+        public bool CheckStrainLimit { get; set; }
+
         public ForceTupleInputData()
         {
             Accuracy ??= new Accuracy() { IterationAccuracy = 0.01d, MaxIterationCount = 1000 };
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/IForceCalculatorInputData.cs b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/IForceCalculatorInputData.cs
index 445ffbd..0507fc3 100644
--- a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/IForceCalculatorInputData.cs
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/IForceCalculatorInputData.cs
@@ -28,5 +28,6 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
         /// Settings for calculating of stability fo compressed members
         /// </summary>
         ICompressedMember CompressedMember { get; set; }
+        bool CheckStrainLimit { get; set; }
     }
 }
\ No newline at end of file
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/IForceTupleInputData.cs b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/IForceTupleInputData.cs
index 4cf55d1..ba6b08c 100644
--- a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/IForceTupleInputData.cs
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/IForceTupleInputData.cs
@@ -26,5 +26,6 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
         /// Settings of iteration
         /// </summary>
         IAccuracy Accuracy { get; set; }
+        bool CheckStrainLimit { get; set; }
     }
 }
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/Logics/ForceTupleCalcLogic.cs b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/Logics/ForceTupleCalcLogic.cs
index 18ada36..3c375d2 100644
--- a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/Logics/ForceTupleCalcLogic.cs
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/Logics/ForceTupleCalcLogic.cs
@@ -123,7 +123,10 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
                 TraceLogger = TraceLogger
             };
             forceTupleTraceResultLogic.TraceResult(result);
-            CheckOverStrainedNdms();
+            if (InputData.CheckStrainLimit == true)
+            {
+                CheckOverStrainedNdms();
+            }
         }
 
         private bool CheckOverStrainedNdms()
diff --git a/StructureHelperLogics/Services/NdmCalculations/InterpolateService.cs b/StructureHelperLogics/Services/NdmCalculations/InterpolateService.cs
index f49bb6c..6ee7152 100644
--- a/StructureHelperLogics/Services/NdmCalculations/InterpolateService.cs
+++ b/StructureHelperLogics/Services/NdmCalculations/InterpolateService.cs
@@ -19,6 +19,7 @@ namespace StructureHelperLogics.Services.NdmCalculations
             calculator.InputData.Accuracy = source.InputData.Accuracy;
             calculator.InputData.Primitives.AddRange(source.InputData.Primitives);
             calculator.InputData.ForceActions.Clear();
+            calculator.InputData.CheckStrainLimit = source.InputData.CheckStrainLimit;
             var forceTuples = ForceTupleService.InterpolateDesignTuple(interpolateTuplesResult.FinishTuple, interpolateTuplesResult.StartTuple, interpolateTuplesResult.StepCount);
             foreach (var forceTuple in forceTuples)
             {
diff --git a/StructureHelperTests/StructureHelperTests.csproj b/StructureHelperTests/StructureHelperTests.csproj
index f657a9c..3b1bbb5 100644
--- a/StructureHelperTests/StructureHelperTests.csproj
+++ b/StructureHelperTests/StructureHelperTests.csproj
@@ -10,10 +10,10 @@
 
   <ItemGroup>
     <PackageReference Include="Castle.Core" Version="5.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="4.4.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
   </ItemGroup>
 
   <ItemGroup>