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

Material Update Strategy was added

Browse Source
This commit is contained in:
Evgeny Redikultsev
2023-07-02 22:03:30 +05:00
parent 2595d7e733
commit 03b882f54d
74 changed files with 456 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
StructureHelperCommon/Infrastructures/Strings/ErrorString.cs → StructureHelperCommon/Infrastructures/Exceptions/ErrorString.cs
View File

@@ -1,4 +1,4 @@
namespace StructureHelperCommon.Infrastructures.Strings
namespace StructureHelperCommon.Infrastructures.Exceptions
{
public static class ErrorStrings
{

8
StructureHelperCommon/Infrastructures/Interfaces/IDataRepository.cs
View File

@@ -8,8 +8,10 @@ namespace StructureHelperCommon.Infrastructures.Interfaces
{
public interface IDataRepository<T>
{
void Save(T entity);
T Load(Guid Id);
void Create(T entity);
void Update(T entity);
void Delete(Guid Id);
T GetById(Guid Id);
List<T> GetAll();
}
}

2
StructureHelperCommon/Infrastructures/Interfaces/ISaveable.cs
View File

@@ -8,6 +8,6 @@ namespace StructureHelperCommon.Infrastructures.Interfaces
/// Unique identifier
/// </summary>
Guid Id { get;}
void Save();
//void Save();
}
}

13
StructureHelperCommon/Infrastructures/Interfaces/IUpdateStrategy.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 StructureHelperCommon.Infrastructures.Interfaces
{
public interface IUpdateStrategy<T>
{
void Update(T targetObject, T sourceObject);
}
}

1
StructureHelperCommon/Models/Forces/Factories/DesignForceFactory.cs
View File

