Re-arranged some points of the Duval Pentagon areas

engineers-tools · Oct 10, 2017 · cb2611a · cb2611a
1 parent 12abde5
commit cb2611a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/Distribution/xDGA.ADDIN.xll b/Distribution/xDGA.ADDIN.xll
diff --git a/Distribution/xDGA.ADDIN64.xll b/Distribution/xDGA.ADDIN64.xll
diff --git a/Distribution/xDGA32.zip b/Distribution/xDGA32.zip
diff --git a/Distribution/xDGA64.zip b/Distribution/xDGA64.zip
diff --git a/xDGA.CORE/Algorithms/DuvalPentagons/DuvalPentagonOneRule.cs b/xDGA.CORE/Algorithms/DuvalPentagons/DuvalPentagonOneRule.cs
@@ -66,11 +66,11 @@ public DuvalPentagonOneRule() : base("Duval Pentagon 1", Gas.Hydrogen, Gas.Ethan
             {
                 Coordinates =
                 {
-                    new CartesianCoordinate(24.0, -30.0),
+                    new CartesianCoordinate(-1.0, -2.0),
+                    new CartesianCoordinate(-6.0, -4.0),
                     new CartesianCoordinate(1.0, -32.4),
                     new CartesianCoordinate(-23.3, -32.4),
-                    new CartesianCoordinate(-6.0, -4.0),
-                    new CartesianCoordinate(-1.0, -2.0)
+                    new CartesianCoordinate(24.0, -30.0)
                 }
             });
 
@@ -90,25 +90,25 @@ public DuvalPentagonOneRule() : base("Duval Pentagon 1", Gas.Hydrogen, Gas.Ethan
                 {
                     new CartesianCoordinate(0.0, 1.5),
                     new CartesianCoordinate(-35.0, 3.0),
+                    new CartesianCoordinate(-23.3, -32.4),
                     new CartesianCoordinate(-22.5, -32.4),
                     new CartesianCoordinate(-6.0, -4.0),
-                    new CartesianCoordinate(-1.0, -2.0),
-                    new CartesianCoordinate(-23.3, -32.4)
+                    new CartesianCoordinate(-1.0, -2.0)
                 }
             });
 
             Pentagon.Areas.Add(new Area(FailureType.Code.S)
             {
                 Coordinates =
                 {
-                    new CartesianCoordinate(-35.0, 3.0),
                     new CartesianCoordinate(0.0, 1.5),
                     new CartesianCoordinate(0.0, 24.5),
                     new CartesianCoordinate(-1.0, 24.5),
                     new CartesianCoordinate(-1.0, 33.0),
                     new CartesianCoordinate(0.0, 33.0),
                     new CartesianCoordinate(0.0, 40.0),
-                    new CartesianCoordinate(-38.0, -12.4)
+                    new CartesianCoordinate(-38.0, 12.4),
+                    new CartesianCoordinate(-35.0, 3.0)
                 }
             });
         }

diff --git a/xDGA.CORE/Algorithms/DuvalPentagons/DuvalPentagonTwoRule.cs b/xDGA.CORE/Algorithms/DuvalPentagons/DuvalPentagonTwoRule.cs
@@ -66,26 +66,26 @@ public DuvalPentagonTwoRule() : base("Duval Pentagon 2", Gas.Hydrogen, Gas.Ethan
             {
                 Coordinates =
                 {
-                    new CartesianCoordinate(-35.0, 3.0),
                     new CartesianCoordinate(0.0, 1.5),
                     new CartesianCoordinate(0.0, 24.5),
                     new CartesianCoordinate(-1.0, 24.5),
                     new CartesianCoordinate(-1.0, 33.0),
                     new CartesianCoordinate(0.0, 33.0),
                     new CartesianCoordinate(0.0, 40.0),
-                    new CartesianCoordinate(-38.0, -12.4)
+                    new CartesianCoordinate(-38.0, 12.4),
+                    new CartesianCoordinate(-35.0, 3.0)
                 }
             });
 
             Pentagon.Areas.Add(new Area(FailureType.Code.T3_H)
             {
                 Coordinates =
                 {
-                    new CartesianCoordinate(24.0, -30.0),
-                    new CartesianCoordinate(-3.5, -3.0),
                     new CartesianCoordinate(-1.0, -2.0),
+                    new CartesianCoordinate(-3.5, -3.0),
                     new CartesianCoordinate(2.5, -32.4),
-                    new CartesianCoordinate(23.3, -32.4)
+                    new CartesianCoordinate(23.3, -32.4),
+                    new CartesianCoordinate(24.0, -30.0)
                 }
             });