From f127594b5ce45f6e95da8582f75e8bb9c19b7afe Mon Sep 17 00:00:00 2001
From: Evgeny Redikultsev <effect-project@yandex.ru>
Date: Sat, 24 May 2025 20:26:44 +0500
Subject: [PATCH] Fix beam shear force calculator

---
 .../UI/Resources/ItemEditPanels.xaml          |   4 +-
 StructureHelper/StructureHelper.csproj.user   |   6 +
 .../BeamShears/BeamShearActionResultView.xaml |  56 ++++++++
 .../BeamShearActionResultView.xaml.cs         |  36 ++++++
 .../BeamShearActionResultViewModel.cs         |  26 ++++
 .../BeamShearCalculatorInputDataViewModel.cs  |  19 ++-
 .../BeamShears/BeamShearCalculatorView.xaml   |   6 +-
 .../BeamShearCalculatorView.xaml.cs           |   5 +
 .../BeamShearCalculatorViewModel.cs           |  20 ++-
 .../BeamShearCalculatorsViewModel.cs          |  19 ++-
 .../BeamShears/BeamShearLoadsViewModel.cs     |   5 -
 .../BeamShears/BeamShearResultView.xaml       |  34 ++++-
 .../BeamShears/BeamShearResultViewModel.cs    |  41 +++++-
 .../ExportActionResultToCSVLogic.cs           |  69 ++++++++++
 .../Windows/BeamShears/ShearDiagramLogic.cs   |  81 ++++++++++++
 .../Factories/SourceTargetFactory.cs          |   4 +-
 .../SelectPrimitivesSourceTarget.cs           |   6 -
 .../Windows/ViewModels/SourceTargetVM.cs      |   7 +-
 .../Interfaces/IGetFactorLogic.cs             |  13 ++
 .../BeamShearActionUpdateStrategy.cs          |   1 +
 ...FactorLogic.cs => IMaterialFactorLogic.cs} |   2 +-
 ...{FactorLogic.cs => MaterialFactorLogic.cs} |   4 +-
 .../Materials/MaterialCommonOptionLogic.cs    |   4 +-
 .../BeamShears/BeamShearActionResult.cs       |   2 +
 .../Models/BeamShears/BeamShearCalculator.cs  |   6 +-
 .../BeamShears/BeamShearCalculatorLogic.cs    | 121 +++++++++++++-----
 .../BeamShears/BeamShearCalculatorResult.cs   |   6 +
 .../BeamShearSectionCalculatorResult.cs       |  14 --
 .../BeamShears/BeamShearSectionLogic.cs       |  70 +++++++++-
 .../BeamShears/BeamShearSectionLogicResult.cs |  19 +++
 .../BeamShears/IBeamShearActionResult.cs      |   2 +
 .../Models/BeamShears/IBeamShearCalculator.cs |   1 +
 .../BeamShears/IBeamShearCalculatorResult.cs  |   4 +
 .../IBeamShearSectionLogicResult.cs           |   5 +
 .../Models/BeamShears/IInclinedSection.cs     |   8 ++
 .../BeamShears/ISectionEffectiveness.cs       |   2 +-
 .../Models/BeamShears/InclinedSection.cs      |   2 +
 ...mShearCalculatorInputDataUpdateStrategy.cs |   1 +
 .../BeamShearCalculatorUpdateStrategy.cs      |   1 +
 .../ConcreteStrengthLogic.cs}                 |  35 +++--
 .../Logics/GetInclinedSectionListLogic.cs     |   3 +-
 .../Logics/GetLogitudinalForceFactorLogic.cs  | 109 ++++++++++++++++
 .../{ => Logics}/IBeamShearStrenghLogic.cs    |   2 +-
 .../IGetLongitudinalForceFactorLogic.cs       |  15 +++
 ...ic.cs => StirrupByDensityStrengthLogic.cs} |  18 ++-
 .../Logics/StirrupByRebarStrengthLogic.cs     |  60 +++++++++
 .../StirrupByRebarToDensityConvertStrategy.cs |   5 +
 .../BeamShears/Logics/StirrupStrengthLogic.cs |  48 +++++++
 .../Models/Materials/ConcreteLibMaterial.cs   |   2 +-
 .../Materials/FRMaterials/FRMaterial.cs       |   2 +-
 .../Materials/Logics/ElasticMaterialLogic.cs  |   2 +-
 .../Materials/ReinforcementLibMaterial.cs     |   2 +-
 .../BeamShearStrengthByStirrupDensityTests.cs |   6 +-
 53 files changed, 920 insertions(+), 121 deletions(-)
 create mode 100644 StructureHelper/Windows/BeamShears/BeamShearActionResultView.xaml
 create mode 100644 StructureHelper/Windows/BeamShears/BeamShearActionResultView.xaml.cs
 create mode 100644 StructureHelper/Windows/BeamShears/BeamShearActionResultViewModel.cs
 create mode 100644 StructureHelper/Windows/BeamShears/ExportActionResultToCSVLogic.cs
 create mode 100644 StructureHelper/Windows/BeamShears/ShearDiagramLogic.cs
 create mode 100644 StructureHelperCommon/Infrastructures/Interfaces/IGetFactorLogic.cs
 rename StructureHelperCommon/Models/Materials/Libraries/{IFactorLogic.cs => IMaterialFactorLogic.cs} (90%)
 rename StructureHelperCommon/Models/Materials/Libraries/{FactorLogic.cs => MaterialFactorLogic.cs} (86%)
 delete mode 100644 StructureHelperLogics/Models/BeamShears/BeamShearSectionCalculatorResult.cs
 create mode 100644 StructureHelperLogics/Models/BeamShears/BeamShearSectionLogicResult.cs
 rename StructureHelperLogics/Models/BeamShears/{BeamSectionShearStrengthLogic.cs => Logics/ConcreteStrengthLogic.cs} (61%)
 create mode 100644 StructureHelperLogics/Models/BeamShears/Logics/GetLogitudinalForceFactorLogic.cs
 rename StructureHelperLogics/Models/BeamShears/{ => Logics}/IBeamShearStrenghLogic.cs (91%)
 create mode 100644 StructureHelperLogics/Models/BeamShears/Logics/IGetLongitudinalForceFactorLogic.cs
 rename StructureHelperLogics/Models/BeamShears/Logics/{BeamShearStrengthByStirrupDensityLogic.cs => StirrupByDensityStrengthLogic.cs} (69%)
 create mode 100644 StructureHelperLogics/Models/BeamShears/Logics/StirrupByRebarStrengthLogic.cs
 create mode 100644 StructureHelperLogics/Models/BeamShears/Logics/StirrupStrengthLogic.cs

diff --git a/StructureHelper/Infrastructure/UI/Resources/ItemEditPanels.xaml b/StructureHelper/Infrastructure/UI/Resources/ItemEditPanels.xaml
index 4324620..5dd9a5a 100644
--- a/StructureHelper/Infrastructure/UI/Resources/ItemEditPanels.xaml
+++ b/StructureHelper/Infrastructure/UI/Resources/ItemEditPanels.xaml
@@ -10,7 +10,7 @@
             </Grid.ColumnDefinitions>
             <ListBox ItemsSource="{Binding SourceItems}"
                      SelectedItem="{Binding SelectedSourceItem}"
-                     ItemTemplate="{Binding ItemDataDemplate}">
+                     ItemTemplate="{Binding ItemDataTemplate}">
                 <!--<InputBindingCollection>
                     <MouseBinding Gesture="LeftDoubleClick" Command="{Binding AddSelected}"/>
                 </InputBindingCollection>-->
@@ -23,7 +23,7 @@
             </StackPanel>
             <ListBox Grid.Column="2" ItemsSource="{Binding TargetItems}"
                      SelectedItem="{Binding SelectedTargetItem}"
-                     ItemTemplate="{Binding ItemDataDemplate}"
+                     ItemTemplate="{Binding ItemDataTemplate}"
                      >
                 <!--<InputBindingCollection>
                     <MouseBinding Gesture="LeftDoubleClick" Command="{Binding RemoveSelected}"/>
diff --git a/StructureHelper/StructureHelper.csproj.user b/StructureHelper/StructureHelper.csproj.user
index 013be9b..00a08fd 100644
--- a/StructureHelper/StructureHelper.csproj.user
+++ b/StructureHelper/StructureHelper.csproj.user
@@ -12,6 +12,9 @@
     <Compile Update="Windows\Arrays\ArrayView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Windows\BeamShears\BeamShearActionResultView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="Windows\BeamShears\BeamShearActionView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -170,6 +173,9 @@
     <Page Update="Windows\Arrays\ArrayView.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="Windows\BeamShears\BeamShearActionResultView.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Windows\BeamShears\BeamShearActionView.xaml">
       <SubType>Designer</SubType>
     </Page>
