This is an automated email from the git hooks/post-receive script. New commit to branch feature/7021 in repository tutti. See http://git.codelutin.com/tutti.git commit e4c94e052f65c08263934eafb3008d5905e09c3d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 28 12:41:12 2015 +0200 correction du facteur d'elevation pour les export pdf et csv (refs #7021) --- .../fr/ifremer/tutti/service/export/ExportCatchContext.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java index e082942..3a9d6e9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java @@ -153,13 +153,6 @@ public class ExportCatchContext { return result; } - public float getCatchTotalRejectedWeight() { - float result = Numbers.getValueOrComputedValue( - catchBatch.getCatchTotalRejectedWeight(), - catchBatch.getCatchTotalRejectedComputedWeight()); - return result; - } - public float getCatchTotalSortedWeight() { return catchBatch.getSpeciesTotalSampleSortedComputedWeight() + catchBatch.getBenthosTotalSampleSortedComputedWeight() + @@ -310,7 +303,7 @@ public class ExportCatchContext { protected float getSpeciesElevationRate() { - float globalRatio = catchBatch.getCatchTotalSortedComputedWeight() / (getCatchTotalWeight() - getCatchTotalRejectedWeight()); + float globalRatio = catchBatch.getCatchTotalSortedComputedWeight() / catchBatch.getCatchTotalSortedSortedComputedWeight(); float speciesTotalSortedWeight = getSpeciesTotalSortedWeight(); @@ -324,7 +317,7 @@ public class ExportCatchContext { protected float getBenthosElevationRate() { - float globalRatio = catchBatch.getCatchTotalSortedComputedWeight() / (getCatchTotalWeight() - getCatchTotalRejectedWeight()); + float globalRatio = catchBatch.getCatchTotalSortedComputedWeight() / catchBatch.getCatchTotalSortedSortedComputedWeight(); float benthosTotalSortedWeight = getBenthosTotalSortedWeight(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.