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

ForceCalculator was fixed

Browse Source
This commit is contained in:
Evgeny Redikultsev
2022-12-20 21:40:41 +05:00
parent 487cc66c39
commit 52c6917a0d
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
StructureHelperLogics/Models/Templates/CrossSections/RCs/RCSectionTemplate.cs
View File

@@ -27,7 +27,6 @@ namespace StructureHelperLogics.Models.Templates.CrossSections
var repository = section.SectionRepository; var repository = section.SectionRepository;
var materials = materialLogic.GetHeadMaterials(); var materials = materialLogic.GetHeadMaterials();
primitives = geometryLogic.GetNdmPrimitives(); primitives = geometryLogic.GetNdmPrimitives();
#error
repository.HeadMaterials.AddRange(materials); repository.HeadMaterials.AddRange(materials);
repository.Primitives.AddRange(primitives); repository.Primitives.AddRange(primitives);
combinations = forceLogic.GetCombinationList(); combinations = forceLogic.GetCombinationList();

8
StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculator.cs
View File

@@ -26,7 +26,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
public List<LimitStates> LimitStatesList { get; } public List<LimitStates> LimitStatesList { get; }
public List<CalcTerms> CalcTermsList { get; } public List<CalcTerms> CalcTermsList { get; }
public List<IForceCombinationList> ForceCombinationLists { get; } public List<IForceCombinationList> ForceCombinationLists { get; }
public List<INdmPrimitive> NdmPrimitives { get; } public List<INdmPrimitive> Primitives { get; }
public INdmResult Result { get; private set; } public INdmResult Result { get; private set; }
@@ -52,7 +52,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
var calcTerm = tuple.CalcTerm; var calcTerm = tuple.CalcTerm;
if (LimitStatesList.Contains(limitState) & CalcTermsList.Contains(calcTerm)) if (LimitStatesList.Contains(limitState) & CalcTermsList.Contains(calcTerm))
{ {
var ndms = NdmPrimitivesService.GetNdms(NdmPrimitives, limitState, calcTerm); var ndms = NdmPrimitivesService.GetNdms(Primitives, limitState, calcTerm);
IPoint2D point2D; IPoint2D point2D;
if (combination.SetInGravityCenter == true) if (combination.SetInGravityCenter == true)
{ {
@@ -75,7 +75,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
private string CheckInputData() private string CheckInputData()
{ {
string result = ""; string result = "";
if (NdmPrimitives.Count == 0) { result += "Calculator does not contain any primitives \n"; } if (Primitives.Count == 0) { result += "Calculator does not contain any primitives \n"; }
if (ForceCombinationLists.Count == 0) { result += "Calculator does not contain any forces \n"; } if (ForceCombinationLists.Count == 0) { result += "Calculator does not contain any forces \n"; }
if (LimitStatesList.Count == 0) { result += "Calculator does not contain any limit states \n"; } if (LimitStatesList.Count == 0) { result += "Calculator does not contain any limit states \n"; }
if (CalcTermsList.Count == 0) { result += "Calculator does not contain any duration \n"; } if (CalcTermsList.Count == 0) { result += "Calculator does not contain any duration \n"; }
@@ -85,7 +85,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
public ForceCalculator() public ForceCalculator()
{ {
ForceCombinationLists = new List<IForceCombinationList>(); ForceCombinationLists = new List<IForceCombinationList>();
NdmPrimitives = new List<INdmPrimitive>(); Primitives = new List<INdmPrimitive>();
IterationAccuracy = 0.001d; IterationAccuracy = 0.001d;
MaxIterationCount = 1000; MaxIterationCount = 1000;
LimitStatesList = new List<LimitStates>() { LimitStates.ULS, LimitStates.SLS }; LimitStatesList = new List<LimitStates>() { LimitStates.ULS, LimitStates.SLS };

16
Windows/ViewModels/Calculations/Calculators/ForceCalculatorViewModel.cs
View File

@@ -57,7 +57,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
{ {
get get
{ {
var sourceItems = forcesCalculator.NdmPrimitives; var sourceItems = forcesCalculator.Primitives;
var rejectedItems = allowedPrimitives.Where(x => sourceItems.Contains(x)); var rejectedItems = allowedPrimitives.Where(x => sourceItems.Contains(x));
var filteredItems = allowedPrimitives.Except(rejectedItems); var filteredItems = allowedPrimitives.Except(rejectedItems);
return ConvertNdmPrimitivesToPrimitiveBase(filteredItems); return ConvertNdmPrimitivesToPrimitiveBase(filteredItems);
@@ -67,7 +67,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
{ {
get get
{ {
var sourceItems = forcesCalculator.NdmPrimitives; var sourceItems = forcesCalculator.Primitives;
return ConvertNdmPrimitivesToPrimitiveBase(sourceItems); return ConvertNdmPrimitivesToPrimitiveBase(sourceItems);
} }
} }
@@ -94,8 +94,8 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
} }
private void AddAllPrimitives() private void AddAllPrimitives()
{ {
forcesCalculator.NdmPrimitives.Clear(); forcesCalculator.Primitives.Clear();
forcesCalculator.NdmPrimitives.AddRange(allowedPrimitives); forcesCalculator.Primitives.AddRange(allowedPrimitives);
} }
public ICommand ClearAllPrimitivesCommand public ICommand ClearAllPrimitivesCommand
{ {
@@ -105,10 +105,10 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
( (
clearAllPrimitivesCommand = new RelayCommand(o => clearAllPrimitivesCommand = new RelayCommand(o =>
{ {
forcesCalculator.NdmPrimitives.Clear(); forcesCalculator.Primitives.Clear();
OnPropertyChanged(nameof(AllowedPrimitives)); OnPropertyChanged(nameof(AllowedPrimitives));
OnPropertyChanged(nameof(Primitives)); OnPropertyChanged(nameof(Primitives));
}, o => forcesCalculator.NdmPrimitives.Count > 0 )); }, o => forcesCalculator.Primitives.Count > 0 ));
} }
} }
public ICommand AddSelectedPrimitiveCommand public ICommand AddSelectedPrimitiveCommand
@@ -119,7 +119,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
( (
addSelectedPrimitiveCommand = new RelayCommand(o => addSelectedPrimitiveCommand = new RelayCommand(o =>
{ {
forcesCalculator.NdmPrimitives.Add(SelectedAllowedPrimitive.GetNdmPrimitive()); forcesCalculator.Primitives.Add(SelectedAllowedPrimitive.GetNdmPrimitive());
OnPropertyChanged(nameof(AllowedPrimitives)); OnPropertyChanged(nameof(AllowedPrimitives));
OnPropertyChanged(nameof(Primitives)); OnPropertyChanged(nameof(Primitives));
}, o => SelectedAllowedPrimitive != null)); }, o => SelectedAllowedPrimitive != null));
@@ -133,7 +133,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
( (
removeSelectedPrimitive = new RelayCommand(o => removeSelectedPrimitive = new RelayCommand(o =>
{ {
forcesCalculator.NdmPrimitives.Remove(SelectedPrimitive.GetNdmPrimitive()); forcesCalculator.Primitives.Remove(SelectedPrimitive.GetNdmPrimitive());
OnPropertyChanged(nameof(AllowedPrimitives)); OnPropertyChanged(nameof(AllowedPrimitives));
OnPropertyChanged(nameof(Primitives)); OnPropertyChanged(nameof(Primitives));
}, o => SelectedPrimitive != null)); }, o => SelectedPrimitive != null));

2
Windows/ViewModels/Calculations/Calculators/ForcesResultsViewModel.cs
View File

@@ -53,7 +53,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
{ {
this.forceCalculator = forceCalculator; this.forceCalculator = forceCalculator;
this.forcesResults = this.forceCalculator.Result as IForcesResults; this.forcesResults = this.forceCalculator.Result as IForcesResults;
ndmPrimitives = this.forceCalculator.NdmPrimitives; ndmPrimitives = this.forceCalculator.Primitives;
} }
private void ShowIsoField() private void ShowIsoField()