diff --git a/Distribution/xDGA.ADDIN.xll b/Distribution/xDGA.ADDIN.xll index e42033c..c00767f 100644 Binary files a/Distribution/xDGA.ADDIN.xll and b/Distribution/xDGA.ADDIN.xll differ diff --git a/Distribution/xDGA.ADDIN64.xll b/Distribution/xDGA.ADDIN64.xll index 3572c3f..eae783f 100644 Binary files a/Distribution/xDGA.ADDIN64.xll and b/Distribution/xDGA.ADDIN64.xll differ diff --git a/Distribution/xDGA32.zip b/Distribution/xDGA32.zip index 5cea22e..1a85553 100644 Binary files a/Distribution/xDGA32.zip and b/Distribution/xDGA32.zip differ diff --git a/Distribution/xDGA64.zip b/Distribution/xDGA64.zip index d117ac2..42ef8a5 100644 Binary files a/Distribution/xDGA64.zip and b/Distribution/xDGA64.zip differ diff --git a/xDGA.CORE/Algorithms/DuvalPentagons/DuvalPentagonOneRule.cs b/xDGA.CORE/Algorithms/DuvalPentagons/DuvalPentagonOneRule.cs index d2d97ff..b5579eb 100644 --- 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,10 +90,10 @@ 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) } }); @@ -101,14 +101,14 @@ public DuvalPentagonOneRule() : base("Duval Pentagon 1", 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) } }); } diff --git a/xDGA.CORE/Algorithms/DuvalPentagons/DuvalPentagonTwoRule.cs b/xDGA.CORE/Algorithms/DuvalPentagons/DuvalPentagonTwoRule.cs index 13f9e39..9a944a8 100644 --- a/xDGA.CORE/Algorithms/DuvalPentagons/DuvalPentagonTwoRule.cs +++ b/xDGA.CORE/Algorithms/DuvalPentagons/DuvalPentagonTwoRule.cs @@ -66,14 +66,14 @@ 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) } }); @@ -81,11 +81,11 @@ public DuvalPentagonTwoRule() : base("Duval Pentagon 2", Gas.Hydrogen, Gas.Ethan { 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) } });