avpon/StructureHelper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All Test Was Repaired

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
StructureHelperLogics/Models/CrossSections/CrossSection.cs Normal file
View File

@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.CrossSections
{
public class CrossSection : ICrossSection
{
public ICrossSectionRepository SectionRepository { get; private set; }
public CrossSection()
{
SectionRepository = new CrossSectionRepository();
}
}
}

29
StructureHelperLogics/Models/CrossSections/CrossSectionRepository.cs Normal file
View File

@@ -0,0 +1,29 @@
using StructureHelper.Models.Materials;
using StructureHelperCommon.Models.Forces;
using StructureHelperLogics.Models.Primitives;
using StructureHelperLogics.NdmCalculations.Analyses;
using StructureHelperLogics.NdmCalculations.Primitives;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.CrossSections
{
public class CrossSectionRepository : ICrossSectionRepository
{
public List<IForceCombinationList> ForceCombinationLists { get; private set; }
public List<IHeadMaterial> HeadMaterials { get; private set; }
public List<INdmPrimitive> Primitives { get; }
public List<INdmCalculator> Calculators { get; private set; }
public CrossSectionRepository()
{
ForceCombinationLists = new List<IForceCombinationList>();
HeadMaterials = new List<IHeadMaterial>();
Primitives = new List<INdmPrimitive>();
Calculators = new List<INdmCalculator>();
}
}
}

13
StructureHelperLogics/Models/CrossSections/ICrossSection.cs Normal file
View File

@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.CrossSections
{
public interface ICrossSection
{
ICrossSectionRepository SectionRepository { get; }
}
}

20
StructureHelperLogics/Models/CrossSections/ICrossSectionRepository.cs Normal file
View File

@@ -0,0 +1,20 @@
using StructureHelper.Models.Materials;
using StructureHelperCommon.Models.Forces;
using StructureHelperLogics.Models.Materials;
using StructureHelperLogics.Models.Primitives;
using StructureHelperLogics.NdmCalculations.Analyses;
using StructureHelperLogics.NdmCalculations.Primitives;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.CrossSections
{
public interface ICrossSectionRepository : IHasHeadMaterials, IHasPrimitives
{
List<IForceCombinationList> ForceCombinationLists { get; }
List<INdmCalculator> Calculators { get; }
}
}

41
StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs Normal file
View File

@@ -0,0 +1,41 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using StructureHelperCommon.Models.Materials.Libraries;
using LCM = LoaderCalculator.Data.Materials;
using LCMB = LoaderCalculator.Data.Materials.MaterialBuilders;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.Materials
{
public class ConcreteLibMaterial : IConcreteLibMaterial
{
public ILibMaterialEntity MaterialEntity { get; set; }
public bool TensionForULS { get ; set; }
public bool TensionForSLS { get; set; }
private IMaterialOptionLogic optionLogic;
public ConcreteLibMaterial()
{
optionLogic = new MaterialOptionLogic(new LCMB.ConcreteOptions());
}
public object Clone()
{
return new ConcreteLibMaterial() { MaterialEntity = MaterialEntity, TensionForULS = TensionForULS, TensionForSLS = TensionForSLS };
}
public LCM.IMaterial GetLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
{
var materialOptions = optionLogic.SetMaterialOptions(MaterialEntity, limitState, calcTerm);
LCMB.IMaterialBuilder builder = new LCMB.ConcreteBuilder(materialOptions);
LCMB.IBuilderDirector director = new LCMB.BuilderDirector(builder);
return director.BuildMaterial();
}
}
}

66
StructureHelperLogics/Models/Materials/Factories/HeadMaterialFactory.cs Normal file
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;
}
}
}

105
StructureHelperLogics/Models/Materials/Factories/LibMaterialFactory.cs
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;
}
}
}

3
StructureHelperLogics/Models/Materials/HeadMaterialRepository.cs
View File

@@ -12,19 +12,16 @@ namespace StructureHelperLogics.Models.Materials
public object Parent { get; private set; }
public List<IHeadMaterial> HeadMaterials { get; set; }
public List<ILibMaterial> LibMaterials { get; set; }
public HeadMaterialRepository()
{
HeadMaterials = new List<IHeadMaterial>();
LibMaterials = new List<ILibMaterial>();
}
public HeadMaterialRepository(object parent)
{
Parent = parent;
HeadMaterials = new List<IHeadMaterial>();
LibMaterials = new List<ILibMaterial>();
}
public void RegisterParent(object obj)

15
StructureHelperLogics/Models/Materials/IConcreteLibMaterial.cs Normal file
View File

@@ -0,0 +1,15 @@
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 interface IConcreteLibMaterial : ILibMaterial
{
bool TensionForULS { get; set; }
bool TensionForSLS { get; set; }
}
}

14
StructureHelperLogics/Models/Materials/IHasHeadMaterials.cs Normal file
View File

@@ -0,0 +1,14 @@
using StructureHelper.Models.Materials;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.Materials
{
public interface IHasHeadMaterials
{
List<IHeadMaterial> HeadMaterials { get; }
}
}

1
StructureHelperLogics/Models/Materials/IHeadMaterialRepository.cs
View File

@@ -12,7 +12,6 @@ namespace StructureHelperLogics.Models.Materials
{
object Parent { get; }
List<IHeadMaterial> HeadMaterials { get; set; }
List<ILibMaterial> LibMaterials { get; set; }
void RegisterParent(object obj);
}

6
StructureHelperLogics/Models/Materials/ILibMaterial.cs
View File

