Fixes in nurbs derivatives + other tweaks

Paramdigma · Nov 14, 2020 · f3dab85 · f3dab85
1 parent 2b06a01
commit f3dab85
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/src/Geometry/3D/NurbsCalculator.cs b/src/Geometry/3D/NurbsCalculator.cs
@@ -209,7 +209,7 @@ public static Point3d DeCasteljau2(
         /// <returns>The knot span index.</returns>
         public static int FindSpan(int n, int degree, double t, IList<double> knotVector)
         {
-            if (Math.Abs(t - knotVector[n + 1]) < Settings.Tolerance)
+            if (t >= knotVector[n+1])
                 return n;
 
             var low = degree;

diff --git a/src/Geometry/3D/NurbsSurface.cs b/src/Geometry/3D/NurbsSurface.cs
@@ -122,10 +122,10 @@ public Point3d PointAt(double u, double v) => NurbsCalculator.SurfacePoint(
 
         public Matrix<Vector3d> DerivativesAt(double u, double v, int count) =>
             NurbsCalculator.NurbsSurfaceDerivs(
-                this.ControlPoints.M,
+                this.ControlPoints.M - 1,
                 this.DegreeU,
                 this.KnotsU,
-                this.ControlPoints.M,
+                this.ControlPoints.M - 1,
                 this.DegreeV,
                 this.KnotsV,
                 this.ControlPoints,

diff --git a/tests/Geometry/3D/BoxTests.cs b/tests/Geometry/3D/BoxTests.cs
@@ -2,7 +2,7 @@
 using Paramdigma.Core.Geometry;
 using Xunit;
 
-namespace Paramdigma.Core.Tests.Geometry._3D
+namespace Paramdigma.Core.Tests.Geometry
 {
     public class BoxTests
     {

diff --git a/tests/Geometry/3D/CircleTests.cs b/tests/Geometry/3D/CircleTests.cs
@@ -1,7 +1,7 @@
 using Paramdigma.Core.Geometry;
 using Xunit;
 
-namespace Paramdigma.Core.Tests.Geometry._3D
+namespace Paramdigma.Core.Tests.Geometry
 {
     public class CircleTests
     {

diff --git a/tests/Geometry/3D/CylinderTests.cs b/tests/Geometry/3D/CylinderTests.cs
@@ -2,7 +2,7 @@
 using Paramdigma.Core.Geometry;
 using Xunit;
 
-namespace Paramdigma.Core.Tests.Geometry._3D
+namespace Paramdigma.Core.Tests.Geometry
 {
     public class CylinderTests
     {

diff --git a/tests/Geometry/3D/MeshTests.cs b/tests/Geometry/3D/MeshTests.cs
@@ -3,7 +3,7 @@
 using Paramdigma.Core.HalfEdgeMesh;
 using Xunit;
 
-namespace Paramdigma.Core.Tests.Geometry._3D
+namespace Paramdigma.Core.Tests.Geometry
 {
     public class MeshTests
     {

diff --git a/tests/Geometry/3D/MeshVertexTests.cs b/tests/Geometry/3D/MeshVertexTests.cs
@@ -3,7 +3,7 @@
 using Paramdigma.Core.HalfEdgeMesh;
 using Xunit;
 
-namespace Paramdigma.Core.Tests.Geometry._3D
+namespace Paramdigma.Core.Tests.Geometry
 {
     public class MeshVertexTests
     {

diff --git a/tests/Geometry/3D/NurbsCurveData.cs b/tests/Geometry/3D/NurbsCurveData.cs
@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Paramdigma.Core.Tests.Geometry._3D
+namespace Paramdigma.Core.Tests.Geometry
 {
     public class NurbsCurveUnitParamData : IEnumerable<object[]>
     {

diff --git a/tests/Geometry/3D/NurbsCurveTests.cs b/tests/Geometry/3D/NurbsCurveTests.cs
@@ -5,7 +5,7 @@
 using Xunit;
 using RG = Rhino.Geometry;
 
-namespace Paramdigma.Core.Tests.Geometry._3D
+namespace Paramdigma.Core.Tests.Geometry
 {
     public class NurbsCurveTests
     {

diff --git a/tests/Geometry/3D/NurbsSurfaceTests.cs b/tests/Geometry/3D/NurbsSurfaceTests.cs
@@ -9,7 +9,7 @@
 using Xunit.Abstractions;
 using RG = Rhino.Geometry;
 
-namespace Paramdigma.Core.Tests.Geometry._3D
+namespace Paramdigma.Core.Tests.Geometry
 {
     public class NurbsSurfaceTests
     {
@@ -89,6 +89,7 @@ public IEnumerator<object[]> GetEnumerator()
             yield return new object[] {0.8, .2};
             yield return new object[] {0.9, .1};
             yield return new object[] {0.99, .0};
+            yield return new object[] {1, .0};
         }
 
 

diff --git a/tests/Geometry/3D/SphereTests.cs b/tests/Geometry/3D/SphereTests.cs
@@ -3,7 +3,7 @@
 using Paramdigma.Core.Geometry;
 using Xunit;
 
-namespace Paramdigma.Core.Tests.Geometry._3D
+namespace Paramdigma.Core.Tests.Geometry
 {
     public class SphereTests
     {