Создал опции триангуляции для точки и сделал тест для железобетона

StructureHelperLogics/NdmCalculations/Triangulations/IPointTiangulationLogic.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace StructureHelperLogics.NdmCalculations.Triangulations
+{
+    interface IPointTiangulationLogic : ITriangulationLogic
+    {
+    }
+}

StructureHelperLogics/NdmCalculations/Triangulations/IPointTriangulationLogicOptions.cs

@@ -0,0 +1,13 @@
+using StructureHelperLogics.Data.Shapes;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace StructureHelperLogics.NdmCalculations.Triangulations
+{
+    public interface IPointTriangulationLogicOptions : ITriangulationLogicOptions
+    {
+        ICenter Center { get; }
+        double Area { get; }
+    }
+}

StructureHelperLogics/NdmCalculations/Triangulations/IRectangleTriangulationLogicOptions.cs

@@ -9,7 +9,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
     /// Parameter of triangulation of rectangle part of section
     /// Параметры триангуляции прямоугольного участка сечения
     /// </summary>
-    public interface IRectangleTriangulationOptions : ITriangulationLogicOptions
+    public interface IRectangleTriangulationLogicOptions : ITriangulationLogicOptions
     {
         /// <summary>
         /// 

StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs

@@ -0,0 +1,35 @@
+using LoaderCalculator.Data.Materials;
+using LoaderCalculator.Data.Ndms;
+using StructureHelperLogics.Data.Shapes;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace StructureHelperLogics.NdmCalculations.Triangulations
+{
+    public class PointTriangulationLogic : IPointTiangulationLogic
+    {
+        public ITriangulationLogicOptions Options { get; }
+
+        public PointTriangulationLogic(IPointTriangulationLogicOptions options)
+        {
+            Options = options;
+        }
+
+        public IEnumerable<INdm> GetNdmCollection(IMaterial material)
+        {
+            IPointTriangulationLogicOptions options = Options as IPointTriangulationLogicOptions;
+            ICenter center = options.Center;
+            double area = options.Area;
+            List<INdm> ndmCollection = new List<INdm>();
+            INdm ndm = new Ndm() { CenterX = center.X, CenterY = center.Y, Area = area, Material = material };
+            ndmCollection.Add(ndm);
+            return ndmCollection;
+        }
+
+        public void ValidateOptions(ITriangulationLogicOptions options)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogicOptions.cs

@@ -0,0 +1,26 @@
+using StructureHelperLogics.Data.Shapes;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace StructureHelperLogics.NdmCalculations.Triangulations
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class PointTriangulationLogicOptions : IPointTriangulationLogicOptions
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public ICenter Center { get; }
+
+        public double Area { get; }
+
+        public PointTriangulationLogicOptions(ICenter center, double area)
+        {
+            Center = center;
+            Area = area;
+        }
+    }
+}

StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogic.cs

@@ -13,7 +13,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
 
         public IEnumerable<INdm> GetNdmCollection(IMaterial material)
         {
-            IRectangleTriangulationOptions rectangleOptions = Options as IRectangleTriangulationOptions;
+            IRectangleTriangulationLogicOptions rectangleOptions = Options as IRectangleTriangulationLogicOptions;
             double width = rectangleOptions.Rectangle.Width;
             double height = rectangleOptions.Rectangle.Height;
             double ndmMaxSize = rectangleOptions.NdmMaxSize;

StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogicOptions.cs

@@ -7,7 +7,7 @@ using System.Text;
 namespace StructureHelperLogics.NdmCalculations.Triangulations
 {
     /// <inheritdoc />
-    public class RectangleTriangulationOptions : IRectangleTriangulationOptions
+    public class RectangleTriangulationLogicOptions : IRectangleTriangulationLogicOptions
     {
         /// <inheritdoc />
         public ICenter Center { get; }
@@ -18,7 +18,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
         /// <inheritdoc />
         public int NdmMinDivision { get; }
 
-        public RectangleTriangulationOptions(ICenter center, IRectangle rectangle, double ndmMaxSize, int ndmMinDivision)
+        public RectangleTriangulationLogicOptions(ICenter center, IRectangle rectangle, double ndmMaxSize, int ndmMinDivision)
         {
             Center = center;
             Rectangle = rectangle;
@@ -26,7 +26,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
             NdmMinDivision = ndmMinDivision;
         }
 
-        public RectangleTriangulationOptions(INdmPrimitive primitive)
+        public RectangleTriangulationLogicOptions(INdmPrimitive primitive)
         {
             if (! (primitive.Shape is IRectangle)) { throw new Exception("Shape type is not valid"); }
             Center = primitive.Center;

StructureHelperLogics/NdmCalculations/Triangulations/Triangulation.cs

@@ -63,7 +63,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
             if (shape is IRectangle)
             {
                 IRectangle rectangle = shape as IRectangle;
-                options = new RectangleTriangulationOptions(primitive);
+                options = new RectangleTriangulationLogicOptions(primitive);
                 IRectangleTriangulationLogic logic = new RectangleTriangulationLogic(options);
                 ndms.AddRange(logic.GetNdmCollection(material));
             }
@@ -71,7 +71,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
             return ndms;
         }
 
-        private static IMaterial GetMaterial(IPrimitiveMaterial primitiveMaterial, ITriangulationOptions options)
+        public static IMaterial GetMaterial(IPrimitiveMaterial primitiveMaterial, ITriangulationOptions options)
         {
             IMaterial material;
             if (primitiveMaterial.MaterialType == MaterialTypes.Concrete) { material = GetConcreteMaterial(primitiveMaterial, options); }

StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionTest.cs

@@ -1,12 +1,97 @@
-using System;
+using LoaderCalculator;
+using LoaderCalculator.Data.Materials;
+using LoaderCalculator.Data.Matrix;
+using LoaderCalculator.Data.Ndms;
+using LoaderCalculator.Data.SourceData;
+using LoaderCalculator.Tests.Infrastructures.Logics;
+using NUnit.Framework;
+using StructureHelperLogics.Data.Shapes;
+using StructureHelperLogics.NdmCalculations.Entities;
+using StructureHelperLogics.NdmCalculations.Materials;
+using StructureHelperLogics.NdmCalculations.Triangulations;
 using System.Collections.Generic;
-using System.Linq;
+using System.Threading;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace StructureHelperTests.FunctionalTests.Ndms.RCSections
 {
-    class RCSectionTest
+    public class RCSectionTest
     {
+        //Theoretical limit momemt Mx = 43kN*m
+        [TestCase(0.000113, 0.000494, 10e3, 0d, 0d, 0.00084665917358052976d, 0.0d, 0.00020754144937701132d)]
+        [TestCase(0.000113, 0.000494, 40e3, 0d, 0d, 0.0033939850380287412d, 0d, 0.00082989880025069202d)]
+        [TestCase(0.000113, 0.000494, 42e3, 0d, 0d, 0.0056613831873867241d, 0d, 0.0014291081844183839d)]
+        //Theoretical limit momemt Mx = -187kN*m
+        [TestCase(0.000113, 0.000494, -50e3, 0d, 0d, -0.0011229555729294297d, 0d, 0.00021353225742956321d)]
+        [TestCase(0.000113, 0.000494, -180e3, 0d, 0d, -0.0098365950945499738d, 0d, 0.0022035516889170013d)]
+        [TestCase(0.000113, 0.000494, -183e3, 0d, 0d, -0.021718635290382458d, 0d, 0.0053526701372818789d)]
+        public void Run_ShouldPass(double topArea, double bottomArea, double mx, double my, double nz, double expectedKx, double expectedKy, double expectedEpsilonZ)
+        {
+            //Arrange
+            double width = 0.4;
+            double height = 0.6;
+            var ndmCollection = new List<INdm>();
+            ndmCollection.AddRange(GetConcreteNdms(width, height));
+            ndmCollection.AddRange(GetReinforcementNdms(width, height, topArea, bottomArea));
+            var loaderData = new LoaderOptions
+            {
+                Preconditions = new Preconditions
+                {
+                    ConditionRate = 0.01,
+                    MaxIterationCount = 100,
+                    StartForceMatrix = new ForceMatrix { Mx = mx, My = my, Nz = nz }
+                },
+                NdmCollection = ndmCollection
+            };
+            var calculator = new Calculator();
+            //Act
+            calculator.Run(loaderData, new CancellationToken());
+            var results = calculator.Result;
+            //Assert
+            Assert.NotNull(results);
+            var strainMatrix = results.StrainMatrix;
+            Assert.NotNull(strainMatrix);
+            Assert.AreEqual(expectedKx, strainMatrix.Kx, ExpectedProcessor.GetAccuracyForExpectedValue(expectedKx));
+            Assert.AreEqual(expectedKy, strainMatrix.Ky, ExpectedProcessor.GetAccuracyForExpectedValue(expectedKy));
+            Assert.AreEqual(expectedEpsilonZ, strainMatrix.EpsZ, ExpectedProcessor.GetAccuracyForExpectedValue(expectedEpsilonZ));
+        }
+
+        private IEnumerable<INdm> GetConcreteNdms(double width, double height)
+        {
+            double strength = 40e6;
+            ICenter center = new Center() { X = 0, Y = 0 };
+            IRectangle rectangle = new Rectangle() { Width = width, Height = height, Angle = 0 };
+            IPrimitiveMaterial material = new PrimitiveMaterial() { MaterialType = MaterialTypes.Concrete, ClassName = "С20", Strength = strength };
+            ITriangulationOptions options = new TriangulationOptions() { LimiteState = StructureHelperLogics.Infrastructures.CommonEnums.LimitStates.Collapse, CalcTerm = StructureHelperLogics.Infrastructures.CommonEnums.CalcTerms.ShortTerm };
+            INdmPrimitive primitive = new NdmPrimitive() { Center = center, Shape = rectangle, PrimitiveMaterial = material, NdmMaxSize = 1, NdmMinDivision = 20 };
+            List<INdmPrimitive> primitives = new List<INdmPrimitive>();
+            primitives.Add(primitive);
+            var ndmCollection = Triangulation.GetNdms(primitives, options);
+            return ndmCollection;
+        }
+
+        private IEnumerable<INdm> GetReinforcementNdms(double width, double height, double topArea, double bottomArea)
+        {
+            double gap = 0.05d;
+            double strength = 4e8;
+            IShape topReinforcement = new Point() { Area = topArea };
+            IShape bottomReinforcement = new Point() { Area = bottomArea };
+            IPrimitiveMaterial primitiveMaterial = new PrimitiveMaterial() { MaterialType = MaterialTypes.Reinforcement, ClassName = "S400", Strength = strength };
+            ITriangulationOptions options = new TriangulationOptions() { LimiteState = StructureHelperLogics.Infrastructures.CommonEnums.LimitStates.Collapse, CalcTerm = StructureHelperLogics.Infrastructures.CommonEnums.CalcTerms.ShortTerm };
+            IMaterial material = Triangulation.GetMaterial(primitiveMaterial, options);
+            ICenter centerRT = new Center() { X = width / 2 - gap, Y = height / 2 - gap };
+            ICenter centerLT = new Center() { X = - (width / 2 - gap), Y = height / 2 - gap };
+            ICenter centerRB = new Center() { X = width / 2 - gap, Y = - (height / 2 - gap) };
+            ICenter centerLB = new Center() { X = -(width / 2 - gap), Y = - (height / 2 - gap) };
+            IPointTriangulationLogicOptions optionsRT = new PointTriangulationLogicOptions(centerRT, topArea);
+            IPointTriangulationLogicOptions optionsLT = new PointTriangulationLogicOptions(centerLT, topArea);
+            IPointTriangulationLogicOptions optionsRB = new PointTriangulationLogicOptions(centerRB, bottomArea);
+            IPointTriangulationLogicOptions optionsLB = new PointTriangulationLogicOptions(centerLB, bottomArea);
+            var ndmCollection = new List<INdm>();
+            ndmCollection.AddRange((new PointTriangulationLogic(optionsRT)).GetNdmCollection(material));
+            ndmCollection.AddRange((new PointTriangulationLogic(optionsLT)).GetNdmCollection(material));
+            ndmCollection.AddRange((new PointTriangulationLogic(optionsRB)).GetNdmCollection(material));
+            ndmCollection.AddRange((new PointTriangulationLogic(optionsLB)).GetNdmCollection(material));
+            return ndmCollection;
+        }
     }
 }

StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs

@@ -28,7 +28,7 @@ namespace StructureHelperTests.FunctionalTests.Ndms.SteelSections
             INdmPrimitive primitive = new NdmPrimitive() { Center = center, Shape = rectangle, PrimitiveMaterial = material, NdmMaxSize = 1, NdmMinDivision = 100 };
             List<INdmPrimitive> primitives = new List<INdmPrimitive>();
             primitives.Add(primitive);
-            var ndmList = Triangulation.GetNdms(primitives, options);
+            var ndmCollection = Triangulation.GetNdms(primitives, options);
             var loaderData = new LoaderOptions
             {
                 Preconditions = new Preconditions
@@ -37,7 +37,7 @@ namespace StructureHelperTests.FunctionalTests.Ndms.SteelSections
                     MaxIterationCount = 100,
                     StartForceMatrix = new ForceMatrix { Mx = mx, My = my, Nz = nz }
                 },
-                NdmCollection = ndmList
+                NdmCollection = ndmCollection
             };
             var calculator = new Calculator();
             //Act

StructureHelperTests/UnitTests/Ndms/Triangulations/RectangleTriangulationTest.cs

@@ -36,7 +36,7 @@ namespace StructureHelperTests.UnitTests.Ndms.Triangulations
             IMaterial material = new Material();
             ICenter center = new Center() { X = centerX, Y = centerY };
             IRectangle rectangle = new Rectangle() { Width = width, Height = height, Angle = angle };
-            IRectangleTriangulationOptions options = new RectangleTriangulationOptions(center, rectangle, ndmMaxSize, ndmMinDivision);
+            IRectangleTriangulationLogicOptions options = new StructureHelperLogics.NdmCalculations.Triangulations.RectangleTriangulationLogicOptions(center, rectangle, ndmMaxSize, ndmMinDivision);
             IRectangleTriangulationLogic logic = new StructureHelperLogics.NdmCalculations.Triangulations.RectangleTriangulationLogic(options);
             //Act
             var result = logic.GetNdmCollection(material);