diff --git a/StructureHelper/Windows/BeamShears/BeamShearActionResultView.xaml b/StructureHelper/Windows/BeamShears/BeamShearActionResultView.xaml
new file mode 100644
index 0000000..e72d845
--- /dev/null
+++ b/StructureHelper/Windows/BeamShears/BeamShearActionResultView.xaml
@@ -0,0 +1,56 @@
+<Window x:Class="StructureHelper.Windows.BeamShears.BeamShearActionResultView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:StructureHelper.Windows.BeamShears"
+        xmlns:uc="clr-namespace:StructureHelper.Windows.UserControls"
+        d:DataContext="{d:DesignInstance local:BeamShearActionResultViewModel}"
+        mc:Ignorable="d"
+        Title="Shear sections result" Height="450" Width="800" MinHeight="400" MinWidth="600" MaxHeight="900" MaxWidth="1200" WindowStartupLocation="CenterScreen">
+    <DockPanel>
+        <ToolBarTray DockPanel.Dock="Top">
+            <!--<ToolBar Name="Sections">
+                <Button Style="{DynamicResource ToolButton}" Command="{Binding ShowSectionResultsCommand}">
+                    <Button.ToolTip>
+                        <uc:ButtonToolTipEh HeaderText="Set prestrain"
+                                                IconContent="{StaticResource BeamShear}"
+                                                DescriptionText="Set strain from selected combination as auto prestrain (not available if selected result is invalid)"/>
+                    </Button.ToolTip>
+                    <Viewbox>
+                        <ContentControl ContentTemplate="{StaticResource BeamShear}"/>
+                    </Viewbox>
+                </Button>
+            </ToolBar>-->
+        </ToolBarTray>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition Height="22"/>
+            </Grid.RowDefinitions>
+            <DataGrid x:Name="ResultGrid" IsReadOnly="True" AutoGenerateColumns="False"  ItemsSource="{Binding SectionResults}" SelectedItem="{Binding SelectedResult}" >
+                <DataGrid.RowStyle>
+                    <Style TargetType="DataGridRow">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding IsValid}" Value="false">
+                                <Setter Property="Background" Value="Pink"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </DataGrid.RowStyle>
+                <DataGrid.Columns>
+                    <DataGridCheckBoxColumn Header="Valid" Binding="{Binding IsValid}"/>
+                    <DataGridTextColumn Header="Start point" Width="100" Binding="{Binding InputData.InclinedSection.StartCoord, Converter={StaticResource LengthConverter}}"/>
+                    <DataGridTextColumn Header="End point" Width="100" Binding="{Binding InputData.InclinedSection.EndCoord, Converter={StaticResource LengthConverter}}"/>
+                    <DataGridTextColumn Header="Shear force" Width="120" Binding="{Binding InputData.ForceTuple.Qy, Converter={StaticResource ForceConverter}}"/>
+                    <DataGridTextColumn Header="Limit force" Width="120" Binding="{Binding TotalStrength, Converter={StaticResource ForceConverter}}"/>
+                    <DataGridTextColumn Header="Using factor" Width="120" Binding="{Binding FactorOfUsing, Converter={StaticResource PlainDouble}}"/>
+                    <DataGridTextColumn Header="Concrete force" Width="120" Binding="{Binding ConcreteStrength, Converter={StaticResource ForceConverter}}"/>
+                    <DataGridTextColumn Header="Stirrup force" Width="120" Binding="{Binding StirrupStrength, Converter={StaticResource ForceConverter}}"/>
+                    <DataGridTextColumn Header="Description" Width="300" Binding="{Binding Description}"/>
+                </DataGrid.Columns>
+            </DataGrid>
+            <ContentControl Grid.Row="1" ContentTemplate="{StaticResource ResultValidness}" Content="{Binding ValidResultCounter}"/>
+        </Grid>
+    </DockPanel>
+</Window>
diff --git a/StructureHelper/Windows/BeamShears/BeamShearActionResultView.xaml.cs b/StructureHelper/Windows/BeamShears/BeamShearActionResultView.xaml.cs
new file mode 100644
index 0000000..82df597
--- /dev/null
+++ b/StructureHelper/Windows/BeamShears/BeamShearActionResultView.xaml.cs
@@ -0,0 +1,36 @@
+using StructureHelperLogics.Models.BeamShears;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace StructureHelper.Windows.BeamShears
+{
+    /// <summary>
+    /// Interaction logic for BeamShearActionResultView.xaml
+    /// </summary>
+    public partial class BeamShearActionResultView : Window
+    {
+        private BeamShearActionResultViewModel viewModel;
+
+        public BeamShearActionResultView(BeamShearActionResultViewModel viewModel)
+        {
+            this.viewModel = viewModel;
+            InitializeComponent();
+            this.DataContext = this.viewModel;
+        }
+        public BeamShearActionResultView(IBeamShearActionResult result) : this (new BeamShearActionResultViewModel(result))
+        {
+            
+        }
+    }
+}
diff --git a/StructureHelper/Windows/BeamShears/BeamShearActionResultViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearActionResultViewModel.cs
new file mode 100644
index 0000000..7b92a47
--- /dev/null
+++ b/StructureHelper/Windows/BeamShears/BeamShearActionResultViewModel.cs
@@ -0,0 +1,26 @@
+using StructureHelper.Infrastructure;
+using StructureHelper.Windows.CalculationWindows.CalculatorsViews;
+using StructureHelperLogics.Models.BeamShears;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelper.Windows.BeamShears
+{
+    public class BeamShearActionResultViewModel : ViewModelBase
+    {
+        private IBeamShearActionResult result;
+        public IBeamShearSectionLogicResult SelectedResult { get; set; }
+        public List<IBeamShearSectionLogicResult> SectionResults => result.SectionResults;
+        public ValidResultCounterVM ValidResultCounter { get; }
+
+        public BeamShearActionResultViewModel(IBeamShearActionResult result)
+        {
+            this.result = result;
+            ValidResultCounter = new(this.result.SectionResults);
+        }
+
+    }
+}
diff --git a/StructureHelper/Windows/BeamShears/BeamShearCalculatorInputDataViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearCalculatorInputDataViewModel.cs
index 91b6673..964c8ae 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearCalculatorInputDataViewModel.cs
+++ b/StructureHelper/Windows/BeamShears/BeamShearCalculatorInputDataViewModel.cs
@@ -2,6 +2,9 @@
 using StructureHelper.Windows.ViewModels;
 using StructureHelperCommon.Models.Forces;
 using StructureHelperLogics.Models.BeamShears;
+using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 
 namespace StructureHelper.Windows.BeamShears
 {
@@ -25,13 +28,23 @@ namespace StructureHelper.Windows.BeamShears
         {
             ActionSourceTarget.SetTargetItems(inputData.Actions);
             ActionSourceTarget.SetSourceItems(shearRepository.Actions);
-            ActionSourceTarget.ItemDataDemplate = SourceTargetFactory.GetSimpleTemplate();
+            ActionSourceTarget.ItemDataTemplate = SourceTargetFactory.GetSimpleTemplate();
             StirrupSourceTarget.SetTargetItems(inputData.Stirrups);
             StirrupSourceTarget.SetSourceItems(shearRepository.Stirrups);
-            StirrupSourceTarget.ItemDataDemplate = SourceTargetFactory.GetSimpleTemplate();
+            StirrupSourceTarget.ItemDataTemplate = SourceTargetFactory.GetSimpleTemplate();
             SectionSourceTarget.SetTargetItems(inputData.Sections);
             SectionSourceTarget.SetSourceItems(shearRepository.Sections);
-            SectionSourceTarget.ItemDataDemplate = SourceTargetFactory.GetSimpleTemplate();
+            SectionSourceTarget.ItemDataTemplate = SourceTargetFactory.GetSimpleTemplate();
+        }
+
+        internal void Refresh()
+        {
+            inputData.Actions.Clear();
+            inputData.Actions.AddRange(ActionSourceTarget.GetTargetItems());
+            inputData.Stirrups.Clear();
+            inputData.Stirrups.AddRange(StirrupSourceTarget.GetTargetItems());
+            inputData.Sections.Clear();
+            inputData.Sections.AddRange(SectionSourceTarget.GetTargetItems());
         }
     }
 }
diff --git a/StructureHelper/Windows/BeamShears/BeamShearCalculatorView.xaml b/StructureHelper/Windows/BeamShears/BeamShearCalculatorView.xaml
index 782b3ec..7d21aff 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearCalculatorView.xaml
+++ b/StructureHelper/Windows/BeamShears/BeamShearCalculatorView.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:StructureHelper.Windows.BeamShears"
         d:DataContext="{d:DesignInstance local:BeamShearCalculatorViewModel}"
         mc:Ignorable="d"
-        Title="Beam Shear Calculator" Height="300" Width="350" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
+        Title="Beam Shear Calculator" Height="300" Width="350" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Closing="Window_Closing">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>
@@ -18,12 +18,14 @@
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
+                <RowDefinition Height="25"/>
                 <RowDefinition Height="25"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <TextBlock Text="Name"/>
+            <CheckBox Grid.Row="1" Content="Show trace data" IsChecked="{Binding ShowTraceData}"/>
             <TextBox Grid.Column="1" Text="{Binding Name}"/>
-            <TabControl Grid.Row="1" Grid.ColumnSpan="2" DataContext="{Binding InputDataViewModel}">
+            <TabControl Grid.Row="2" Grid.ColumnSpan="2" DataContext="{Binding InputDataViewModel}">
                 <TabItem Header="Sections">
                     <ContentControl ContentTemplate="{StaticResource SourceToTarget}" Content="{Binding SectionSourceTarget}"/>
                 </TabItem>
diff --git a/StructureHelper/Windows/BeamShears/BeamShearCalculatorView.xaml.cs b/StructureHelper/Windows/BeamShears/BeamShearCalculatorView.xaml.cs
index 41a3fe2..34cfe25 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearCalculatorView.xaml.cs
+++ b/StructureHelper/Windows/BeamShears/BeamShearCalculatorView.xaml.cs
@@ -15,5 +15,10 @@ namespace StructureHelper.Windows.BeamShears
             this.viewModel.ParentWindow = this;
             this.DataContext = this.viewModel;
         }
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            viewModel.Refresh();
+        }
     }
 }
diff --git a/StructureHelper/Windows/BeamShears/BeamShearCalculatorViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearCalculatorViewModel.cs
index fb4e275..6fec5c8 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearCalculatorViewModel.cs
+++ b/StructureHelper/Windows/BeamShears/BeamShearCalculatorViewModel.cs
@@ -1,4 +1,5 @@
 using StructureHelper.Windows.ViewModels;
+using StructureHelperCommon.Models.Calculators;
 using StructureHelperLogics.Models.BeamShears;
 
 namespace StructureHelper.Windows.BeamShears
@@ -7,7 +8,7 @@ namespace StructureHelper.Windows.BeamShears
     {
         private readonly IBeamShearRepository shearRepository;
         private readonly IBeamShearCalculator calculator;
-        
+        private bool showTraceData;
 
         public string Name
         {
@@ -18,6 +19,18 @@ namespace StructureHelper.Windows.BeamShears
                 OnPropertyChanged(nameof(Name));
             }
         }
+        public bool ShowTraceData
+        {
+            get
+            {
+                return calculator.ShowTraceData;
+            }
+            set
+            {
+                calculator.ShowTraceData = value;
+                OnPropertyChanged(nameof(ShowTraceData));
+            }
+        }
         public BeamShearCalculatorInputDataViewModel InputDataViewModel { get; }
         public BeamShearCalculatorViewModel(IBeamShearRepository shearRepository, IBeamShearCalculator calculator)
         {
@@ -25,5 +38,10 @@ namespace StructureHelper.Windows.BeamShears
             this.calculator = calculator;
             InputDataViewModel = new(this.shearRepository, this.calculator.InputData);
         }
+
+        internal void Refresh()
+        {
+            InputDataViewModel.Refresh();
+        }
     }
 }
diff --git a/StructureHelper/Windows/BeamShears/BeamShearCalculatorsViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearCalculatorsViewModel.cs
index 1900b10..037d7c9 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearCalculatorsViewModel.cs
+++ b/StructureHelper/Windows/BeamShears/BeamShearCalculatorsViewModel.cs
@@ -6,6 +6,7 @@ using StructureHelper.Windows.ViewModels.Errors;
 using StructureHelperCommon.Infrastructures.Exceptions;
 using StructureHelperCommon.Models;
 using StructureHelperCommon.Models.Calculators;
+using StructureHelperCommon.Models.Forces.BeamShearActions;
 using StructureHelperLogics.Models.BeamShears;
 using System;
 using System.Windows;
@@ -18,6 +19,7 @@ namespace StructureHelper.Windows.BeamShears
         private object parameter;
         private readonly IBeamShearRepository shearRepository;
         private RelayCommand runCommand;
+        private BeamShearCalculatorUpdateStrategy updateStrategy;
 
         public ICommand Run
         {
@@ -69,14 +71,21 @@ namespace StructureHelper.Windows.BeamShears
             Window window; 
             if (SelectedItem is IBeamShearCalculator beamShearCalculator)
             {
+                var tmpCalculator = beamShearCalculator.Clone() as IBeamShearCalculator;
                 var viewModel = new BeamShearCalculatorViewModel(shearRepository, beamShearCalculator);
                 window = new BeamShearCalculatorView(viewModel);
+                window.ShowDialog();
+                if (window.DialogResult != true)
+                {
+                    updateStrategy ??= new BeamShearCalculatorUpdateStrategy();
+                    updateStrategy.Update(beamShearCalculator, tmpCalculator);
+                }
+                base.EditMethod(parameter);
             }
             else
             {
                 throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(SelectedItem));
             }
-            window.ShowDialog();
         }
         private void RunMethod(object param)
         {
@@ -95,12 +104,18 @@ namespace StructureHelper.Windows.BeamShears
             if (SelectedItem is IBeamShearCalculator beamShearCalculator)
             {
                 beamShearCalculator.Run();
+                var result = beamShearCalculator.Result as IBeamShearCalculatorResult;
+                Window window = new BeamShearResultView(result);
+                window.ShowDialog();
+                if (beamShearCalculator.ShowTraceData == true)
+                {
+                    TraceDocumentService.ShowDocument(SelectedItem.TraceLogger.TraceLoggerEntries);
+                }
             }
             else
             {
                 throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(SelectedItem));
             }
-            TraceDocumentService.ShowDocument(SelectedItem.TraceLogger.TraceLoggerEntries);
         }
     }
 }
