Skip to content

Commit 4ff69ff

Browse files
committed
MathUtil.FEquals
1 parent 8d0381e commit 4ff69ff

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

BriefFiniteElementNet.Common/Force.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,9 @@ public override string ToString()
383383
{
384384
var buf = string.Format(CultureInfo.CurrentCulture, "F: {0}, M: {1}", Forces, Moments);
385385

386-
//MathUtil.Equals(X, 0) && X != 0 ? "~0" : (object)X,
387-
//MathUtil.Equals(Y, 0) && Y != 0 ? "~0" : (object)Y,
388-
//MathUtil.Equals(Z, 0) && Z != 0 ? "~0" : (object)Z);
386+
//MathUtil.FEquals(X, 0) && X != 0 ? "~0" : (object)X,
387+
//MathUtil.FEquals(Y, 0) && Y != 0 ? "~0" : (object)Y,
388+
//MathUtil.FEquals(Z, 0) && Z != 0 ? "~0" : (object)Z);
389389
return buf;
390390
}
391391

BriefFiniteElementNet.Common/MatrixOld.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ protected bool Equals(MatrixOld other)
826826

827827
for (int i = 0; i < other.CoreArray.Length; i++)
828828
{
829-
if (!MathUtil.Equals(this.CoreArray[i], other.CoreArray[i]))
829+
if (!MathUtil.FEquals(this.CoreArray[i], other.CoreArray[i]))
830830
return false;
831831
}
832832

@@ -874,7 +874,7 @@ public bool IsUpperTrapeze()
874874
{
875875
for (int j = 1; j <= columnCount; j++)
876876
for (int i = j + 1; i <= rowCount; i++)
877-
if (!MathUtil.Equals(this.CoreArray[j * this.RowCount + i], 0))
877+
if (!MathUtil.FEquals(this.CoreArray[j * this.RowCount + i], 0))
878878
return false;
879879

880880
return true;
@@ -888,7 +888,7 @@ public bool IsLowerTrapeze()
888888
{
889889
for (int i = 1; i <= rowCount; i++)
890890
for (int j = i + 1; j <= columnCount; j++)
891-
if (!MathUtil.Equals(this.CoreArray[j * this.RowCount + i], 0))
891+
if (!MathUtil.FEquals(this.CoreArray[j * this.RowCount + i], 0))
892892
return false;
893893

894894
return true;

BriefFiniteElementNet.Common/Vector.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ public Vector(double x, double y, double z) : this()
9292
public override string ToString()
9393
{
9494
var buf = string.Format(CultureInfo.CurrentCulture, "{0}, {1}, {2}", X, Y, Z);
95-
//MathUtil.Equals(X, 0) && X != 0 ? "~0" : (object)X,
96-
//MathUtil.Equals(Y, 0) && Y != 0 ? "~0" : (object)Y,
97-
//MathUtil.Equals(Z, 0) && Z != 0 ? "~0" : (object)Z);
95+
//MathUtil.FEquals(X, 0) && X != 0 ? "~0" : (object)X,
96+
//MathUtil.FEquals(Y, 0) && Y != 0 ? "~0" : (object)Y,
97+
//MathUtil.FEquals(Z, 0) && Z != 0 ? "~0" : (object)Z);
9898
return buf;
9999
}
100100

BriefFiniteElementNet.Legacy/FrameElement2Node.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ protected virtual void ReCalculateTransformationStuff()
676676
var v = this.EndNode.Location - this.StartNode.Location;
677677

678678

679-
if (Common.MathUtil.Equals(0, v.X) && Common.MathUtil.Equals(0, v.Y))
679+
if (Common.MathUtil.FEquals(0, v.X) && Common.MathUtil.FEquals(0, v.Y))
680680
{
681681
if (v.Z > 0)
682682
{

BriefFiniteElementNet.Legacy/TrussElement2Node.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ private void ReCalculateTransformationParameters()
273273

274274
var v = this.EndNode.Location - this.StartNode.Location;
275275

276-
if (Common.MathUtil.Equals(0, v.X) && Common.MathUtil.Equals(0, v.Y))
276+
if (Common.MathUtil.FEquals(0, v.X) && Common.MathUtil.FEquals(0, v.Y))
277277
{
278278
if (v.Z > 0)
279279
{

BriefFiniteElementNet/Elements/BarElement.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ public override Matrix GetLambdaMatrix()
387387
388388
var v = this.EndNode.Location - this.StartNode.Location;
389389
390-
if (MathUtil.Equals(0, v.X) && MathUtil.Equals(0, v.Y))
390+
if (MathUtil.FEquals(0, v.X) && MathUtil.FEquals(0, v.Y))
391391
{
392392
if (v.Z > 0)
393393
{
@@ -554,7 +554,7 @@ public Matrix GetTransformationMatrix()
554554

555555
var v = this.EndNode.Location - this.StartNode.Location;
556556

557-
if (Common.MathUtil.Equals(0, v.X) && Common.MathUtil.Equals(0, v.Y))
557+
if (Common.MathUtil.FEquals(0, v.X) && Common.MathUtil.FEquals(0, v.Y))
558558
{
559559
if (v.Z > 0)
560560
{

BriefFiniteElementNet/Utils/CalcUtil.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static Matrix GetBarTransformationMatrixnew(Vector v, double _webRotation
5858
//var v = this.EndNode.Location - this.StartNode.Location;
5959
//copied from MATLAB Codes for Finite Element Analysis, Solids and Structures by A.J.M.Ferreira p 107
6060
61-
if (MathUtil.Equals(0, v.X) && MathUtil.Equals(0, v.Y))
61+
if (MathUtil.FEquals(0, v.X) && MathUtil.FEquals(0, v.Y))
6262
{
6363
if (v.Z > 0)
6464
{
@@ -731,7 +731,7 @@ public static Matrix Get2NodeElementTransformationMatrix(Vector v, double webR)
731731
var s = webR.Equals(0.0) ? 0.0 : Math.Sin(teta);
732732
var c = webR.Equals(0.0) ? 1.0 : Math.Cos(teta);
733733

734-
if (MathUtil.Equals(0, v.X) && MathUtil.Equals(0, v.Y))
734+
if (MathUtil.FEquals(0, v.X) && MathUtil.FEquals(0, v.Y))
735735
{
736736
if (v.Z > 0)
737737
{

0 commit comments

Comments
 (0)