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,66 @@
using StructureHelper.Models.Materials;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Settings;
using StructureHelperCommon.Infrastructures.Strings;
using StructureHelperCommon.Models.Materials.Libraries;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.Materials
{
public enum HeadmaterialType
{
Concrete40,
Reinforecement400,
Elastic200
}
public static class HeadMaterialFactory
{
private static CodeTypes codeType;
private static IEnumerable<ILibMaterialEntity> LibConcreteMaterials => LibMaterialPepository.GetConcreteRepository(codeType);
private static IEnumerable<ILibMaterialEntity> LibReinforcementMaterials => LibMaterialPepository.GetReinforcementRepository(codeType);
public static IHeadMaterial GetHeadMaterial(HeadmaterialType type, CodeTypes code)
{
codeType = code;
if (type == HeadmaterialType.Concrete40) { return GetConcrete40(); }
if (type == HeadmaterialType.Reinforecement400) { return GetReinforcement400(); }
if (type == HeadmaterialType.Elastic200) { return GetElastic200(); }
else throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknown + nameof(type));
}
private static IHeadMaterial GetElastic200()
{
var material = new HeadMaterial();
material.HelperMaterial = new ElasticMaterial() { Modulus = 2e11d, CompressiveStrength = 4e8d, TensileStrength = 4e8d };
return material;
}
private static IHeadMaterial GetReinforcement400()
{
var material = new HeadMaterial() { Name = "New reinforcement" };
var libMaterial = LibReinforcementMaterials.Where(x => x.Name.Contains("400")).First();
var libMat = new ReinforcementLibMaterial();
libMat.MaterialEntity = libMaterial;
material.HelperMaterial = libMat;
return material;
}
private static IHeadMaterial GetConcrete40()
{
var material = new HeadMaterial();
var libMaterial = LibConcreteMaterials.Where(x => x.Name.Contains("40")).First();
var libMat = new ConcreteLibMaterial();
libMat.MaterialEntity = libMaterial;
libMat.TensionForULS = false;
libMat.TensionForSLS = true;
material.HelperMaterial = libMat;
return material;
}
}
}

View File

@@ -1,105 +0,0 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.Materials.Factories
{
public static class LibMaterialFactory
{
public static List<ILibMaterial> GetLibMaterials(CodeTypes code)
{
List<ILibMaterial> libMaterials = new List<ILibMaterial>();
libMaterials.AddRange(GetConcrete(code));
libMaterials.AddRange(GetReinforcement(code));
return libMaterials;
}
private static IEnumerable<ILibMaterial> GetReinforcement(CodeTypes code)
{
if (code == CodeTypes.EuroCode_2_1990)
{
return GetReinforcementEurocode();
}
else if (code == CodeTypes.SP63_13330_2018)
{
return GetReinforcementSP63();
}
else { throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknown); }
}
private static IEnumerable<ILibMaterial> GetConcrete(CodeTypes code)
{
if (code == CodeTypes.EuroCode_2_1990)
{
return GetConcreteEurocode();
}
else if (code == CodeTypes.SP63_13330_2018)
{
return GetConcreteSP63();
}
else { throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknown); }
}
private static IEnumerable<ILibMaterial> GetConcreteEurocode()
{
var code = CodeTypes.EuroCode_2_1990;
var material = MaterialTypes.Concrete;
List<ILibMaterial> libMaterials = new List<ILibMaterial>();
libMaterials.Add(new LibMaterial(material, code, "C12", 12e6));
libMaterials.Add(new LibMaterial(material, code, "C20", 20e6));
libMaterials.Add(new LibMaterial(material, code, "C30", 30e6));
libMaterials.Add(new LibMaterial(material, code, "C40", 40e6));
libMaterials.Add(new LibMaterial(material, code, "C50", 50e6));
libMaterials.Add(new LibMaterial(material, code, "C60", 60e6));
libMaterials.Add(new LibMaterial(material, code, "C70", 70e6));
libMaterials.Add(new LibMaterial(material, code, "C80", 80e6));
return libMaterials;
}
private static IEnumerable<ILibMaterial> GetReinforcementEurocode()
{
var code = CodeTypes.EuroCode_2_1990;
var material = MaterialTypes.Reinforcement;
List<ILibMaterial> libMaterials = new List<ILibMaterial>();
libMaterials.Add(new LibMaterial(material, code, "S240", 240e6));
libMaterials.Add(new LibMaterial(material, code, "S400", 400e6));
libMaterials.Add(new LibMaterial(material, code, "S500", 500e6));
return libMaterials;
}
private static IEnumerable<ILibMaterial> GetConcreteSP63()
{
var code = CodeTypes.SP63_13330_2018;
var material = MaterialTypes.Concrete;
List<ILibMaterial> libMaterials = new List<ILibMaterial>();
libMaterials.Add(new LibMaterial(material, code, "B5", 5e6));
libMaterials.Add(new LibMaterial(material, code, "B7,5", 7.5e6));
libMaterials.Add(new LibMaterial(material, code, "B10", 10e6));
libMaterials.Add(new LibMaterial(material, code, "B15", 15e6));
libMaterials.Add(new LibMaterial(material, code, "B20", 20e6));
libMaterials.Add(new LibMaterial(material, code, "B25", 25e6));
libMaterials.Add(new LibMaterial(material, code, "B30", 30e6));
libMaterials.Add(new LibMaterial(material, code, "B35", 35e6));
libMaterials.Add(new LibMaterial(material, code, "B40", 40e6));
libMaterials.Add(new LibMaterial(material, code, "B50", 50e6));
libMaterials.Add(new LibMaterial(material, code, "B60", 60e6));
return libMaterials;
}
private static IEnumerable<ILibMaterial> GetReinforcementSP63()
{
var code = CodeTypes.EuroCode_2_1990;
var material = MaterialTypes.Reinforcement;
List<ILibMaterial> libMaterials = new List<ILibMaterial>();
libMaterials.Add(new LibMaterial(material, code, "A240", 240e6));
libMaterials.Add(new LibMaterial(material, code, "A400", 400e6));
libMaterials.Add(new LibMaterial(material, code, "A500", 500e6));
return libMaterials;
}
}
}