@@ -1,4 +1,5 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Models.Materials.Libraries;
using StructureHelperLogics.Models.Materials;
using System;
using System.Collections.Generic;
@@ -8,9 +9,6 @@ namespace StructureHelperLogics.Models.Materials
{
public interface ILibMaterial : IHelperMaterial
{
MaterialTypes MaterialType { get; set; }
//CodeTypes CodeType { get; set; }
string Name { get; set; }
double MainStrength { get; set; }
ILibMaterialEntity MaterialEntity { get; set; }
}
}

12
StructureHelperLogics/Models/Materials/IMaterialOptionLogic.cs Normal file
View File

@@ -0,0 +1,12 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Models.Materials.Libraries;
using LCM = LoaderCalculator.Data.Materials;
using LCMB = LoaderCalculator.Data.Materials.MaterialBuilders;
namespace StructureHelperLogics.Models.Materials
{
public interface IMaterialOptionLogic
{
LCMB.IMaterialOptions SetMaterialOptions(ILibMaterialEntity materialEntity, LimitStates limitState, CalcTerms calcTerm);
}
}

13
StructureHelperLogics/Models/Materials/IReinforcementLibMaterial.cs Normal file
View File

@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.Materials
{
public interface IReinforcementLibMaterial : ILibMaterial
{
}
}

2
StructureHelperLogics/Models/Materials/LibMaterial.cs
View File

@@ -1,6 +1,7 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using StructureHelperCommon.Models.Materials.Libraries;
using LCM = LoaderCalculator.Data.Materials;
using LCMB = LoaderCalculator.Data.Materials.MaterialBuilders;
@@ -17,6 +18,7 @@ namespace StructureHelperLogics.Models.Materials
private CalcTerms calcTerm;
public string Name { get; set; }
public double MainStrength { get; set; }
public ILibMaterialEntity MaterialEntity { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
public LibMaterial(MaterialTypes materialType, CodeTypes codeType, string name, double mainStrength)
{

46
StructureHelperLogics/Models/Materials/MaterialOptionLogic.cs Normal file
View File

@@ -0,0 +1,46 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
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;
using LCMB = LoaderCalculator.Data.Materials.MaterialBuilders;
namespace StructureHelperLogics.Models.Materials
{
public class MaterialOptionLogic : IMaterialOptionLogic
{
private LCMB.IMaterialOptions materialOptions;
public MaterialOptionLogic(LCMB.IMaterialOptions materialOptions)
{
this.materialOptions = materialOptions;
}
public LCMB.IMaterialOptions SetMaterialOptions(ILibMaterialEntity materialEntity, LimitStates limitState, CalcTerms calcTerm)
{
materialOptions.Strength = materialEntity.MainStrength;
if (materialEntity.CodeType == CodeTypes.EuroCode_2_1990)
{
materialOptions.CodesType = LCMB.CodesType.EC2_1990;
}
else if (materialEntity.CodeType == CodeTypes.SP63_13330_2018)
{
materialOptions.CodesType = LCMB.CodesType.SP63_2018;
}
else { throw new StructureHelperException($"{ErrorStrings.ObjectTypeIsUnknown} : {materialOptions.CodesType}"); }
if (limitState == LimitStates.ULS) { materialOptions.LimitState = LCMB.LimitStates.Collapse; }
else if (limitState == LimitStates.SLS) { materialOptions.LimitState = LCMB.LimitStates.ServiceAbility; }
else if (limitState == LimitStates.Special) { materialOptions.LimitState = LCMB.LimitStates.Special; }
else { throw new StructureHelperException(ErrorStrings.LimitStatesIsNotValid); }
if (calcTerm == CalcTerms.ShortTerm) { materialOptions.IsShortTerm = true; }
else if (calcTerm == CalcTerms.LongTerm) { materialOptions.IsShortTerm = false; }
else { throw new StructureHelperException(ErrorStrings.LoadTermIsNotValid); }
return materialOptions;
}
}
}

37
StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs Normal file
View File

@@ -0,0 +1,37 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Models.Materials.Libraries;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using LCM = LoaderCalculator.Data.Materials;
using LCMB = LoaderCalculator.Data.Materials.MaterialBuilders;
namespace StructureHelperLogics.Models.Materials
{
public class ReinforcementLibMaterial : IReinforcementLibMaterial
{
public ILibMaterialEntity MaterialEntity { get; set; }
private IMaterialOptionLogic optionLogic;
public ReinforcementLibMaterial()
{
optionLogic = new MaterialOptionLogic(new LCMB.ReinforcementOptions());
}
public object Clone()
{
return new ReinforcementLibMaterial() { MaterialEntity = MaterialEntity};
}
public LCM.IMaterial GetLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
{
var materialOptions = optionLogic.SetMaterialOptions(MaterialEntity, limitState, calcTerm);
LCMB.IMaterialBuilder builder = new LCMB.ReinforcementBuilder(materialOptions);
LCMB.IBuilderDirector director = new LCMB.BuilderDirector(builder);
return director.BuildMaterial();
}
}
}

1
StructureHelperLogics/Models/Primitives/IPrimitive.cs
View File

@@ -1,6 +1,7 @@
using LoaderCalculator.Data.Ndms;
using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Models.Shapes;
using StructureHelperLogics.NdmCalculations.Primitives;
using System;
using System.Collections.Generic;
using System.Linq;

1
StructureHelperLogics/Models/Primitives/LinePrimitive.cs
View File

@@ -1,4 +1,5 @@
using StructureHelperCommon.Models.Shapes;
using StructureHelperLogics.NdmCalculations.Primitives;
using System;
using System.Collections.Generic;
using System.Linq;