All Test Was Repaired

This commit is contained in:
Evgeny Redikultsev
2022-12-10 17:44:06 +05:00
parent c766227b19
commit f562cf2bce
72 changed files with 1541 additions and 398 deletions

View File

@@ -0,0 +1,30 @@
using StructureHelperCommon.Models.Forces;
using StructureHelperLogics.Models.Primitives;
using StructureHelperLogics.NdmCalculations.Primitives;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
{
public class ForceCalculator : INdmCalculator
{
public string Name { get; set; }
public List<IForceCombinationList> ForceCombinationLists { get; }
public List<INdmPrimitive> NdmPrimitives { get; }
public INdmResult Result { get; }
public void Run()
{
throw new NotImplementedException();
}
public ForceCalculator()
{
ForceCombinationLists = new List<IForceCombinationList>();
NdmPrimitives = new List<INdmPrimitive>();
}
}
}

View File

@@ -0,0 +1,19 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Models.Forces;
using StructureHelperLogics.Models.Calculations.CalculationProperties;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
{
public class ForceInputData : IForceInputData
{
public IEnumerable<IForceCombinationList> ForceCombinationLists { get; set; }
public IEnumerable<LimitStates> LimitStates { get; set; }
public IEnumerable<CalcTerms> CalcTerms { get; set; }
public IIterationProperty IterationProperty { get; }
}
}

View File

@@ -0,0 +1,22 @@
using LoaderCalculator.Data.ResultData;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
{
public class ForcesResult : INdmResult
{
public bool IsValid { get; private set; }
/// <summary>
/// Text of result of calculations
/// </summary>
public string Desctription { get; set; }
/// <summary>
/// Keep result of calculations from ndm-library
/// </summary>
public ILoaderResults LoaderResults { get; }
}
}

View File

@@ -0,0 +1,15 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Models.Forces;
using StructureHelperLogics.Models.Calculations.CalculationProperties;
using System.Collections.Generic;
namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
{
public interface IForceInputData
{
IEnumerable<CalcTerms> CalcTerms { get; set; }
IEnumerable<IForceCombinationList> ForceCombinationLists { get; set; }
IIterationProperty IterationProperty { get; }
IEnumerable<LimitStates> LimitStates { get; set; }
}
}

View File

@@ -0,0 +1,24 @@
using StructureHelperCommon.Models.Calculators;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using TaskManager;
namespace StructureHelperLogics.NdmCalculations.Analyses
{
public interface INdmCalculator
{
string Name { get; set; }
/// <summary>
/// Method for calculating
/// </summary>
void Run();
/// <summary>
/// Result of Calculations
/// </summary>
INdmResult Result { get; }
}
}

View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.NdmCalculations.Analyses
{
public interface INdmResult
{
/// <summary>
/// True if result of calculation is valid
/// </summary>
bool IsValid { get; }
}
}

View File

@@ -0,0 +1,9 @@
using System.Collections.Generic;
namespace StructureHelperLogics.NdmCalculations.Primitives
{
public interface IHasPrimitives
{
List<INdmPrimitive> Primitives { get; }
}
}

View File

@@ -8,7 +8,7 @@ using System.Collections.Generic;
using StructureHelperCommon.Infrastructures.Interfaces;
using System;
namespace StructureHelperLogics.Models.Primitives
namespace StructureHelperLogics.NdmCalculations.Primitives
{
public interface INdmPrimitive : ISaveable, ICloneable
{

View File

@@ -33,13 +33,12 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
public RectanglePrimitive()
{
Name = "New Rectangle";
Width = 0.4d;
Height = 0.6d;
NdmMaxSize = 0.01d;
NdmMinDivision = 10;
}
public RectanglePrimitive(IHeadMaterial material) : this() { HeadMaterial = material; }
public object Clone()
{
RectanglePrimitive primitive = new RectanglePrimitive();

View File

@@ -10,6 +10,7 @@ using StructureHelperLogics.Models.Materials;
using StructureHelperCommon.Models.Shapes;
using StructureHelperLogics.Models.Primitives;
using StructureHelper.Models.Materials;
using StructureHelperLogics.NdmCalculations.Primitives;
namespace StructureHelperLogics.NdmCalculations.Triangulations
{