Fix error of cross-section cloning strategy

This commit is contained in:
Evgeny Redikultsev
2024-12-29 20:32:48 +05:00
parent bd0175086a
commit ba70e0d214
8 changed files with 42 additions and 31 deletions

View File

@@ -1,4 +1,5 @@
using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Settings;
using StructureHelperCommon.Models.Analyses; using StructureHelperCommon.Models.Analyses;
using StructureHelperLogics.Models.Analyses; using StructureHelperLogics.Models.Analyses;
using StructureHelperLogics.Models.CrossSections; using StructureHelperLogics.Models.CrossSections;
@@ -36,6 +37,7 @@ namespace StructureHelperLogic.Models.Analyses
public object Clone() public object Clone()
{ {
CrossSectionNdmAnalysis newAnalysis = new(); CrossSectionNdmAnalysis newAnalysis = new();
var project = ProgramSetting.CurrentProject;
updateStrategy.Update(newAnalysis, this); updateStrategy.Update(newAnalysis, this);
var currentVersion = VersionProcessor.GetCurrentVersion().AnalysisVersion as ICloneable; var currentVersion = VersionProcessor.GetCurrentVersion().AnalysisVersion as ICloneable;
ISaveable newCrossSection = currentVersion.Clone() as ISaveable; ISaveable newCrossSection = currentVersion.Clone() as ISaveable;

View File

@@ -9,7 +9,7 @@ namespace StructureHelperLogics.Models.CrossSections
{ {
public class CrossSection : ICrossSection public class CrossSection : ICrossSection
{ {
private ICloneStrategy<ICrossSection> cloneStrategy = new CrossSectionCloneStrategy(); private ICloneStrategy<ICrossSection> cloneStrategy;
private IUpdateStrategy<ICrossSection> updateStrategy = new CrossSectionUpdateStrategy(); private IUpdateStrategy<ICrossSection> updateStrategy = new CrossSectionUpdateStrategy();
public ICrossSectionRepository SectionRepository { get; set; } = new CrossSectionRepository(); public ICrossSectionRepository SectionRepository { get; set; } = new CrossSectionRepository();
@@ -27,9 +27,7 @@ namespace StructureHelperLogics.Models.CrossSections
public object Clone() public object Clone()
{ {
//var newItem = new CrossSection(); cloneStrategy = new CrossSectionCloneStrategy();
//updateStrategy.Update(newItem, this);
//return newItem;
return cloneStrategy.GetClone(this); return cloneStrategy.GetClone(this);
} }
} }

View File

@@ -1,4 +1,5 @@
using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Settings;
namespace StructureHelperLogics.Models.CrossSections namespace StructureHelperLogics.Models.CrossSections
{ {
@@ -12,13 +13,19 @@ namespace StructureHelperLogics.Models.CrossSections
this.repositoryCloneStrategy = repositoryCloneStrategy; this.repositoryCloneStrategy = repositoryCloneStrategy;
} }
public CrossSectionCloneStrategy() : this (new CrossSectionRepositoryCloneStrategy()) public CrossSectionCloneStrategy(ICloningStrategy cloningStrategy) : this (new CrossSectionRepositoryCloneStrategy(cloningStrategy))
{
}
public CrossSectionCloneStrategy() : this (new DeepCloningStrategy())
{ {
} }
public ICrossSection GetClone(ICrossSection sourceObject) public ICrossSection GetClone(ICrossSection sourceObject)
{ {
var project = ProgramSetting.CurrentProject;
ICrossSectionRepository newRepository = repositoryCloneStrategy.GetClone(sourceObject.SectionRepository); ICrossSectionRepository newRepository = repositoryCloneStrategy.GetClone(sourceObject.SectionRepository);
targetObject = new() targetObject = new()
{ {

View File

@@ -1,12 +1,9 @@
using StructureHelperCommon.Infrastructures.Exceptions; using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Infrastructures.Settings;
using StructureHelperCommon.Models.Calculators; using StructureHelperCommon.Models.Calculators;
using StructureHelperCommon.Models.Parameters;
using StructureHelperLogics.Models.Materials; using StructureHelperLogics.Models.Materials;
using StructureHelperLogics.Models.Materials.Logics; using StructureHelperLogics.Models.Materials.Logics;
using StructureHelperLogics.NdmCalculations.Analyses.ByForces; using StructureHelperLogics.NdmCalculations.Analyses.ByForces;
using StructureHelperLogics.NdmCalculations.Analyses.ByForces.LimitCurve;
using StructureHelperLogics.NdmCalculations.Cracking;
using StructureHelperLogics.NdmCalculations.Primitives; using StructureHelperLogics.NdmCalculations.Primitives;
using StructureHelperLogics.NdmCalculations.Primitives.Logics; using StructureHelperLogics.NdmCalculations.Primitives.Logics;
@@ -36,13 +33,9 @@ namespace StructureHelperLogics.Models.CrossSections
this.calculatorsUpdateStrategy = calculatorsUpdateStrategy; this.calculatorsUpdateStrategy = calculatorsUpdateStrategy;
} }
public CrossSectionRepositoryCloneStrategy() : this ( public CrossSectionRepositoryCloneStrategy(ICloningStrategy cloningStrategy)
new DeepCloningStrategy(),
new HasForceActionUpdateCloningStrategy(null),
new HasMaterialsUpdateCloningStrategy(null),
new HasPrimitivesUpdateCloningStrategy(null),
new HasCalculatorsUpdateCloningStrategy(null))
{ {
this.cloningStrategy = cloningStrategy;
forcesUpdateStrategy = new HasForceActionUpdateCloningStrategy(cloningStrategy); forcesUpdateStrategy = new HasForceActionUpdateCloningStrategy(cloningStrategy);
materialsUpdateStrategy = new HasMaterialsUpdateCloningStrategy(cloningStrategy); materialsUpdateStrategy = new HasMaterialsUpdateCloningStrategy(cloningStrategy);
primitivesUpdateStrategy = new HasPrimitivesUpdateCloningStrategy(cloningStrategy); primitivesUpdateStrategy = new HasPrimitivesUpdateCloningStrategy(cloningStrategy);
@@ -51,6 +44,7 @@ namespace StructureHelperLogics.Models.CrossSections
public ICrossSectionRepository GetClone(ICrossSectionRepository sourceObject) public ICrossSectionRepository GetClone(ICrossSectionRepository sourceObject)
{ {
var project = ProgramSetting.CurrentProject;
targetRepository = new(); targetRepository = new();
forcesUpdateStrategy.Update(targetRepository, sourceObject); forcesUpdateStrategy.Update(targetRepository, sourceObject);
materialsUpdateStrategy.Update(targetRepository, sourceObject); materialsUpdateStrategy.Update(targetRepository, sourceObject);

View File

@@ -1,4 +1,5 @@
using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Settings;
using StructureHelperCommon.Services; using StructureHelperCommon.Services;
using StructureHelperLogics.NdmCalculations.Primitives; using StructureHelperLogics.NdmCalculations.Primitives;
using StructureHelperLogics.NdmCalculations.Primitives.Logics; using StructureHelperLogics.NdmCalculations.Primitives.Logics;
@@ -31,6 +32,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces.Logics
public void Update(IForceCalculator targetObject, IForceCalculator sourceObject) public void Update(IForceCalculator targetObject, IForceCalculator sourceObject)
{ {
var project = ProgramSetting.CurrentProject;
CheckObject.IsNull(cloningStrategy); CheckObject.IsNull(cloningStrategy);
CheckObject.IsNull(sourceObject); CheckObject.IsNull(sourceObject);
CheckObject.IsNull(targetObject); CheckObject.IsNull(targetObject);

View File

@@ -1,5 +1,6 @@
using StructureHelperCommon.Infrastructures.Exceptions; using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Settings;
using StructureHelperCommon.Models.Calculators; using StructureHelperCommon.Models.Calculators;
using StructureHelperCommon.Models.Parameters; using StructureHelperCommon.Models.Parameters;
using StructureHelperCommon.Services; using StructureHelperCommon.Services;
@@ -21,14 +22,6 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
private IUpdateStrategy<ICrackCalculator> crackCalculatorUpdateStrategy; private IUpdateStrategy<ICrackCalculator> crackCalculatorUpdateStrategy;
private IUpdateStrategy<ILimitCurvesCalculator> limitCurvesCalculatorUpdateStrategy; private IUpdateStrategy<ILimitCurvesCalculator> limitCurvesCalculatorUpdateStrategy;
public HasCalculatorsUpdateCloningStrategy(ICloningStrategy cloningStrategy) : this(
cloningStrategy,
new ForceCalculatorUpdateCloningStrategy(cloningStrategy),
new CrackCalculatorUpdateCloningStrategy(cloningStrategy),
new LimitCurvesCalculatorUpdateCloningStrategy(cloningStrategy)
)
{
}
public HasCalculatorsUpdateCloningStrategy( public HasCalculatorsUpdateCloningStrategy(
ICloningStrategy cloningStrategy, ICloningStrategy cloningStrategy,
@@ -42,8 +35,18 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
this.limitCurvesCalculatorUpdateStrategy = limitCurvesCalculatorUpdateStrategy; this.limitCurvesCalculatorUpdateStrategy = limitCurvesCalculatorUpdateStrategy;
} }
public HasCalculatorsUpdateCloningStrategy(ICloningStrategy cloningStrategy) : this(
cloningStrategy,
new ForceCalculatorUpdateCloningStrategy(cloningStrategy),
new CrackCalculatorUpdateCloningStrategy(cloningStrategy),
new LimitCurvesCalculatorUpdateCloningStrategy(cloningStrategy)
)
{
}
public void Update(IHasCalculators targetObject, IHasCalculators sourceObject) public void Update(IHasCalculators targetObject, IHasCalculators sourceObject)
{ {
var project = ProgramSetting.CurrentProject;
CheckObject.IsNull(cloningStrategy); CheckObject.IsNull(cloningStrategy);
CheckObject.IsNull(sourceObject); CheckObject.IsNull(sourceObject);
CheckObject.IsNull(targetObject); CheckObject.IsNull(targetObject);
@@ -52,8 +55,8 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
foreach (var calculator in sourceObject.Calculators) foreach (var calculator in sourceObject.Calculators)
{ {
//to do Change to cloning strategy //to do Change to cloning strategy
//var newCalculator = cloningStrategy.Clone(calculator); var newCalculator = cloningStrategy.Clone(calculator);
var newCalculator = calculator.Clone() as ICalculator; //var newCalculator = calculator.Clone() as ICalculator;
if (calculator is IForceCalculator forceCalculator) if (calculator is IForceCalculator forceCalculator)
{ {
forceCalculatorUpdateStrategy.Update(newCalculator as IForceCalculator, forceCalculator); forceCalculatorUpdateStrategy.Update(newCalculator as IForceCalculator, forceCalculator);

View File

@@ -68,11 +68,14 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
Message = "Mx = " + item.DesignForceTuple.ForceTuple.Mx.ToString() + "N*m, My = " + item.DesignForceTuple.ForceTuple.My.ToString() + "N*m, Nz =" + item.DesignForceTuple.ForceTuple.Nz.ToString() + "N, ", Message = "Mx = " + item.DesignForceTuple.ForceTuple.Mx.ToString() + "N*m, My = " + item.DesignForceTuple.ForceTuple.My.ToString() + "N*m, Nz =" + item.DesignForceTuple.ForceTuple.Nz.ToString() + "N, ",
Priority = priority Priority = priority
}; };
if (item.LoaderResults is not null)
{
ndmRow.Elements[2].Value = new StringLogEntry() ndmRow.Elements[2].Value = new StringLogEntry()
{ {
Message = "Kx = " + item.LoaderResults.StrainMatrix.Kx + "(1/m), Ky = " + item.LoaderResults.StrainMatrix.Ky + "(1/m), EpsZ = " + item.LoaderResults.StrainMatrix.EpsZ + "(dimensionless)", Message = "Kx = " + item.LoaderResults.StrainMatrix.Kx + "(1/m), Ky = " + item.LoaderResults.StrainMatrix.Ky + "(1/m), EpsZ = " + item.LoaderResults.StrainMatrix.EpsZ + "(dimensionless)",
Priority = priority Priority = priority
}; };
}
ndmRow.Elements[3].Value = new StringLogEntry() ndmRow.Elements[3].Value = new StringLogEntry()
{ {
Message = item.Description, Message = item.Description,

View File

@@ -1,4 +1,5 @@
using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Settings;
using StructureHelperCommon.Services; using StructureHelperCommon.Services;
namespace StructureHelperLogics.NdmCalculations.Primitives.Logics namespace StructureHelperLogics.NdmCalculations.Primitives.Logics
@@ -30,6 +31,7 @@ namespace StructureHelperLogics.NdmCalculations.Primitives.Logics
private void ProcessPrimitive(IHasPrimitives targetObject, INdmPrimitive primitive) private void ProcessPrimitive(IHasPrimitives targetObject, INdmPrimitive primitive)
{ {
var project = ProgramSetting.CurrentProject;
var newPrimitive = cloningStrategy.Clone(primitive); var newPrimitive = cloningStrategy.Clone(primitive);
if (primitive.NdmElement.HeadMaterial is not null) if (primitive.NdmElement.HeadMaterial is not null)
{ {