diff --git a/targetFunctions/common/resampleLayers/adaptive.m b/targetFunctions/common/resampleLayers/adaptive.m index dce5f5ac5..1d22c605a 100644 --- a/targetFunctions/common/resampleLayers/adaptive.m +++ b/targetFunctions/common/resampleLayers/adaptive.m @@ -144,7 +144,7 @@ %nPoints = 20; %minAngle = 0.8*pi; minSignal = 0.2; % units normalized to data range -minLength = 0; % units normalized to data range +minLength = 0.005; % units normalized to data range maxLength = Inf; % units normalized to data range maxArea = 5e-4; % units normalized to data range @@ -204,7 +204,7 @@ % n = n+2; % case 'minlength' % minLength = varargin{n+1}; -% thresholdingLength = true; + thresholdingLength = true; % n = n+2; % case 'minsignal' % minSignal = varargin{n+1}; @@ -286,14 +286,14 @@ % triangle side is a segment, which can be split or not depending on the % refinement parameters. segmentsToSplit = [trianglesToRefine; false] | [false; trianglesToRefine]; -% if thresholdingLength -% dataSegments = diff(dataPoints(:,1:2)); -% normalizedSegments = bsxfun(@rdivide, dataSegments, dataBoxSize); -% segmentsLengthNormalized = hypot(normalizedSegments(:,1), normalizedSegments(:,2)); -% tooLongSegments = segmentsLengthNormalized > maxLength; -% longEnoughSegments = segmentsLengthNormalized > minLength; -% segmentsToSplit = (segmentsToSplit | tooLongSegments) & longEnoughSegments; -% end + if thresholdingLength + dataSegments = diff(dataPoints(:,1:2)); + normalizedSegments = bsxfun(@rdivide, dataSegments, dataBoxSize); + segmentsLengthNormalized = hypot(normalizedSegments(:,1), normalizedSegments(:,2)); + tooLongSegments = segmentsLengthNormalized > maxLength; + longEnoughSegments = segmentsLengthNormalized > minLength; + segmentsToSplit = (segmentsToSplit | tooLongSegments) & longEnoughSegments; + end % if thresholdingSignal % segmentsCenters = (dataPoints(1:end-1,2)+dataPoints(2:end,2))/2; % centerAboveThreshold = segmentsCenters > minSignal * max(abs(dataPoints(:,2))); diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomLayersInputs.mat b/tests/domainsTFReflectivityCalculation/domainsCustomLayersInputs.mat index caf4700b6..71dd58aaa 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomLayersInputs.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomLayersInputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomLayersOutputs.mat b/tests/domainsTFReflectivityCalculation/domainsCustomLayersOutputs.mat index 5abf26956..5ac2a77dd 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomLayersOutputs.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomLayersOutputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomLayersTFParams.mat b/tests/domainsTFReflectivityCalculation/domainsCustomLayersTFParams.mat index bcf1e5fa2..a50b7c19f 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomLayersTFParams.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomLayersTFParams.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomXYInputs.mat b/tests/domainsTFReflectivityCalculation/domainsCustomXYInputs.mat index 7c4bd7e2c..581beab62 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomXYInputs.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomXYInputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomXYOutputs.mat b/tests/domainsTFReflectivityCalculation/domainsCustomXYOutputs.mat index 1d93df1f5..5a38ede29 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomXYOutputs.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomXYOutputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomXYTFParams.mat b/tests/domainsTFReflectivityCalculation/domainsCustomXYTFParams.mat index 25e0e5359..d86e7e25a 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomXYTFParams.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomXYTFParams.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsStandardLayersInputs.mat b/tests/domainsTFReflectivityCalculation/domainsStandardLayersInputs.mat index a22f39ec6..637ba2348 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsStandardLayersInputs.mat and b/tests/domainsTFReflectivityCalculation/domainsStandardLayersInputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsStandardLayersOutputs.mat b/tests/domainsTFReflectivityCalculation/domainsStandardLayersOutputs.mat index 8afe2aaea..d522adda4 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsStandardLayersOutputs.mat and b/tests/domainsTFReflectivityCalculation/domainsStandardLayersOutputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsStandardLayersTFParams.mat b/tests/domainsTFReflectivityCalculation/domainsStandardLayersTFParams.mat index 65e82b655..c3f7210e6 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsStandardLayersTFParams.mat and b/tests/domainsTFReflectivityCalculation/domainsStandardLayersTFParams.mat differ diff --git a/tests/normalTFReflectivityCalculation/absorptionInputs.mat b/tests/normalTFReflectivityCalculation/absorptionInputs.mat index 261cc67b5..fd7c95e6a 100644 Binary files a/tests/normalTFReflectivityCalculation/absorptionInputs.mat and b/tests/normalTFReflectivityCalculation/absorptionInputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/absorptionOutputs.mat b/tests/normalTFReflectivityCalculation/absorptionOutputs.mat index 63b3dd03e..2c5d1956e 100644 Binary files a/tests/normalTFReflectivityCalculation/absorptionOutputs.mat and b/tests/normalTFReflectivityCalculation/absorptionOutputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/absorptionTFParams.mat b/tests/normalTFReflectivityCalculation/absorptionTFParams.mat index db6a924c3..b2bea593f 100644 Binary files a/tests/normalTFReflectivityCalculation/absorptionTFParams.mat and b/tests/normalTFReflectivityCalculation/absorptionTFParams.mat differ diff --git a/tests/normalTFReflectivityCalculation/customLayersInputs.mat b/tests/normalTFReflectivityCalculation/customLayersInputs.mat index 0ec1ca724..c4e88eab2 100644 Binary files a/tests/normalTFReflectivityCalculation/customLayersInputs.mat and b/tests/normalTFReflectivityCalculation/customLayersInputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/customLayersOutputs.mat b/tests/normalTFReflectivityCalculation/customLayersOutputs.mat index 68a1693a5..8abd306d6 100644 Binary files a/tests/normalTFReflectivityCalculation/customLayersOutputs.mat and b/tests/normalTFReflectivityCalculation/customLayersOutputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/customLayersTFParams.mat b/tests/normalTFReflectivityCalculation/customLayersTFParams.mat index 49162e105..09c228b3b 100644 Binary files a/tests/normalTFReflectivityCalculation/customLayersTFParams.mat and b/tests/normalTFReflectivityCalculation/customLayersTFParams.mat differ diff --git a/tests/normalTFReflectivityCalculation/customXYInputs.mat b/tests/normalTFReflectivityCalculation/customXYInputs.mat index b6b67ee64..b82bda026 100644 Binary files a/tests/normalTFReflectivityCalculation/customXYInputs.mat and b/tests/normalTFReflectivityCalculation/customXYInputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/customXYOutputs.mat b/tests/normalTFReflectivityCalculation/customXYOutputs.mat index 53b466ced..1c3201c3e 100644 Binary files a/tests/normalTFReflectivityCalculation/customXYOutputs.mat and b/tests/normalTFReflectivityCalculation/customXYOutputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/customXYTFParams.mat b/tests/normalTFReflectivityCalculation/customXYTFParams.mat index 598755b29..0dd4f1d78 100644 Binary files a/tests/normalTFReflectivityCalculation/customXYTFParams.mat and b/tests/normalTFReflectivityCalculation/customXYTFParams.mat differ diff --git a/tests/normalTFReflectivityCalculation/standardLayersInputs.mat b/tests/normalTFReflectivityCalculation/standardLayersInputs.mat index c325b69a2..842aceabf 100644 Binary files a/tests/normalTFReflectivityCalculation/standardLayersInputs.mat and b/tests/normalTFReflectivityCalculation/standardLayersInputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/standardLayersOutputs.mat b/tests/normalTFReflectivityCalculation/standardLayersOutputs.mat index 1c1d37eb2..51d625113 100644 Binary files a/tests/normalTFReflectivityCalculation/standardLayersOutputs.mat and b/tests/normalTFReflectivityCalculation/standardLayersOutputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/standardLayersTFParams.mat b/tests/normalTFReflectivityCalculation/standardLayersTFParams.mat index 642b1aab1..cd2de1e2d 100644 Binary files a/tests/normalTFReflectivityCalculation/standardLayersTFParams.mat and b/tests/normalTFReflectivityCalculation/standardLayersTFParams.mat differ diff --git a/tests/testCommonFunctions/adaptiveOutputs.mat b/tests/testCommonFunctions/adaptiveOutputs.mat index 3b99ec20e..b07c91192 100644 Binary files a/tests/testCommonFunctions/adaptiveOutputs.mat and b/tests/testCommonFunctions/adaptiveOutputs.mat differ diff --git a/tests/testCommonFunctions/resampleLayersOutputs.mat b/tests/testCommonFunctions/resampleLayersOutputs.mat index 733e10952..83017374e 100644 Binary files a/tests/testCommonFunctions/resampleLayersOutputs.mat and b/tests/testCommonFunctions/resampleLayersOutputs.mat differ diff --git a/tests/testProjectConversion/DSPCBilayerProjectClass.mat b/tests/testProjectConversion/DSPCBilayerProjectClass.mat index dcce7c0b0..d5738ae2c 100644 Binary files a/tests/testProjectConversion/DSPCBilayerProjectClass.mat and b/tests/testProjectConversion/DSPCBilayerProjectClass.mat differ diff --git a/tests/testProjectConversion/monolayerVolumeModelProjectClass.mat b/tests/testProjectConversion/monolayerVolumeModelProjectClass.mat index 00e2d0299..40d514347 100644 Binary files a/tests/testProjectConversion/monolayerVolumeModelProjectClass.mat and b/tests/testProjectConversion/monolayerVolumeModelProjectClass.mat differ