@@ -1,6 +1,5 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
namespace StructureHelperCommon.Models.Forces
{

1
StructureHelperCommon/Models/Forces/Factories/ForceCombinationListFactory.cs
View File

@@ -1,7 +1,6 @@
using System.Collections.Generic;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
namespace StructureHelperCommon.Models.Forces
{

1
StructureHelperCommon/Models/Materials/Libraries/Factories/ConcreteFactorsFactory.cs
View File

@@ -1,6 +1,5 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
namespace StructureHelperCommon.Models.Materials.Libraries
{

1
StructureHelperCommon/Models/Materials/Libraries/Factories/FRFactorsFactory.cs
View File

@@ -1,6 +1,5 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using System;
using System.Collections.Generic;
using System.Linq;

2
StructureHelperCommon/Models/Materials/Libraries/Factories/LibMaterialFactory.cs
View File

@@ -4,7 +4,6 @@ using System.Linq;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Settings;
using StructureHelperCommon.Infrastructures.Strings;
using StructureHelperCommon.Models.Codes;
namespace StructureHelperCommon.Models.Materials.Libraries
@@ -177,7 +176,6 @@ namespace StructureHelperCommon.Models.Materials.Libraries
new ConcreteMaterialEntity(new Guid("2f5b70b9-f4c1-470d-ac27-a39a7093b6ea"))
{
CodeType = codeType,
Code = code,
Name = "B30",
MainStrength = 30e6
},

3
StructureHelperCommon/Models/Materials/Libraries/IMaterialSafetyFactor.cs
View File

@@ -1,10 +1,11 @@
using System;
using System.Collections.Generic;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Interfaces;
namespace StructureHelperCommon.Models.Materials.Libraries
{
public interface IMaterialSafetyFactor : ICloneable
public interface IMaterialSafetyFactor : ISaveable, ICloneable
{
string Name { get; set; }
bool Take { get; set; }

5
StructureHelperCommon/Models/Materials/Libraries/IPartialFactor.cs
View File

@@ -1,8 +1,9 @@
using System;
using StructureHelperCommon.Infrastructures.Interfaces;
using System;
namespace StructureHelperCommon.Models.Materials.Libraries
{
public interface IPartialFactor : ICloneable
public interface IPartialFactor : ISaveable, ICloneable
{
double FactorValue {get;set;}
}

20
StructureHelperCommon/Models/Materials/Libraries/Logics/MaterialPartialFactorUpdateStrategy.cs Normal file
View File

@@ -0,0 +1,20 @@
using StructureHelperCommon.Infrastructures.Interfaces;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperCommon.Models.Materials.Libraries
{
internal class MaterialPartialFactorUpdateStrategy : IUpdateStrategy<IMaterialPartialFactor>
{
public void Update(IMaterialPartialFactor targetObject, IMaterialPartialFactor sourceObject)
{
targetObject.LimitState = sourceObject.LimitState;
targetObject.StressState = sourceObject.StressState;
targetObject.CalcTerm = sourceObject.CalcTerm;
targetObject.FactorValue = sourceObject.FactorValue;
}
}
}

24
StructureHelperCommon/Models/Materials/Libraries/Logics/MaterialSafetyFactorUpdateStrategy.cs Normal file
View File

@@ -0,0 +1,24 @@
using StructureHelperCommon.Infrastructures.Interfaces;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperCommon.Models.Materials.Libraries
{
internal class MaterialSafetyFactorUpdateStrategy : IUpdateStrategy<IMaterialSafetyFactor>
{
public void Update(IMaterialSafetyFactor targetObject, IMaterialSafetyFactor sourceObject)
{
targetObject.Name = sourceObject.Name;
targetObject.Take = sourceObject.Take;
targetObject.Description = sourceObject.Description;
targetObject.PartialFactors.Clear();
foreach (var item in sourceObject.PartialFactors)
{
targetObject.PartialFactors.Add(item.Clone() as IMaterialPartialFactor);
}
}
}
}

21
StructureHelperCommon/Models/Materials/Libraries/MaterialPartialFactor.cs
View File

@@ -1,13 +1,13 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using System;
namespace StructureHelperCommon.Models.Materials.Libraries
{
public class MaterialPartialFactor : IMaterialPartialFactor
{
private double factorValue;
public Guid Id { get; }
public StressStates StressState { get; set; }
public CalcTerms CalcTerm { get; set; }
public LimitStates LimitState { get; set; }
@@ -24,23 +24,24 @@ namespace StructureHelperCommon.Models.Materials.Libraries
}
}
public MaterialPartialFactor()
public MaterialPartialFactor(Guid id)
{
Id = id;
StressState = StressStates.Compression;
LimitState = LimitStates.ULS;
CalcTerm = CalcTerms.LongTerm;
FactorValue = 1d;
}
public MaterialPartialFactor() : this (Guid.NewGuid())
{ }
public object Clone()
{
var newItem = new MaterialPartialFactor()
{
StressState = StressState,
CalcTerm = CalcTerm,
LimitState = LimitState,
FactorValue = FactorValue,
};
var newItem = new MaterialPartialFactor();
var updateStrategy = new MaterialPartialFactorUpdateStrategy();
updateStrategy.Update(newItem, this);
return newItem;
}
}

25
StructureHelperCommon/Models/Materials/Libraries/MaterialSafetyFactor.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using StructureHelperCommon.Infrastructures.Enums;
@@ -6,23 +7,32 @@ namespace StructureHelperCommon.Models.Materials.Libraries
{
public class MaterialSafetyFactor : IMaterialSafetyFactor
{
public Guid Id { get; }
public string Name {get; set; }
public bool Take { get; set; }
public string Description { get; set; }
public List<IMaterialPartialFactor> PartialFactors { get; }
public MaterialSafetyFactor()
public MaterialSafetyFactor(Guid id)
{
Id = id;
Take = true;
Name = "New factor";
Description = "Material safety factor for ...";
PartialFactors = new List<IMaterialPartialFactor>();
}
public MaterialSafetyFactor() : this (Guid.NewGuid())
{ }
public double GetFactor(StressStates stressState, CalcTerms calcTerm, LimitStates limitStates)
{
double result = 1d;
var coefficients = PartialFactors.Where(x => (x.StressState == stressState & x.CalcTerm == calcTerm & x.LimitState == limitStates));
var coefficients = PartialFactors
.Where(x => x.StressState == stressState
& x.CalcTerm == calcTerm
& x.LimitState == limitStates);
foreach (var item in coefficients) { result *= item.FactorValue;}
return result;
}
@@ -30,13 +40,8 @@ namespace StructureHelperCommon.Models.Materials.Libraries
public object Clone()
{
var newItem = new MaterialSafetyFactor();
newItem.Take = Take;
newItem.Name = Name;
newItem.Description = Description;
foreach (var item in PartialFactors)
{
newItem.PartialFactors.Add(item.Clone() as IMaterialPartialFactor);
}
var updateSrategy = new MaterialSafetyFactorUpdateStrategy();
updateSrategy.Update(newItem, this);
return newItem;
}
}

1
StructureHelperCommon/Models/Parameters/ArrayParameter.cs
View File

@@ -1,5 +1,4 @@
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using System;
using System.Collections.Generic;
using System.Linq;

58
StructureHelperCommon/Models/Repositories/ListRepository.cs Normal file
View File

@@ -0,0 +1,58 @@
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Interfaces;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http.Headers;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperCommon.Models.Repositories
{
public class ListRepository<T> : IDataRepository<T>
where T : ISaveable
{
List<T> internalData;
private IUpdateStrategy<T> updateStrategy;
public void Create(T entity)
{
var isExists = internalData.Exists(x => x.Id == entity.Id);
if (isExists == true)
{
throw new StructureHelperException(ErrorStrings.DataIsInCorrect + $":\nobject with Id={entity.Id} already exists");
}
internalData.Add(entity);
}
public void Delete(Guid Id)
{
T existingObject = GetById(Id);
internalData.Remove(existingObject);
}
public List<T> GetAll()
{
return new List<T>(internalData);
}
public T GetById(Guid id)
{
T existingObject = internalData.Single(x => x.Id == id);
return existingObject;
}
public void Update(T updateObject)
{
T existingObject = GetById(updateObject.Id);
updateStrategy.Update(existingObject, updateObject);
}
public ListRepository(List<T> initialData, IUpdateStrategy<T> updateStrategy)
{
internalData = initialData;
this.updateStrategy = updateStrategy;
}
public ListRepository(IUpdateStrategy<T> updateStrategy) : this(new List<T>(), updateStrategy)
{
}
}
}

1
StructureHelperCommon/Services/Forces/ForceActionService.cs
View File

@@ -1,6 +1,5 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using StructureHelperCommon.Models.Forces;
using StructureHelperCommon.Models.Shapes;
using System;

1
StructureHelperCommon/Services/Forces/ForceTupleService.cs
View File

@@ -1,7 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using StructureHelperCommon.Models.Forces;
using StructureHelperCommon.Models.Shapes;

1
StructureHelperCommon/Services/Units/CommonOperation.cs
View File

@@ -1,6 +1,5 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using StructureHelperCommon.Services.Units;
using System;
using System.Collections.Generic;