Fix Test
This commit is contained in:
Binary file not shown.
BIN
StructureHelper/Libraries/NLog.dll
Normal file
BIN
StructureHelper/Libraries/NLog.dll
Normal file
Binary file not shown.
@@ -40,4 +40,10 @@
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="Libraries\NLog.dll">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
||||
<StackPanel>
|
||||
<Expander Header="Actions" MinWidth="20" DataContext="{Binding CombinationsLogic}">
|
||||
<Expander.ContextMenu>
|
||||
@@ -142,6 +143,7 @@
|
||||
</ListBox>
|
||||
</Expander>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
<Border BorderBrush="Black" Background="White" BorderThickness="1" Margin="5" Grid.Column="1">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="PreviewMouseDown">
|
||||
|
||||
@@ -62,7 +62,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
|
||||
}
|
||||
else point2D = combination.ForcePoint;
|
||||
var newTuple = ForceTupleService.MoveTupleIntoPoint(tuple.ForceTuple, point2D);
|
||||
var result = GetPrimitiveStrainMatrix(ndms, newTuple);
|
||||
IForcesTupleResult result = GetPrimitiveStrainMatrix(ndms, newTuple);
|
||||
if (CompressedMember.Buckling == true)
|
||||
{
|
||||
IForceTuple longTuple;
|
||||
@@ -85,15 +85,14 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
|
||||
result.Desctription += $"Buckling result:\n{bucklingResult.Desctription}\n";
|
||||
}
|
||||
newTuple = CalculateBuckling(newTuple, bucklingResult);
|
||||
result = GetPrimitiveStrainMatrix(ndms, newTuple);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
result.IsValid = false;
|
||||
result.Desctription = $"Buckling error:\n{ex}\n";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
result.DesignForceTuple.LimitState = limitState;
|
||||
result.DesignForceTuple.CalcTerm = calcTerm;
|
||||
result.DesignForceTuple.ForceTuple = newTuple;
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace StructureHelperTests.UnitTests.Ndms.Triangulations
|
||||
//Участок с поворотом на 1 радиан
|
||||
[TestCase(0d, 0d, 1.0d, 1.0d, 1d, 0.02d, 1, 50 * 50, 0.14757265268048089d, -0.67706891243125777d)]
|
||||
//Участок со смещением и поворотом на 1 радиан
|
||||
[TestCase(2d, 2d, 1.0d, 1.0d, 1d, 0.02d, 1, 50 * 50, -0.45476470519903267d, 2.0864776689208147d)]
|
||||
[TestCase(2d, 2d, 1.0d, 1.0d, 1d, 0.02d, 1, 50 * 50, -0.45476470519903262d, 2.0864776689208147d)]
|
||||
public void Run_ShouldPass (double centerX, double centerY, double width, double height, double angle, double ndmMaxSize, int ndmMinDivision, int expectedCount, double expectedFirstCenterX, double expectedFirstCenterY)
|
||||
{
|
||||
//Arrange
|
||||
|
||||
Reference in New Issue
Block a user