diff --git a/StructureHelper/Windows/BeamShears/BeamShearLoadsViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearLoadsViewModel.cs
index 00b9906..fc611a4 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearLoadsViewModel.cs
+++ b/StructureHelper/Windows/BeamShears/BeamShearLoadsViewModel.cs
@@ -4,13 +4,8 @@ using StructureHelperCommon.Infrastructures.Exceptions;
 using StructureHelperCommon.Infrastructures.Interfaces;
 using StructureHelperCommon.Models.Forces;
 using StructureHelperCommon.Models.Forces.BeamShearActions;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Forms;
 
 namespace StructureHelper.Windows.BeamShears
 {
diff --git a/StructureHelper/Windows/BeamShears/BeamShearResultView.xaml b/StructureHelper/Windows/BeamShears/BeamShearResultView.xaml
index cb3a808..13e7dc0 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearResultView.xaml
+++ b/StructureHelper/Windows/BeamShears/BeamShearResultView.xaml
@@ -7,18 +7,38 @@
         xmlns:uc="clr-namespace:StructureHelper.Windows.UserControls"
         d:DataContext="{d:DesignInstance local:BeamShearResultViewModel}"
         mc:Ignorable="d"
-        Title="BeamShearResultView" Height="450" Width="800" MinHeight="400" MinWidth="600" MaxHeight="900" MaxWidth="1200">
+        Title="Beam Shear Result" Height="450" Width="800" MinHeight="400" MinWidth="600" MaxHeight="900" MaxWidth="1200"  WindowStartupLocation="CenterScreen">
     <DockPanel>
         <ToolBarTray DockPanel.Dock="Top">
             <ToolBar Name="Sections">
-                <Button Style="{DynamicResource ToolButton}" Command="{Binding SetPrestrainCommand}">
+                <Button Style="{DynamicResource ToolButton}" Command="{Binding ShowSectionResultsCommand}">
                     <Button.ToolTip>
-                        <uc:ButtonToolTipEh HeaderText="Set prestrain"
-                                                IconContent="{StaticResource Prestrain}"
-                                                DescriptionText="Set strain from selected combination as auto prestrain (not available if selected result is invalid)"/>
+                        <uc:ButtonToolTipEh HeaderText="Show results by sections"
+                                                IconContent="{StaticResource BeamShear}"
+                                                DescriptionText="Shows results fo all sections (include sections with invalid results)"/>
                     </Button.ToolTip>
                     <Viewbox>
-                        <ContentControl ContentTemplate="{StaticResource Prestrain}"/>
+                        <ContentControl ContentTemplate="{StaticResource BeamShear}"/>
+                    </Viewbox>
+                </Button>
+                <Button Style="{DynamicResource ToolButton}" Command="{Binding ShowDiagramCommand}">
+                    <Button.ToolTip>
+                        <uc:ButtonToolTipEh HeaderText="Show digram"
+                                                IconContent="{StaticResource MomentCurvatureDiagram}"
+                                                DescriptionText="Shows diagram for result where inclined section started from support (Note - the most dangerous combinations may be missed)"/>
+                    </Button.ToolTip>
+                    <Viewbox>
+                        <ContentControl ContentTemplate="{StaticResource MomentCurvatureDiagram}"/>
+                    </Viewbox>
+                </Button>
+                <Button Style="{DynamicResource ToolButton}" Command="{Binding ExportToExcelCommand}">
+                    <Button.ToolTip>
+                        <uc:ButtonToolTipEh HeaderText="Export to Excel"
+                                                IconContent="{StaticResource ExportToXLS}"
+                                                DescriptionText="Exports results to *.csv file"/>
+                    </Button.ToolTip>
+                    <Viewbox>
+                        <ContentControl ContentTemplate="{StaticResource ExportToXLS}"/>
                     </Viewbox>
                 </Button>
             </ToolBar>
@@ -41,6 +61,8 @@
                 <DataGrid.Columns>
                     <DataGridCheckBoxColumn Header="Valid" Binding="{Binding Path=IsValid}"/>
                     <DataGridTextColumn Header="Action" Width="170" Binding="{Binding BeamShearAction.Name}"/>
+                    <DataGridTextColumn Header="Section" Width="120" Binding="{Binding Section.Name}"/>
+                    <DataGridTextColumn Header="Stirrups" Width="120" Binding="{Binding Stirrup.Name}"/>
                     <DataGridTextColumn Header="LimitState" Width="70" Binding="{Binding LimitState}"/>
                     <DataGridTextColumn Header="Duration" Width="70" Binding="{Binding CalcTerm}"/>
                     <!--<DataGridTextColumn Header="Moment Mx" Width="90" Binding="{Binding DesignForceTuple.ForceTuple.Mx, Converter={StaticResource MomentConverter}}"/>
diff --git a/StructureHelper/Windows/BeamShears/BeamShearResultViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearResultViewModel.cs
index 61309b7..3f7aadb 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearResultViewModel.cs
+++ b/StructureHelper/Windows/BeamShears/BeamShearResultViewModel.cs
@@ -1,15 +1,22 @@
 using StructureHelper.Infrastructure;
+using StructureHelper.Services.Exports;
 using StructureHelper.Windows.CalculationWindows.CalculatorsViews;
 using StructureHelperLogics.Models.BeamShears;
+using StructureHelperLogics.NdmCalculations.Analyses;
+using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
+using System.Windows;
+using System.Windows.Input;
 
 namespace StructureHelper.Windows.BeamShears
 {
     public class BeamShearResultViewModel : ViewModelBase
     {
         private IBeamShearCalculatorResult result;
+        private RelayCommand showSectionResultsCommand;
+        private RelayCommand showDiagramCommand;
+        private RelayCommand exportToExcelCommand;
+
         public IBeamShearActionResult SelectedResult { get; set; }
         public List<IBeamShearActionResult> ActionResults => result.ActionResults;
         public ValidResultCounterVM ValidResultCounter { get; }
@@ -20,5 +27,35 @@ namespace StructureHelper.Windows.BeamShears
             ValidResultCounter = new(this.result.ActionResults);
         }
 
+        public ICommand ShowSectionResultsCommand => showSectionResultsCommand ??= new RelayCommand(ShowSectionResults, o=>SelectedResult != null);
+        public ICommand ShowDiagramCommand => showDiagramCommand ??= new RelayCommand(Show2DDiagram, o=>SelectedResult != null);
+        public ICommand ExportToExcelCommand => exportToExcelCommand ??= new RelayCommand(ExportToExcel, o=>SelectedResult != null);
+
+        private void ExportToExcel(object obj)
+        {
+            if (SelectedResult is null) { return; }
+            var inputData = new ExportToFileInputData
+            {
+                Filter = "csv |*.csv",
+                Title = "Save in *.csv File"
+            };
+            var logic = new ExportActionResultToCSVLogic(SelectedResult);
+            var exportService = new ExportToFileService(inputData, logic);
+            exportService.Export();
+        }
+
+        private void Show2DDiagram(object obj)
+        {
+            if (SelectedResult is null) { return; }
+            var logic = new ShearDiagramLogic(SelectedResult);
+            logic.ShowWindow();
+        }
+
+        private void ShowSectionResults(object commandParameter)
+        {
+            if (SelectedResult is null) { return; }
+            Window window = new BeamShearActionResultView(SelectedResult);
+            window.ShowDialog();
+        }
     }
 }
diff --git a/StructureHelper/Windows/BeamShears/ExportActionResultToCSVLogic.cs b/StructureHelper/Windows/BeamShears/ExportActionResultToCSVLogic.cs
new file mode 100644
index 0000000..9cf1525
--- /dev/null
+++ b/StructureHelper/Windows/BeamShears/ExportActionResultToCSVLogic.cs
@@ -0,0 +1,69 @@
+using StructureHelperCommon.Models.Calculators;
+using StructureHelperLogics.Models.BeamShears;
+using StructureHelperLogics.NdmCalculations.Analyses;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelper.Windows.BeamShears
+{
+    public class ExportActionResultToCSVLogic : ExportToCSVLogicBase
+    {
+        private IBeamShearActionResult result;
+
+        public ExportActionResultToCSVLogic(IBeamShearActionResult result)
+        {
+            this.result = result;
+        }
+
+        public override void ExportHeadings()
+        {
+            string[] headings =
+                {
+                    "Limit State",
+                    "Calc duration",
+                    "Section start,m",
+                    "Section end, m",
+                    "Nz, N",
+                    "Qy, N",
+                    "Width, m",
+                    "Effective depth, m",
+                    "Full depth, m",
+                    "Concrete compressive strength, Pa",
+                    "Concrete tensile strength, Pa",
+                    "Limit force, N",
+                    "Concrete force, N",
+                    "Stirrups force, N",
+                    "Description",
+                };
+            output.AppendLine(string.Join(separator, headings));
+        }
+        public override void ExportBoby()
+        {
+            foreach (var item in result.SectionResults)
+            {
+                string[] newLine =
+                    {
+                            result.LimitState.ToString(),
+                            result.CalcTerm.ToString(),
+                            item.InputData.InclinedSection.StartCoord.ToString(),
+                            item.InputData.InclinedSection.EndCoord.ToString(),
+                            item.InputData.ForceTuple.Nz.ToString(),
+                            item.InputData.ForceTuple.Qy.ToString(),
+                            item.InputData.InclinedSection.WebWidth.ToString(),
+                            item.InputData.InclinedSection.EffectiveDepth.ToString(),
+                            item.InputData.InclinedSection.FullDepth.ToString(),
+                            item.InputData.InclinedSection.ConcreteCompressionStrength.ToString(),
+                            item.InputData.InclinedSection.ConcreteTensionStrength.ToString(),
+                            item.TotalStrength.ToString(),
+                            item.ConcreteStrength.ToString(),
+                            item.StirrupStrength.ToString(),
+                            item.Description,
+                        };
+                output.AppendLine(string.Join(separator, newLine));
+            }
+        }
+    }
+}
diff --git a/StructureHelper/Windows/BeamShears/ShearDiagramLogic.cs b/StructureHelper/Windows/BeamShears/ShearDiagramLogic.cs
new file mode 100644
index 0000000..2e65268
--- /dev/null
+++ b/StructureHelper/Windows/BeamShears/ShearDiagramLogic.cs
@@ -0,0 +1,81 @@
+using StructureHelper.Windows.Graphs;
+using StructureHelper.Windows.ViewModels.Errors;
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Models.Parameters;
+using StructureHelperCommon.Services.Units;
+using StructureHelperLogics.Models.BeamShears;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace StructureHelper.Windows.BeamShears
+{
+    public class ShearDiagramLogic
+    {
+        const string ForceUnitString = "kN";
+
+        private IBeamShearActionResult result;
+        private IUnit unitForce;
+
+        public ShearDiagramLogic(IBeamShearActionResult result)
+        {
+            this.result = result;
+            IGetUnitLogic unitLogic = new GetUnitLogic();
+            unitForce = unitLogic.GetUnit(UnitTypes.Force, ForceUnitString);
+        }
+
+        public void ShowWindow()
+        {
+            SafetyProcessor.RunSafeProcess(() =>
+            {
+                var seriesList = new List<Series>();
+                var series = new Series(GetParametersByCurveResult()) { Name = "" };
+                seriesList.Add(series);
+                var vm = new GraphViewModel(seriesList);
+                var wnd = new GraphView(vm);
+                wnd.ShowDialog();
+            },
+            "Errors appeared during showing a graph, see detailed information");
+        }
+        private ArrayParameter<double> GetParametersByCurveResult()
+        {
+            List<IBeamShearSectionLogicResult> results = result.SectionResults
+                .Where(x => x.InputData.InclinedSection.StartCoord == 0)
+                .ToList();
+            var labels = GetLabels();
+            var arrayParameter = new ArrayParameter<double>(results.Count(), labels.Count(), labels);
+            var data = arrayParameter.Data;
+            for (int i = 0; i < results.Count(); i++)
+            {
+                var valueList = new List<double>
+                    {
+                    results[i].InputData.InclinedSection.EndCoord,
+                    results[i].InputData.ForceTuple.Nz * unitForce.Multiplyer,
+                    results[i].InputData.ForceTuple.Qy * unitForce.Multiplyer,
+                    results[i].TotalStrength * unitForce.Multiplyer,
+                    results[i].ConcreteStrength * unitForce.Multiplyer,
+                    results[i].StirrupStrength * unitForce.Multiplyer,
+                    results[i].FactorOfUsing,
+                    };
+                for (int j = 0; j < valueList.Count; j++)
+                {
+                    data[i, j] = valueList[j];
+                }
+            }
+            return arrayParameter;
+        }
+        private List<string> GetLabels()
+        {
+            List<string> strings = new()
+            {
+                "End coord",
+                "Nz",
+                "Qy",
+                "Qlim",
+                "Qb",
+                "Qsw",
+                "Uf"
+            };
+            return strings;
+        }
+    }
+}
diff --git a/StructureHelper/Windows/ViewModels/Factories/SourceTargetFactory.cs b/StructureHelper/Windows/ViewModels/Factories/SourceTargetFactory.cs
index 15cbf46..ca693cc 100644
--- a/StructureHelper/Windows/ViewModels/Factories/SourceTargetFactory.cs
+++ b/StructureHelper/Windows/ViewModels/Factories/SourceTargetFactory.cs
@@ -25,7 +25,7 @@ namespace StructureHelper.Windows.ViewModels
                 result.SetTargetItems(viewPrimitives);
             }
             result.SetSourceItems(sourceViewPrimitives);
