Refactoring WIP

This commit is contained in:
Nikolai Smirnov
2022-07-08 11:38:25 +05:00
parent fc4f1f1db3
commit 2c4df04c5c
43 changed files with 832 additions and 833 deletions

View File

@@ -0,0 +1,15 @@
using System;
namespace StructureHelper.Models.Materials
{
public class ConcreteDefinition : MaterialDefinitionBase
{
public ConcreteDefinition(string materialClass, double youngModulus, double compressiveStrengthCoef, double tensileStrengthCoef, double materialCoefInCompress, double materialCoefInTension)
: base(materialClass, youngModulus, compressiveStrengthCoef, tensileStrengthCoef, materialCoefInCompress, materialCoefInTension)
{
CompressiveStrength = compressiveStrengthCoef/* * Math.Pow(10, 6)*/;
TensileStrength = Math.Round(620 * Math.Sqrt(CompressiveStrength), 2);
YoungModulus = Math.Round(4.7 * Math.Sqrt(DesignCompressiveStrength), 2);
}
}
}

View File

@@ -0,0 +1,28 @@
using System;
namespace StructureHelper.Models.Materials
{
public class MaterialDefinitionBase
{
public string MaterialClass { get; set; }
public double YoungModulus { get; set; }
public double CompressiveStrength { get; set; }
public double TensileStrength { get; set; }
public double MaterialCoefInCompress { get; set; }
public double MaterialCoefInTension { get; set; }
public double DesignCompressiveStrength { get; set; }
public double DesingTensileStrength { get; set; }
public MaterialDefinitionBase(string materialClass, double youngModulus, double compressiveStrengthCoef, double tensileStrengthCoef, double materialCoefInCompress, double materialCoefInTension)
{
MaterialClass = materialClass;
YoungModulus = youngModulus;
CompressiveStrength = compressiveStrengthCoef;
TensileStrength = tensileStrengthCoef;
MaterialCoefInCompress = materialCoefInCompress;
MaterialCoefInTension = materialCoefInTension;
DesignCompressiveStrength = compressiveStrengthCoef * Math.Pow(10, 6) * 1 / 1;
DesingTensileStrength = tensileStrengthCoef * Math.Pow(10, 3) * 1 / materialCoefInTension;
}
}
}

View File

@@ -0,0 +1,12 @@
namespace StructureHelper.Models.Materials
{
public class RebarDefinition : MaterialDefinitionBase
{
public RebarDefinition(string materialClass, double youngModulus, double compressiveStrengthCoef, double tensileStrengthCoef, double materialCoefInCompress, double materialCoefInTension) : base(materialClass, youngModulus, compressiveStrengthCoef, tensileStrengthCoef, materialCoefInCompress, materialCoefInTension)
{
YoungModulus = youngModulus/* * Math.Pow(10, 11)*/;
CompressiveStrength = compressiveStrengthCoef/* * Math.Pow(10, 6)*/;
TensileStrength = tensileStrengthCoef/* * Math.Pow(10, 6)*/;
}
}
}