diff --git a/src/main/java/no/nibio/vips/model/maths/NonLinearCurves.java b/src/main/java/no/nibio/vips/model/maths/NonLinearCurves.java index f681fdef4d6f99f011deb45d19d64b91b21fa670..9a8f17e2ea4a21e14007bef121f3c539d20ff420 100755 --- a/src/main/java/no/nibio/vips/model/maths/NonLinearCurves.java +++ b/src/main/java/no/nibio/vips/model/maths/NonLinearCurves.java @@ -132,7 +132,7 @@ public class NonLinearCurves { Double theta_2 = Math.asin((Tu - m) / alpha); // Case 5: Tmin above Tl and Tmax above Tu - if(Tmin >= Tl && Tu != null && Tmax >= Tu) + if(Tmin > Tl && Tu != null && Tmax > Tu) { return (1/Math.PI) * ( (m-Tl)*(theta_2 + Math.PI/2) diff --git a/src/test/java/no/nibio/vips/model/maths/NonLinearCurvesTest.java b/src/test/java/no/nibio/vips/model/maths/NonLinearCurvesTest.java index c3c910b30f0fa10963eb893a32c5adf2cf13e400..b5a8557a913e2e2e509348aa7b3d3877d09dd79b 100755 --- a/src/test/java/no/nibio/vips/model/maths/NonLinearCurvesTest.java +++ b/src/test/java/no/nibio/vips/model/maths/NonLinearCurvesTest.java @@ -190,6 +190,14 @@ public class NonLinearCurvesTest extends TestCase { result = instance.calculateSingleSineWaveWithCutoff(tMin, tMax, thresholdLower, thresholdUpper); assertEquals(expectedResult, result,0.1); + tMax = 32.0; + tMin = 20.0; + thresholdUpper = 31.1; + thresholdLower = 20.0; + expectedResult = 5.894588543400416; + result = instance.calculateSingleSineWaveWithCutoff(tMin, tMax, thresholdLower, thresholdUpper); + assertEquals(expectedResult, result,0.1); + } }