-            result.ItemDataDemplate = GetDataTemplate(ColoredItemTemplate);
+            result.ItemDataTemplate = GetDataTemplate(ColoredItemTemplate);
             return result;
         }
 
@@ -34,7 +34,7 @@ namespace StructureHelper.Windows.ViewModels
             var result = new SourceTargetVM<IForceAction>();
             result.SetTargetItems(targetCombinations);
             result.SetSourceItems(allowedCombinations);
-            result.ItemDataDemplate = GetDataTemplate(SimpleItemTemplate);
+            result.ItemDataTemplate = GetDataTemplate(SimpleItemTemplate);
             return result;
         }
 
diff --git a/StructureHelper/Windows/ViewModels/Primitives/SelectPrimitivesSourceTarget.cs b/StructureHelper/Windows/ViewModels/Primitives/SelectPrimitivesSourceTarget.cs
index 1641aa3..7a16aa9 100644
--- a/StructureHelper/Windows/ViewModels/Primitives/SelectPrimitivesSourceTarget.cs
+++ b/StructureHelper/Windows/ViewModels/Primitives/SelectPrimitivesSourceTarget.cs
@@ -1,13 +1,7 @@
 using StructureHelper.Infrastructure.UI.DataContexts;
-using StructureHelper.Properties;
-using StructureHelper.Windows.ViewModels.Materials;
 using StructureHelperCommon.Models.Parameters;
 using StructureHelperLogics.NdmCalculations.Primitives;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace StructureHelper.Windows.ViewModels
 {
diff --git a/StructureHelper/Windows/ViewModels/SourceTargetVM.cs b/StructureHelper/Windows/ViewModels/SourceTargetVM.cs
index 79fdcc5..e85aa53 100644
--- a/StructureHelper/Windows/ViewModels/SourceTargetVM.cs
+++ b/StructureHelper/Windows/ViewModels/SourceTargetVM.cs
@@ -1,12 +1,7 @@
 using StructureHelper.Infrastructure;
-using StructureHelperCommon.Models.Forces;
-using StructureHelperLogics.NdmCalculations.Analyses.ByForces;
-using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 
 namespace StructureHelper.Windows.ViewModels
@@ -24,7 +19,7 @@ namespace StructureHelper.Windows.ViewModels
         public TItem SelectedTargetItem { get; set; }
         public ObservableCollection<TItem> SourceItems { get; }
         public ObservableCollection<TItem> TargetItems { get; }
-        public DataTemplate ItemDataDemplate { get; set; }
+        public DataTemplate ItemDataTemplate { get; set; }
         public RelayCommand AddAll
         {
             get
diff --git a/StructureHelperCommon/Infrastructures/Interfaces/IGetFactorLogic.cs b/StructureHelperCommon/Infrastructures/Interfaces/IGetFactorLogic.cs
new file mode 100644
index 0000000..0a6b978
--- /dev/null
+++ b/StructureHelperCommon/Infrastructures/Interfaces/IGetFactorLogic.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperCommon.Infrastructures.Interfaces
+{
+    public interface IGetFactorLogic : ILogic
+    {
+        double GetFactor();
+    }
+}
diff --git a/StructureHelperCommon/Models/Forces/BeamShearActions/BeamShearActionUpdateStrategy.cs b/StructureHelperCommon/Models/Forces/BeamShearActions/BeamShearActionUpdateStrategy.cs
index 8d90d58..aea50a2 100644
--- a/StructureHelperCommon/Models/Forces/BeamShearActions/BeamShearActionUpdateStrategy.cs
+++ b/StructureHelperCommon/Models/Forces/BeamShearActions/BeamShearActionUpdateStrategy.cs
@@ -11,6 +11,7 @@ namespace StructureHelperCommon.Models.Forces.BeamShearActions
             CheckObject.IsNull(targetObject);
             CheckObject.IsNull(sourceObject);
             if (ReferenceEquals(targetObject, sourceObject)) { return; }
+            targetObject.Name = sourceObject.Name;
             InitializeStrategies();
             CheckObject.IsNull(sourceObject.SupportAction);
             CheckObject.IsNull(targetObject.SupportAction);
diff --git a/StructureHelperCommon/Models/Materials/Libraries/IFactorLogic.cs b/StructureHelperCommon/Models/Materials/Libraries/IMaterialFactorLogic.cs
similarity index 90%
rename from StructureHelperCommon/Models/Materials/Libraries/IFactorLogic.cs
rename to StructureHelperCommon/Models/Materials/Libraries/IMaterialFactorLogic.cs
index dbfb1b1..b0b0daf 100644
--- a/StructureHelperCommon/Models/Materials/Libraries/IFactorLogic.cs
+++ b/StructureHelperCommon/Models/Materials/Libraries/IMaterialFactorLogic.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace StructureHelperCommon.Models.Materials.Libraries
 {
-    public interface IFactorLogic
+    public interface IMaterialFactorLogic
     {
         List<IMaterialSafetyFactor> SafetyFactors { get; }
         (double Compressive, double Tensile) GetTotalFactor(LimitStates limitState, CalcTerms calcTerm);
diff --git a/StructureHelperCommon/Models/Materials/Libraries/FactorLogic.cs b/StructureHelperCommon/Models/Materials/Libraries/MaterialFactorLogic.cs
similarity index 86%
rename from StructureHelperCommon/Models/Materials/Libraries/FactorLogic.cs
rename to StructureHelperCommon/Models/Materials/Libraries/MaterialFactorLogic.cs
index d6d7968..cb2ba6b 100644
--- a/StructureHelperCommon/Models/Materials/Libraries/FactorLogic.cs
+++ b/StructureHelperCommon/Models/Materials/Libraries/MaterialFactorLogic.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace StructureHelperCommon.Models.Materials.Libraries
 {
-    public class FactorLogic : IFactorLogic
+    public class MaterialFactorLogic : IMaterialFactorLogic
     {
         public List<IMaterialSafetyFactor> SafetyFactors { get; }
         public (double Compressive, double Tensile) GetTotalFactor(LimitStates limitState, CalcTerms calcTerm)
@@ -21,7 +21,7 @@ namespace StructureHelperCommon.Models.Materials.Libraries
             }
             return (compressionVal, tensionVal);
         }
-        public FactorLogic(List<IMaterialSafetyFactor> safetyFactors)
+        public MaterialFactorLogic(List<IMaterialSafetyFactor> safetyFactors)
         {
             SafetyFactors = safetyFactors;
         }
diff --git a/StructureHelperCommon/Models/Materials/MaterialCommonOptionLogic.cs b/StructureHelperCommon/Models/Materials/MaterialCommonOptionLogic.cs
index f5b1f7d..746cf49 100644
--- a/StructureHelperCommon/Models/Materials/MaterialCommonOptionLogic.cs
+++ b/StructureHelperCommon/Models/Materials/MaterialCommonOptionLogic.cs
@@ -10,7 +10,7 @@ namespace StructureHelperCommon.Models.Materials
     public class MaterialCommonOptionLogic : IMaterialOptionLogic
     {
         private IMaterialLogicOptions options;
-        private FactorLogic factorLogic;
+        private MaterialFactorLogic factorLogic;
 
         public MaterialCommonOptionLogic(IMaterialLogicOptions options)
         {
@@ -29,7 +29,7 @@ namespace StructureHelperCommon.Models.Materials
 
         private void ProcessExternalFactors(IMaterialOptions materialOptions)
         {
-            factorLogic = new FactorLogic(options.SafetyFactors);
+            factorLogic = new MaterialFactorLogic(options.SafetyFactors);
             var strength = factorLogic.GetTotalFactor(options.LimitState, options.CalcTerm);
             materialOptions.ExternalFactor.Compressive = strength.Compressive;
             materialOptions.ExternalFactor.Tensile = strength.Tensile;
diff --git a/StructureHelperLogics/Models/BeamShears/BeamShearActionResult.cs b/StructureHelperLogics/Models/BeamShears/BeamShearActionResult.cs
index 423e885..d6b1395 100644
--- a/StructureHelperLogics/Models/BeamShears/BeamShearActionResult.cs
+++ b/StructureHelperLogics/Models/BeamShears/BeamShearActionResult.cs
@@ -15,6 +15,8 @@ namespace StructureHelperLogics.Models.BeamShears
         public string? Description { get; set; }
         /// <inheritdoc/>
         public LimitStates LimitState { get; set; }
+        public IBeamShearSection Section { get; set; }
+        public IStirrup Stirrup { get; set; }
         public CalcTerms CalcTerm { get; set; }
         public IBeamShearAction BeamShearAction { get; set; }
         public List<IBeamShearSectionLogicResult> SectionResults { get; set; } = new();
diff --git a/StructureHelperLogics/Models/BeamShears/BeamShearCalculator.cs b/StructureHelperLogics/Models/BeamShears/BeamShearCalculator.cs
index 0033407..cd75d1f 100644
--- a/StructureHelperLogics/Models/BeamShears/BeamShearCalculator.cs
+++ b/StructureHelperLogics/Models/BeamShears/BeamShearCalculator.cs
@@ -1,6 +1,7 @@
 using StructureHelperCommon.Infrastructures.Interfaces;
 using StructureHelperCommon.Models;
 using StructureHelperCommon.Models.Calculators;
+using StructureHelperCommon.Models.Loggers;
 
 namespace StructureHelperLogics.Models.BeamShears
 {
@@ -18,6 +19,7 @@ namespace StructureHelperLogics.Models.BeamShears
         public IResult Result => result;
 
         public IShiftTraceLogger? TraceLogger { get; set; }
+        public bool ShowTraceData { get; set; } = false;
 
         public BeamShearCalculator(Guid id)
         {
@@ -34,6 +36,7 @@ namespace StructureHelperLogics.Models.BeamShears
 
         public void Run()
         {
+            TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
             PrepareNewResult();
             //PrepareInputData();
             try
@@ -82,7 +85,8 @@ namespace StructureHelperLogics.Models.BeamShears
             result = new BeamShearCalculatorResult()
             {
                 IsValid = true,
-                Description = string.Empty
+                Description = string.Empty,
+                InputData = InputData
             };
         }
     }
diff --git a/StructureHelperLogics/Models/BeamShears/BeamShearCalculatorLogic.cs b/StructureHelperLogics/Models/BeamShears/BeamShearCalculatorLogic.cs
index 93c8ccd..a528f1b 100644
--- a/StructureHelperLogics/Models/BeamShears/BeamShearCalculatorLogic.cs
+++ b/StructureHelperLogics/Models/BeamShears/BeamShearCalculatorLogic.cs
@@ -2,6 +2,7 @@
 using StructureHelperCommon.Infrastructures.Interfaces;
 using StructureHelperCommon.Models;
 using StructureHelperCommon.Models.Forces;
+using StructureHelperCommon.Models.Loggers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,10 +13,10 @@ namespace StructureHelperLogics.Models.BeamShears
 {
     public class BeamShearCalculatorLogic : IGetResultByInputDataLogic<IBeamShearCalculatorInputData, IBeamShearCalculatorResult>
     {
-        private const LimitStates CollapsLimitState = LimitStates.ULS;
+        private const LimitStates CollapseLimitState = LimitStates.ULS;
         private IBeamShearCalculatorResult result;
         private IBeamShearSectionLogic beamShearSectionLogic;
-        private List<IBeamShearSectionLogicInputData> sectionInputDatas;
+        private List<IBeamShearActionResult> actionResults;
         private IBeamShearCalculatorInputData inputData;
         private List<CalcTerms> calcTerms = new() { CalcTerms.LongTerm, CalcTerms.ShortTerm };
 
@@ -29,13 +30,14 @@ namespace StructureHelperLogics.Models.BeamShears
 
         public IBeamShearCalculatorResult GetResultByInputData(IBeamShearCalculatorInputData inputData)
         {
+            TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
             this.inputData = inputData;
             PrepareNewResult();
             InitializeStrategies();
             try
             {
-                GetSectionInputDatas();
-                CalculateResult();
+                GetSections();
+                result.ActionResults = actionResults;
             }
             catch (Exception ex)
             {
@@ -46,20 +48,17 @@ namespace StructureHelperLogics.Models.BeamShears
             return result;
         }
 
-        private void CalculateResult()
+        private IBeamShearSectionLogicResult CalculateResult(IBeamShearSectionLogicInputData sectionInputData)
         {
-            foreach (var sectionInputData in sectionInputDatas)
-            {
-                beamShearSectionLogic.InputData = sectionInputData;
-                beamShearSectionLogic.Run();
-                var sectionResult = beamShearSectionLogic.Result as IBeamShearSectionLogicResult;
-                //result.ActionResults.Add(sectionResult);
-            }
+            beamShearSectionLogic.InputData = sectionInputData;
+            beamShearSectionLogic.Run();
+            var sectionResult = beamShearSectionLogic.Result as IBeamShearSectionLogicResult;
+            return sectionResult;
         }
 
         private void InitializeStrategies()
         {
-            beamShearSectionLogic ??= new BeamShearSectionLogic();
+            beamShearSectionLogic ??= new BeamShearSectionLogic(TraceLogger);
         }
 
         private void PrepareNewResult()
@@ -71,40 +70,92 @@ namespace StructureHelperLogics.Models.BeamShears
             };
         }
 
-        private void GetSectionInputDatas()
+        private void GetSections()
         {
-            sectionInputDatas = new();
-            foreach (var beamShearSection in inputData.Sections)
+            actionResults = new();
+            foreach (var beamShearAction in inputData.Actions)
             {
-                List<IInclinedSection> inclinedSections = GetInclinedSections(beamShearSection);
-                foreach (var inclinedSection in inclinedSections)
+                foreach (var calcTerm in calcTerms)
                 {
-                    GetSections(inclinedSection);
+                    foreach (var section in inputData.Sections)
+                    {
+                        foreach (var stirrup in inputData.Stirrups)
+                        {
+                            List<IInclinedSection> inclinedSections = GetInclinedSections(section);
+                            List<IBeamShearSectionLogicInputData> sectionInputDatas = GetSectionInputDatas(beamShearAction, calcTerm, section, stirrup, inclinedSections);
+                            List<IBeamShearSectionLogicResult> sectionResults = GetSectionResults(sectionInputDatas);
+                            BeamShearActionResult actionResult = GetActionResult(beamShearAction, calcTerm, section, stirrup, sectionResults);
+                            actionResults.Add(actionResult);
+                        }
+                    }
                 }
             }
         }
 
-        private void GetSections(IInclinedSection inclinedSection)
+        private BeamShearActionResult GetActionResult(IBeamShearAction beamShearAction, CalcTerms calcTerm, IBeamShearSection section, IStirrup stirrup, List<IBeamShearSectionLogicResult> sectionResults)
         {
-            foreach (var stirrup in inputData.Stirrups)
+            BeamShearActionResult actionResult = PrepareNewActionResult(beamShearAction, calcTerm, section, stirrup);
+            if (sectionResults.Any(x => x.IsValid == false))
             {
-                foreach (var beamShearAction in inputData.Actions)
+                actionResult.IsValid = false;
+                if (actionResult.Description.Length > 0)
                 {
-                    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);
-                    }
+                    actionResult.Description += "\n";
                 }
+                actionResult.Description += $"There are {sectionResults.Count(x => x.IsValid == false)} invalid section result(s)";
             }
+            actionResult.SectionResults = sectionResults;
+            return actionResult;
+        }
+
+        private List<IBeamShearSectionLogicResult> GetSectionResults(List<IBeamShearSectionLogicInputData> sectionInputDatas)
+        {
+            List<IBeamShearSectionLogicResult> sectionResults = new();
+            foreach (var item in sectionInputDatas)
+            {
+                IBeamShearSectionLogicResult sectionResult = CalculateResult(item);
+                sectionResults.Add(sectionResult);
+            }
+
+            return sectionResults;
+        }
+
+        private List<IBeamShearSectionLogicInputData> GetSectionInputDatas(IBeamShearAction beamShearAction, CalcTerms calcTerm, IBeamShearSection section, IStirrup stirrup, List<IInclinedSection> inclinedSections)
+        {
+            List<IBeamShearSectionLogicInputData> sectionInputDatas = new();
+            var material = section.Material;
+            var strength = material.GetStrength(CollapseLimitState, calcTerm);
+            foreach (var inclinedSection in inclinedSections)
+            {
+                inclinedSection.ConcreteCompressionStrength = strength.Compressive;
+                inclinedSection.ConcreteTensionStrength = strength.Tensile;
+                IForceTuple forceTuple = GetForceTupleByShearAction(beamShearAction, inclinedSection, CollapseLimitState, calcTerm);
+                BeamShearSectionLogicInputData newInputData = new(Guid.NewGuid())
+                {
+                    InclinedSection = inclinedSection,
+                    Stirrup = stirrup,
+                    ForceTuple = forceTuple,
+                    LimitState = CollapseLimitState,
+                    CalcTerm = calcTerm
+                };
+                sectionInputDatas.Add(newInputData);
+            }
+
+            return sectionInputDatas;
+        }
+
+        private static BeamShearActionResult PrepareNewActionResult(IBeamShearAction beamShearAction, CalcTerms calcTerm, IBeamShearSection section, IStirrup stirrup)
+        {
+            return new()
+            {
+                IsValid = true,
+                Description = string.Empty,
+                BeamShearAction = beamShearAction,
+                LimitState = CollapseLimitState,
+                CalcTerm = calcTerm,
+                Section = section,
+                Stirrup = stirrup
+            };
         }
 
         private List<IInclinedSection> GetInclinedSections(IBeamShearSection beamShearSection)
diff --git a/StructureHelperLogics/Models/BeamShears/BeamShearCalculatorResult.cs b/StructureHelperLogics/Models/BeamShears/BeamShearCalculatorResult.cs
index 6e841ba..5dc2497 100644
--- a/StructureHelperLogics/Models/BeamShears/BeamShearCalculatorResult.cs
+++ b/StructureHelperLogics/Models/BeamShears/BeamShearCalculatorResult.cs
@@ -6,10 +6,16 @@ using System.Threading.Tasks;
 
 namespace StructureHelperLogics.Models.BeamShears
 {
+    /// <inheritdoc/>
     public class BeamShearCalculatorResult : IBeamShearCalculatorResult
     {
+        /// <inheritdoc/>
         public bool IsValid { get; set; } = true;
+        /// <inheritdoc/>
         public string? Description { get; set; } = string.Empty;
+        /// <inheritdoc/>
+        public IBeamShearCalculatorInputData InputData { get; set; }
+        /// <inheritdoc/>
         public List<IBeamShearActionResult> ActionResults { get; set; } = new();
     }
 }
diff --git a/StructureHelperLogics/Models/BeamShears/BeamShearSectionCalculatorResult.cs b/StructureHelperLogics/Models/BeamShears/BeamShearSectionCalculatorResult.cs
deleted file mode 100644
index 3b3507b..0000000
--- a/StructureHelperLogics/Models/BeamShears/BeamShearSectionCalculatorResult.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace StructureHelperLogics.Models.BeamShears
-{
-    public class BeamShearSectionCalculatorResult : IBeamShearSectionLogicResult
-    {
-        public bool IsValid { get; set; }
-        public string? Description { get; set; }
-    }
-}
diff --git a/StructureHelperLogics/Models/BeamShears/BeamShearSectionLogic.cs b/StructureHelperLogics/Models/BeamShears/BeamShearSectionLogic.cs
index f89f54e..a618b65 100644
--- a/StructureHelperLogics/Models/BeamShears/BeamShearSectionLogic.cs
+++ b/StructureHelperLogics/Models/BeamShears/BeamShearSectionLogic.cs
@@ -1,26 +1,82 @@
 using StructureHelperCommon.Models;
 using StructureHelperCommon.Models.Calculators;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using StructureHelperCommon.Models.Loggers;
+using StructureHelperLogics.Models.BeamShears.Logics;
 
 namespace StructureHelperLogics.Models.BeamShears
 {
     public class BeamShearSectionLogic : IBeamShearSectionLogic
     {
-        private IBeamShearSectionLogicResult result;
+        private BeamShearSectionLogicResult result;
+        private ConcreteStrengthLogic concreteLogic;
+        private StirrupStrengthLogic stirrupLogic;
 
         public IBeamShearSectionLogicInputData InputData { get; set; }
         public IShiftTraceLogger? TraceLogger { get; set; }
 
+        public BeamShearSectionLogic(IShiftTraceLogger? traceLogger)
+        {
+            TraceLogger = traceLogger;
+        }
+
         public IResult Result => result;
 
 
         public void Run()
         {
-            throw new NotImplementedException();
+            TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
+            PrepareNewResult();
+            InitializeStrategies();
+            try
+            {
+                CalculateResult();
+            }
+            catch (Exception ex)
+            {
+                result.IsValid = false;
+                result.Description += ex.Message;
+            }
+        }
+
+        private void CalculateResult()
+        {
+            double concreteStrength = concreteLogic.GetShearStrength();
+            result.ConcreteStrength = concreteStrength;
+            double stirrupStrength = stirrupLogic.GetShearStrength();
+            result.StirrupStrength = stirrupStrength;
+            double totalStrength = concreteStrength + stirrupStrength;
+            result.TotalStrength = totalStrength;
+            double actualShearForce = InputData.ForceTuple.Qy;
+            if (actualShearForce > totalStrength)
+            {
+                result.IsValid = false;
+                string message = $"Actual shear force Qa = {actualShearForce}(N), greater than bearing capacity Olim = {totalStrength}(N)";
+                result.Description += message;
+                TraceLogger?.AddMessage(message, TraceLogStatuses.Error);
+            }
+            else
+            {
+                string message = $"Actual shear force Qa = {actualShearForce}(N), not greater than bearing capacity Olim = {totalStrength}(N)";
+                TraceLogger?.AddMessage(message);
+            }
+        }
+
+        private void InitializeStrategies()
+        {
+            var sectionEffectiveness = SectionEffectivenessFactory.GetSheaEffectiveness(BeamShearSectionType.Rectangle);
+            double longitudinalForce = InputData.ForceTuple.Nz;
+            concreteLogic = new(sectionEffectiveness, InputData.InclinedSection, longitudinalForce, TraceLogger);
+            stirrupLogic = new(InputData.Stirrup, InputData.InclinedSection, TraceLogger);
+        }
+
+        private void PrepareNewResult()
+        {
+            result = new()
+            {
+                IsValid = true,
+                Description = string.Empty,
+                InputData = InputData
+            };
         }
     }
 }
diff --git a/StructureHelperLogics/Models/BeamShears/BeamShearSectionLogicResult.cs b/StructureHelperLogics/Models/BeamShears/BeamShearSectionLogicResult.cs
new file mode 100644
index 0000000..d91bf1b
--- /dev/null
+++ b/StructureHelperLogics/Models/BeamShears/BeamShearSectionLogicResult.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.Models.BeamShears
+{
+    public class BeamShearSectionLogicResult : IBeamShearSectionLogicResult
+    {
+        public bool IsValid { get; set; }
+        public string? Description { get; set; }
+        public IBeamShearSectionLogicInputData InputData { get; set; }
+        public double ConcreteStrength { get; set; }
+        public double StirrupStrength { get; set; }
+        public double TotalStrength { get; set; }
+        public double FactorOfUsing { get => InputData.ForceTuple.Qy / TotalStrength; }
+    }
+}
diff --git a/StructureHelperLogics/Models/BeamShears/IBeamShearActionResult.cs b/StructureHelperLogics/Models/BeamShears/IBeamShearActionResult.cs
index b14d91a..4786edc 100644
--- a/StructureHelperLogics/Models/BeamShears/IBeamShearActionResult.cs
+++ b/StructureHelperLogics/Models/BeamShears/IBeamShearActionResult.cs
@@ -14,6 +14,8 @@ namespace StructureHelperLogics.Models.BeamShears
     {
         LimitStates LimitState { get; set; }
         CalcTerms CalcTerm { get; set; }
+        IBeamShearSection Section { get; set; }
+        IStirrup Stirrup { get; set; }  
         IBeamShearAction BeamShearAction { get; set; }
         List<IBeamShearSectionLogicResult> SectionResults { get; set; }
     }
diff --git a/StructureHelperLogics/Models/BeamShears/IBeamShearCalculator.cs b/StructureHelperLogics/Models/BeamShears/IBeamShearCalculator.cs
index 434b9d6..bf371e4 100644
--- a/StructureHelperLogics/Models/BeamShears/IBeamShearCalculator.cs
+++ b/StructureHelperLogics/Models/BeamShears/IBeamShearCalculator.cs
@@ -10,5 +10,6 @@ namespace StructureHelperLogics.Models.BeamShears
     public interface IBeamShearCalculator : ICalculator
     {
         IBeamShearCalculatorInputData InputData { get; set; }
+        bool ShowTraceData { get; set; }
     }
 }
diff --git a/StructureHelperLogics/Models/BeamShears/IBeamShearCalculatorResult.cs b/StructureHelperLogics/Models/BeamShears/IBeamShearCalculatorResult.cs
index 25dd9ce..4e29ca7 100644
--- a/StructureHelperLogics/Models/BeamShears/IBeamShearCalculatorResult.cs
+++ b/StructureHelperLogics/Models/BeamShears/IBeamShearCalculatorResult.cs
@@ -7,8 +7,12 @@ using System.Threading.Tasks;
 
 namespace StructureHelperLogics.Models.BeamShears
 {
+    /// <summary>
+    /// Implements group of results for beam shear calculator
+    /// </summary>
     public interface IBeamShearCalculatorResult : IResult
     {
+        IBeamShearCalculatorInputData InputData {get;set;}
         List<IBeamShearActionResult> ActionResults { get; set; }
     }
 }
diff --git a/StructureHelperLogics/Models/BeamShears/IBeamShearSectionLogicResult.cs b/StructureHelperLogics/Models/BeamShears/IBeamShearSectionLogicResult.cs
index 62460b2..f3d70c8 100644
--- a/StructureHelperLogics/Models/BeamShears/IBeamShearSectionLogicResult.cs
+++ b/StructureHelperLogics/Models/BeamShears/IBeamShearSectionLogicResult.cs
@@ -9,5 +9,10 @@ namespace StructureHelperLogics.Models.BeamShears
 {
     public interface IBeamShearSectionLogicResult : IResult
     {
+        IBeamShearSectionLogicInputData InputData { get; set; }
+        public double ConcreteStrength { get; set; }
+        public double StirrupStrength { get; set; }
+        public double TotalStrength { get; set; }
+        public double FactorOfUsing { get; }
     }
 }
diff --git a/StructureHelperLogics/Models/BeamShears/IInclinedSection.cs b/StructureHelperLogics/Models/BeamShears/IInclinedSection.cs
index 183f450..dee041f 100644
--- a/StructureHelperLogics/Models/BeamShears/IInclinedSection.cs
+++ b/StructureHelperLogics/Models/BeamShears/IInclinedSection.cs
@@ -24,6 +24,14 @@ namespace StructureHelperLogics.Models.BeamShears
         /// Coordinate of end of inclined cross-section
         /// </summary>
         double EndCoord { get; set; }
+        /// <summary>
+        /// Strength of concrete in compression, Pa
+        /// </summary>
+        double ConcreteCompressionStrength { get; set; }
+        /// <summary>
+        /// Strength of concrete in tension, Pa
+        /// </summary>
+        double ConcreteTensionStrength { get; set; }
 
     }
 }
diff --git a/StructureHelperLogics/Models/BeamShears/ISectionEffectiveness.cs b/StructureHelperLogics/Models/BeamShears/ISectionEffectiveness.cs
index b164f47..a7b36cd 100644
--- a/StructureHelperLogics/Models/BeamShears/ISectionEffectiveness.cs
+++ b/StructureHelperLogics/Models/BeamShears/ISectionEffectiveness.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace StructureHelperLogics.Models.BeamShears
 {
     /// <summary>
-    /// Properties of concrete cross-section effectiveness for shear
+    /// Implements properties of concrete cross-section effectiveness for shear
     /// </summary>
     public interface ISectionEffectiveness
     {
diff --git a/StructureHelperLogics/Models/BeamShears/InclinedSection.cs b/StructureHelperLogics/Models/BeamShears/InclinedSection.cs
index 94a856e..47d2358 100644
--- a/StructureHelperLogics/Models/BeamShears/InclinedSection.cs
+++ b/StructureHelperLogics/Models/BeamShears/InclinedSection.cs
@@ -19,5 +19,7 @@ namespace StructureHelperLogics.Models.BeamShears
         public double StartCoord { get; set; }
         /// <inheritdoc/>
         public double EndCoord { get; set; }
+        public double ConcreteCompressionStrength { get; set; }
+        public double ConcreteTensionStrength { get; set; }
     }
 }
diff --git a/StructureHelperLogics/Models/BeamShears/Logics/BeamShearCalculatorInputDataUpdateStrategy.cs b/StructureHelperLogics/Models/BeamShears/Logics/BeamShearCalculatorInputDataUpdateStrategy.cs
index b058d24..87aa8a8 100644
--- a/StructureHelperLogics/Models/BeamShears/Logics/BeamShearCalculatorInputDataUpdateStrategy.cs
+++ b/StructureHelperLogics/Models/BeamShears/Logics/BeamShearCalculatorInputDataUpdateStrategy.cs
@@ -16,6 +16,7 @@ namespace StructureHelperLogics.Models.BeamShears
             if (ReferenceEquals(targetObject, sourceObject)) { return; };
             InitializeStrategies();
             hasActionUpdateStrategy?.Update(targetObject, sourceObject);
+            hasSectionsUpdateStrategy?.Update(targetObject, sourceObject);
             hasStirrupsUpdateStrategy?.Update(targetObject, sourceObject);
 
         }
diff --git a/StructureHelperLogics/Models/BeamShears/Logics/BeamShearCalculatorUpdateStrategy.cs b/StructureHelperLogics/Models/BeamShears/Logics/BeamShearCalculatorUpdateStrategy.cs
index 6023d26..6adcf70 100644
--- a/StructureHelperLogics/Models/BeamShears/Logics/BeamShearCalculatorUpdateStrategy.cs
+++ b/StructureHelperLogics/Models/BeamShears/Logics/BeamShearCalculatorUpdateStrategy.cs
@@ -13,6 +13,7 @@ namespace StructureHelperLogics.Models.BeamShears
             CheckObject.IsNull(targetObject, ErrorStrings.TargetObject);
             if (ReferenceEquals(targetObject, sourceObject)) { return; };
             targetObject.Name = sourceObject.Name;
+            targetObject.ShowTraceData = sourceObject.ShowTraceData;
             targetObject.InputData ??= new BeamShearCalculatorInputData(Guid.NewGuid());
             InitializeStrategies();
             inputDataUpdateStrategy.Update(targetObject.InputData, sourceObject.InputData);
diff --git a/StructureHelperLogics/Models/BeamShears/BeamSectionShearStrengthLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/ConcreteStrengthLogic.cs
similarity index 61%
rename from StructureHelperLogics/Models/BeamShears/BeamSectionShearStrengthLogic.cs
rename to StructureHelperLogics/Models/BeamShears/Logics/ConcreteStrengthLogic.cs
index 2a766b3..587acf0 100644
--- a/StructureHelperLogics/Models/BeamShears/BeamSectionShearStrengthLogic.cs
+++ b/StructureHelperLogics/Models/BeamShears/Logics/ConcreteStrengthLogic.cs
@@ -1,24 +1,27 @@
 using StructureHelperCommon.Models;
+using StructureHelperCommon.Models.Loggers;
+using StructureHelperLogics.Models.BeamShears.Logics;
 
 namespace StructureHelperLogics.Models.BeamShears
 {
-    internal class BeamSectionShearStrengthLogic : IBeamShearStrenghLogic
+    public class ConcreteStrengthLogic : IBeamShearStrenghLogic
     {
+        private readonly double longitudinalForce;
         private readonly ISectionEffectiveness sectionEffectiveness;
-        private readonly double concreteStrength;
         private readonly IInclinedSection inclinedSection;
+        private IGetLongitudinalForceFactorLogic getLongitudinalForceFactorLogic;
 
         private double crackLength;
 
-        public BeamSectionShearStrengthLogic(
+        public ConcreteStrengthLogic(
             ISectionEffectiveness sectionEffectiveness,
-            double concreteStrength,
             IInclinedSection inclinedSection,
+            double longitudinalForce,
             IShiftTraceLogger? traceLogger)
         {
             this.sectionEffectiveness = sectionEffectiveness;
-            this.concreteStrength = concreteStrength;
             this.inclinedSection = inclinedSection;
+            this.longitudinalForce = longitudinalForce;
             TraceLogger = traceLogger;
         }
 
@@ -26,18 +29,34 @@ namespace StructureHelperLogics.Models.BeamShears
 
         public double GetShearStrength()
         {
+            TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
+            InitializeStrategies();
             TraceLogger?.AddMessage($"Base shape factor = {sectionEffectiveness.BaseShapeFactor}, (dimensionless)");
             TraceLogger?.AddMessage($"Section shape factor = {sectionEffectiveness.ShapeFactor}, (dimensionless)");
             TraceLogger?.AddMessage($"Effective depth = {inclinedSection.EffectiveDepth}, (m)");
             crackLength = inclinedSection.EndCoord - inclinedSection.StartCoord;
             TraceLogger?.AddMessage($"Crack length = {inclinedSection.EndCoord} - {inclinedSection.StartCoord} = {crackLength}, (m)");
             RestrictCrackLength();
-            double concreteMoment = sectionEffectiveness.BaseShapeFactor * sectionEffectiveness.ShapeFactor * concreteStrength * inclinedSection.WebWidth * inclinedSection.EffectiveDepth * inclinedSection.EffectiveDepth;
-            double shearStrength = concreteMoment / crackLength;
+            SetLongitudinalForce();
+            double factorOfLongitudinalForce = getLongitudinalForceFactorLogic.GetFactor();
+            TraceLogger?.AddMessage($"Factor of  longitudinal force = {factorOfLongitudinalForce}, (dimensionless)");
+            double concreteMoment = sectionEffectiveness.BaseShapeFactor * sectionEffectiveness.ShapeFactor * inclinedSection.ConcreteTensionStrength * inclinedSection.WebWidth * inclinedSection.EffectiveDepth * inclinedSection.EffectiveDepth;
+            double shearStrength = factorOfLongitudinalForce * concreteMoment / crackLength;
             TraceLogger?.AddMessage($"Shear strength of concrete = {shearStrength}, (N)");
             return shearStrength;
         }
 
+        private void InitializeStrategies()
+        {
+            getLongitudinalForceFactorLogic ??= new GetLogitudinalForceFactorLogic(TraceLogger?.GetSimilarTraceLogger(100));
+        }
+
+        private void SetLongitudinalForce()
+        {
+            getLongitudinalForceFactorLogic.LongitudinalForce = longitudinalForce;
+            getLongitudinalForceFactorLogic.InclinedSection = inclinedSection;
+        }
+
         private void RestrictCrackLength()
         {
             double maxCrackLength = sectionEffectiveness.MaxCrackLengthRatio * inclinedSection.EffectiveDepth;
@@ -49,7 +68,7 @@ namespace StructureHelperLogics.Models.BeamShears
                 return;
             }
             double minCrackLength = sectionEffectiveness.MinCrackLengthRatio * inclinedSection.EffectiveDepth;
-            if (crackLength > minCrackLength)
+            if (crackLength < minCrackLength)
             {
                 TraceLogger?.AddMessage($"Crack length c = {crackLength} is less than minimum crack length = {minCrackLength}");
                 crackLength = minCrackLength;
diff --git a/StructureHelperLogics/Models/BeamShears/Logics/GetInclinedSectionListLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/GetInclinedSectionListLogic.cs
index 6319eba..e97a9b9 100644
--- a/StructureHelperLogics/Models/BeamShears/Logics/GetInclinedSectionListLogic.cs
+++ b/StructureHelperLogics/Models/BeamShears/Logics/GetInclinedSectionListLogic.cs
@@ -51,7 +51,8 @@ namespace StructureHelperLogics.Models.BeamShears
             for (int i = 0; i < inputData.StepCount + 1; i++)
             {
                 double endCoord = step * i;
-                coordinates.Add(endCoord);
+                double roundedEndCoord = Math.Round(endCoord, 6);
+                coordinates.Add(roundedEndCoord);
             }
         }
         private void Check()
diff --git a/StructureHelperLogics/Models/BeamShears/Logics/GetLogitudinalForceFactorLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/GetLogitudinalForceFactorLogic.cs
new file mode 100644
index 0000000..9abbf07
--- /dev/null
+++ b/StructureHelperLogics/Models/BeamShears/Logics/GetLogitudinalForceFactorLogic.cs
@@ -0,0 +1,109 @@
+using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Models;
+using StructureHelperCommon.Models.Loggers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.Models.BeamShears.Logics
+{
+    public class GetLogitudinalForceFactorLogic : IGetLongitudinalForceFactorLogic
+    {
+        private const double fstRatioInCompression = 1.25;
+        private const double sndRationInCompression = 0.75;
+        private double sectionArea;
+
+        public IShiftTraceLogger? TraceLogger { get; set; }
+        public IInclinedSection InclinedSection { get; set; }
+        public double LongitudinalForce { get; set; }
+
+        public GetLogitudinalForceFactorLogic(IShiftTraceLogger? traceLogger)
+        {
+            TraceLogger = traceLogger;
+        }
+
+
+        public double GetFactor()
+        {
+            TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
+            TraceLogger?.AddMessage("Logic of calculating of factor of influence of longitudinal force according to SP 63.13330.2018");
+            Check();
+            if (LongitudinalForce == 0)
+            {
+                TraceLogger?.AddMessage("Longitudinal force is zero", TraceLogStatuses.Service);
+                return 1;
+            }
+            sectionArea = InclinedSection.WebWidth * InclinedSection.FullDepth;
+            TraceLogger?.AddMessage($"Area of cross-section Ac = {InclinedSection.WebWidth} * {InclinedSection.FullDepth} = {sectionArea}(m^2)");
+            if (LongitudinalForce < 0)
+            {
+                TraceLogger?.AddMessage($"Longitudinal force N={LongitudinalForce}(N) is negative (compression)", TraceLogStatuses.Service);
+                return GetNegForceResult();
+            }
+            else
+            {
+                TraceLogger?.AddMessage("Longitudinal force N={LongitudinalForce}(N) is positive (tension)", TraceLogStatuses.Service);
+                return GetPosForceResult();
+            }
+        }
+
+        private void Check()
+        {
+            if (InclinedSection is null)
+            {
+                string errorString = ErrorStrings.DataIsInCorrect + "Inclined section is null";
+                TraceLogger?.AddMessage(errorString, TraceLogStatuses.Error);
+                throw new StructureHelperException(errorString);
+            }
+            if (InclinedSection.WebWidth <= 0 || InclinedSection.FullDepth <= 0)
+            {
+                string errorString = ErrorStrings.DataIsInCorrect + $"Inclined section width = {InclinedSection.WebWidth}(m), and full depth = {InclinedSection.FullDepth}, but both of them must be greater than zero";
+                TraceLogger?.AddMessage(errorString, TraceLogStatuses.Error);
+                throw new StructureHelperException(errorString);
+            }
+        }
+
+        private double GetPosForceResult()
+        {
+            double stressInConcrete = LongitudinalForce / sectionArea;
+            TraceLogger?.AddMessage($"Average stress in concrete (positive in tension) Sigma = {LongitudinalForce}(N) / {sectionArea}(m^2) = {stressInConcrete}(Pa)");
+            double concreteStrength = InclinedSection.ConcreteTensionStrength;
+            TraceLogger?.AddMessage($"Concrete strength Rbt = {concreteStrength}(Pa)");
+            double stressRatio = stressInConcrete / concreteStrength;
+            TraceLogger?.AddMessage($"Stress ratio rt = {stressInConcrete} / {concreteStrength} = {stressRatio}(dimensionless)");
+            double factor = 1 - 0.5 * stressRatio;
+            factor = Math.Max(factor, 0);
+            TraceLogger?.AddMessage($"Factor value fi_n = {factor}(dimensionless)");
+            return factor;
+        }
+
+        private double GetNegForceResult()
+        {
+            double stressInConcrete = (-1) * LongitudinalForce / sectionArea;
+            TraceLogger?.AddMessage($"Average stress in concrete (positive in compression) Sigma = {LongitudinalForce}(N) / {sectionArea}(m^2) = {stressInConcrete}(Pa)");
+            double concreteStrength = InclinedSection.ConcreteCompressionStrength;
+            TraceLogger?.AddMessage($"Concrete strength Rb = {concreteStrength}(Pa)");
+            double stressRatio = stressInConcrete / concreteStrength;
+            TraceLogger?.AddMessage($"Stress ratio rc = {stressInConcrete} / {concreteStrength} = {stressRatio}(dimensionless)");
+            double factor;
+            if (stressRatio < fstRatioInCompression)
+            {
+                TraceLogger?.AddMessage($"Stress ratio rc = {stressRatio} < {fstRatioInCompression}");
+                factor = 1 + stressRatio;
+            }
+            else if (stressRatio > sndRationInCompression)
+            {
+                factor = 5 * (1 - stressRatio);
+                factor = Math.Max(factor, 0);
+            }
+            else
+            {
+                factor = 1;
+            }
+            TraceLogger?.AddMessage($"Factor value fi_n = {factor}(dimensionless)");
+            return factor;
+        }
+    }
+}
diff --git a/StructureHelperLogics/Models/BeamShears/IBeamShearStrenghLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/IBeamShearStrenghLogic.cs
similarity index 91%
rename from StructureHelperLogics/Models/BeamShears/IBeamShearStrenghLogic.cs
rename to StructureHelperLogics/Models/BeamShears/Logics/IBeamShearStrenghLogic.cs
index ab4ebe2..5f1f43a 100644
--- a/StructureHelperLogics/Models/BeamShears/IBeamShearStrenghLogic.cs
+++ b/StructureHelperLogics/Models/BeamShears/Logics/IBeamShearStrenghLogic.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace StructureHelperLogics.Models.BeamShears
+namespace StructureHelperLogics.Models.BeamShears.Logics
 {
     /// <summary>
     /// Implement logic for calculation of bearing capacity of inclined section for shear
diff --git a/StructureHelperLogics/Models/BeamShears/Logics/IGetLongitudinalForceFactorLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/IGetLongitudinalForceFactorLogic.cs
new file mode 100644
index 0000000..98891c5
--- /dev/null
+++ b/StructureHelperLogics/Models/BeamShears/Logics/IGetLongitudinalForceFactorLogic.cs
@@ -0,0 +1,15 @@
+using StructureHelperCommon.Infrastructures.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.Models.BeamShears.Logics
+{
+    public interface IGetLongitudinalForceFactorLogic : IGetFactorLogic
+    {
+        public double LongitudinalForce { get; set; }
+        public IInclinedSection InclinedSection { get; set; }
+    }
+}
diff --git a/StructureHelperLogics/Models/BeamShears/Logics/BeamShearStrengthByStirrupDensityLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/StirrupByDensityStrengthLogic.cs
similarity index 69%
rename from StructureHelperLogics/Models/BeamShears/Logics/BeamShearStrengthByStirrupDensityLogic.cs
rename to StructureHelperLogics/Models/BeamShears/Logics/StirrupByDensityStrengthLogic.cs
index 56fa89b..9eeefdc 100644
--- a/StructureHelperLogics/Models/BeamShears/Logics/BeamShearStrengthByStirrupDensityLogic.cs
+++ b/StructureHelperLogics/Models/BeamShears/Logics/StirrupByDensityStrengthLogic.cs
@@ -1,6 +1,7 @@
 using StructureHelperCommon.Models;
 using StructureHelperCommon.Models.Loggers;
 using StructureHelperCommon.Services;
+using StructureHelperLogics.Models.BeamShears.Logics;
 
 //Copyright (c) 2025 Redikultsev Evgeny, Ekaterinburg, Russia
 //All rights reserved.
@@ -8,14 +9,15 @@ using StructureHelperCommon.Services;
 namespace StructureHelperLogics.Models.BeamShears
 {
     /// <inheritdoc/>
-    public class BeamShearStrengthByStirrupDensityLogic : IBeamShearStrenghLogic
+    public class StirrupByDensityStrengthLogic : IBeamShearStrenghLogic
     {
+        private const double minStirrupRatio = 0.25;
         private readonly IStirrupEffectiveness stirrupEffectiveness;
         private readonly IStirrupByDensity stirrupByDensity;
         private readonly IInclinedSection inclinedSection;
 
 
-        public BeamShearStrengthByStirrupDensityLogic(
+        public StirrupByDensityStrengthLogic(
             IStirrupEffectiveness stirrupEffectiveness,
             IStirrupByDensity stirrupByDensity,
             IInclinedSection inclinedSection,
@@ -40,8 +42,16 @@ namespace StructureHelperLogics.Models.BeamShears
             TraceLogger?.AddMessage($"Max length of crack = {stirrupEffectiveness.MaxCrackLengthRatio} * {inclinedSection.EffectiveDepth} = {maxCrackLength}(m)");
             double finalCrackLength = Math.Min(crackLength, maxCrackLength);
             TraceLogger?.AddMessage($"Length of crack = Min({crackLength}, {maxCrackLength}) = {finalCrackLength}(m)");
-            double strength = stirrupEffectiveness.StirrupShapeFactor * stirrupEffectiveness.StirrupPlacementFactor * finalCrackLength * stirrupByDensity.StirrupDensity;
-            TraceLogger?.AddMessage($"Bearing capacity of stirrups V = {stirrupEffectiveness.StirrupShapeFactor} * {stirrupEffectiveness.StirrupPlacementFactor} * {finalCrackLength} * {stirrupByDensity.StirrupDensity} = {strength}(N)");
+            double finalDensity = stirrupEffectiveness.StirrupShapeFactor * stirrupEffectiveness.StirrupPlacementFactor * stirrupByDensity.StirrupDensity;
+            TraceLogger?.AddMessage($"Stirrups design density qsw = {finalDensity}(N/m)");
+            double concreteDensity = inclinedSection.WebWidth * inclinedSection.ConcreteTensionStrength;
+            if (finalDensity < minStirrupRatio * concreteDensity)
+            {
+                TraceLogger?.AddMessage($"Since stirrups design density qsw = {finalDensity}(N/m) less than {minStirrupRatio} * {concreteDensity}, final density is equal to zero");
+                finalDensity = 0;
+            }
+            double strength = finalDensity * finalCrackLength;
+            TraceLogger?.AddMessage($"Bearing capacity of stirrups V = {finalDensity} * {finalCrackLength} = {strength}(N)");
             TraceLogger?.AddMessage("Calculation has been finished successfully", TraceLogStatuses.Debug);
             return strength;
         }
diff --git a/StructureHelperLogics/Models/BeamShears/Logics/StirrupByRebarStrengthLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/StirrupByRebarStrengthLogic.cs
new file mode 100644
index 0000000..c7b8861
--- /dev/null
+++ b/StructureHelperLogics/Models/BeamShears/Logics/StirrupByRebarStrengthLogic.cs
@@ -0,0 +1,60 @@
+using StructureHelperCommon.Infrastructures.Interfaces;
+using StructureHelperCommon.Models;
+
+//Copyright (c) 2025 Redikultsev Evgeny, Ekaterinburg, Russia
+//All rights reserved.
+
+namespace StructureHelperLogics.Models.BeamShears.Logics
+{
+    public class StirrupByRebarStrengthLogic : IBeamShearStrenghLogic
+    {
+        private IStirrupEffectiveness stirrupEffectiveness;
+        private IStirrupByRebar stirrupByRebar;
+        private IInclinedSection inclinedSection;
+        private StirrupByDensityStrengthLogic stirrupDensityStrengthLogic;
+        private IConvertStrategy<IStirrupByDensity, IStirrupByRebar> convertStrategy;
+        public IShiftTraceLogger? TraceLogger { get; set; }
+
+        public StirrupByRebarStrengthLogic(
+            IStirrupEffectiveness stirrupEffectiveness,
+            IStirrupByRebar stirrupByRebar,
+            IInclinedSection inclinedSection,
+            StirrupByDensityStrengthLogic stirrupDensityStrengthLogic,
+            IConvertStrategy<IStirrupByDensity, IStirrupByRebar> convertStrategy,
+            IShiftTraceLogger? traceLogger)
+        {
+            this.stirrupEffectiveness = stirrupEffectiveness;
+            this.stirrupByRebar = stirrupByRebar;
+            this.inclinedSection = inclinedSection;
+            this.stirrupDensityStrengthLogic = stirrupDensityStrengthLogic;
+            this.convertStrategy = convertStrategy;
+            TraceLogger = traceLogger;
+        }
+
+        public StirrupByRebarStrengthLogic(
+            IStirrupEffectiveness stirrupEffectiveness,
+            IStirrupByRebar stirrupByRebar,
+            IInclinedSection inclinedSection,
+            IShiftTraceLogger? traceLogger)
+        {
+            this.stirrupEffectiveness = stirrupEffectiveness;
+            this.stirrupByRebar = stirrupByRebar;
+            this.inclinedSection = inclinedSection;
+            TraceLogger = traceLogger;
+        }
+
+        public double GetShearStrength()
+        {
+            InitializeStrategies();
+            double shearStrength = stirrupDensityStrengthLogic.GetShearStrength();
+            return shearStrength;
+        }
+
+        private void InitializeStrategies()
+        {
+            convertStrategy ??= new StirrupByRebarToDensityConvertStrategy(TraceLogger);
+            IStirrupByDensity stirrupByDensity = convertStrategy.Convert(stirrupByRebar);
+            stirrupDensityStrengthLogic ??= new(stirrupEffectiveness, stirrupByDensity, inclinedSection, TraceLogger);
+        }
+    }
+}
diff --git a/StructureHelperLogics/Models/BeamShears/Logics/StirrupByRebarToDensityConvertStrategy.cs b/StructureHelperLogics/Models/BeamShears/Logics/StirrupByRebarToDensityConvertStrategy.cs
index eb84983..26e1c37 100644
--- a/StructureHelperLogics/Models/BeamShears/Logics/StirrupByRebarToDensityConvertStrategy.cs
+++ b/StructureHelperLogics/Models/BeamShears/Logics/StirrupByRebarToDensityConvertStrategy.cs
@@ -13,6 +13,11 @@ namespace StructureHelperLogics.Models.BeamShears
         public Dictionary<(Guid id, Type type), ISaveable> ReferenceDictionary { get; set; }
         public IShiftTraceLogger TraceLogger { get; set; }
 
+        public StirrupByRebarToDensityConvertStrategy(IShiftTraceLogger traceLogger)
+        {
+            TraceLogger = traceLogger;
+        }
+
         public StirrupByRebarToDensityConvertStrategy(IUpdateStrategy<IStirrup> updateStrategy, IShiftTraceLogger traceLogger)
         {
             this.updateStrategy = updateStrategy;
diff --git a/StructureHelperLogics/Models/BeamShears/Logics/StirrupStrengthLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/StirrupStrengthLogic.cs
new file mode 100644
index 0000000..15f7271
--- /dev/null
+++ b/StructureHelperLogics/Models/BeamShears/Logics/StirrupStrengthLogic.cs
@@ -0,0 +1,48 @@
+using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.Models.BeamShears.Logics
+{
+    internal class StirrupStrengthLogic : IBeamShearStrenghLogic
+    {
+        private IStirrup stirrup;
+        private IInclinedSection inclinedSection;
+        private IBeamShearStrenghLogic stirrupDensityStrengthLogic;
+
+        public StirrupStrengthLogic(IStirrup stirrup, IInclinedSection inclinedSection, IShiftTraceLogger? traceLogger)
+        {
+            this.stirrup = stirrup;
+            this.inclinedSection = inclinedSection;
+            TraceLogger = traceLogger;
+        }
+
+        public IShiftTraceLogger? TraceLogger { get; set; }
+
+        public double GetShearStrength()
+        {
+            var stirrupEffectiveness = StirrupEffectivenessFactory.GetEffectiveness(BeamShearSectionType.Rectangle);
+            if (stirrup is IStirrupByDensity stirrupByDensity)
+            {
+                TraceLogger?.AddMessage("Stirrups type is stirrup by density");
+                stirrupDensityStrengthLogic = new StirrupByDensityStrengthLogic(stirrupEffectiveness, stirrupByDensity, inclinedSection,TraceLogger);
+                return stirrupDensityStrengthLogic.GetShearStrength();
+            }
+            else if (stirrup is IStirrupByRebar stirrupByRebar)
+            {
+                TraceLogger?.AddMessage("Stirrups type is stirrup by rebar");
+                stirrupDensityStrengthLogic = new StirrupByRebarStrengthLogic(stirrupEffectiveness, stirrupByRebar, inclinedSection, TraceLogger);
+                return stirrupDensityStrengthLogic.GetShearStrength();
+            }
+            else
+            {
+                throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(stirrup));
+            }
+
+        }
+    }
+}
diff --git a/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs b/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
index e9a10e2..ec407d4 100644
--- a/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
@@ -17,7 +17,7 @@ namespace StructureHelperLogics.Models.Materials
         private readonly List<IMaterialLogic> materialLogics;
         private LMBuilders.ConcreteOptions lmOptions;
         private IMaterialOptionLogic optionLogic;
-        private IFactorLogic factorLogic => new FactorLogic(SafetyFactors);
+        private IMaterialFactorLogic factorLogic => new MaterialFactorLogic(SafetyFactors);
         private LMLogic.ITrueStrengthLogic strengthLogic;
         private IUpdateStrategy<IConcreteLibMaterial> updateStrategy = new ConcreteLibUpdateStrategy();
 
diff --git a/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs b/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs
index 8e284ed..23faa1f 100644
--- a/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs
@@ -72,7 +72,7 @@ namespace StructureHelperLogics.Models.Materials
         {
             const double gammaF2Max = 0.9d;
             double gammaF2;
-            IFactorLogic factorLogic = new FactorLogic(SafetyFactors);
+            IMaterialFactorLogic factorLogic = new MaterialFactorLogic(SafetyFactors);
             var factors = factorLogic.GetTotalFactor(LimitStates.ULS, CalcTerms.ShortTerm);
             var rf = TensileStrength * factors.Tensile;
             var epsUlt = rf / Modulus;
diff --git a/StructureHelperLogics/Models/Materials/Logics/ElasticMaterialLogic.cs b/StructureHelperLogics/Models/Materials/Logics/ElasticMaterialLogic.cs
index 4fb2943..15b8448 100644
--- a/StructureHelperLogics/Models/Materials/Logics/ElasticMaterialLogic.cs
+++ b/StructureHelperLogics/Models/Materials/Logics/ElasticMaterialLogic.cs
@@ -18,7 +18,7 @@ namespace StructureHelperLogics.Models.Materials
         { 
             IMaterial material = new Material();
             material.InitModulus = elasticMaterial.Modulus;
-            IFactorLogic factorLogic = new FactorLogic(elasticMaterial.SafetyFactors);
+            IMaterialFactorLogic factorLogic = new MaterialFactorLogic(elasticMaterial.SafetyFactors);
             var factors = factorLogic.GetTotalFactor(limitState, calcTerm);
             parameters = new List<double>()
             {
diff --git a/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs b/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
index ebd5be8..86eb391 100644
--- a/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
@@ -18,7 +18,7 @@ namespace StructureHelperLogics.Models.Materials
     {
         const MaterialTypes materialType = MaterialTypes.Reinforcement;
 
-        private IFactorLogic factorLogic => new FactorLogic(SafetyFactors);
+        private IMaterialFactorLogic factorLogic => new MaterialFactorLogic(SafetyFactors);
         private LoaderMaterialLogics.ITrueStrengthLogic strengthLogic;
         private readonly List<IMaterialLogic> materialLogics;
 
diff --git a/StructureHelperTests/UnitTests/BeamShearTests/BeamShearStrengthByStirrupDensityTests.cs b/StructureHelperTests/UnitTests/BeamShearTests/BeamShearStrengthByStirrupDensityTests.cs
index a4a34ba..8d3432a 100644
--- a/StructureHelperTests/UnitTests/BeamShearTests/BeamShearStrengthByStirrupDensityTests.cs
+++ b/StructureHelperTests/UnitTests/BeamShearTests/BeamShearStrengthByStirrupDensityTests.cs
@@ -15,7 +15,7 @@ namespace StructureHelperTests.UnitTests.BeamShearTests
         private Mock<IStirrupByDensity> _mockStirrupByDensity;
         private Mock<IInclinedSection> _mockInclinedSection;
         private Mock<IShiftTraceLogger> _mockTraceLogger;
-        private BeamShearStrengthByStirrupDensityLogic _beamShearStrength;
+        private StirrupByDensityStrengthLogic _beamShearStrength;
 
         [SetUp]
         public void Setup()
@@ -25,7 +25,7 @@ namespace StructureHelperTests.UnitTests.BeamShearTests
             _mockInclinedSection = new Mock<IInclinedSection>();
             _mockTraceLogger = new Mock<IShiftTraceLogger>();
 
-            _beamShearStrength = new BeamShearStrengthByStirrupDensityLogic(
+            _beamShearStrength = new StirrupByDensityStrengthLogic(
                 _mockStirrupEffectiveness.Object,
                 _mockStirrupByDensity.Object,
                 _mockInclinedSection.Object,
@@ -61,7 +61,7 @@ namespace StructureHelperTests.UnitTests.BeamShearTests
         public void GetShearStrength_ThrowsException_WhenDependenciesAreNull()
         {
             // Arrange
-            var invalidInstance = new BeamShearStrengthByStirrupDensityLogic(
+            var invalidInstance = new StirrupByDensityStrengthLogic(
                 _mockStirrupEffectiveness.Object,
                 null, // Invalid
                 _mockInclinedSection.Object,