branch develop updated (0b2f03f -> 9246013)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 0b2f03f [jgitflow-maven-plugin]updating poms for 4.0-RC5-SNAPSHOT development new 9246013 correction du facteur d'elevation pour l'export generique (refs #7021) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 924601358d480fbbffd6b79283c47cb141a20f7b Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 28 13:02:42 2015 +0200 correction du facteur d'elevation pour l'export generique (refs #7021) Summary of changes: .../exportactions/CreateCatchBatchRowsAction.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 924601358d480fbbffd6b79283c47cb141a20f7b Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 28 13:02:42 2015 +0200 correction du facteur d'elevation pour l'export generique (refs #7021) --- .../exportactions/CreateCatchBatchRowsAction.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java index f1fca69..90e2a42 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java @@ -228,18 +228,11 @@ public class CreateCatchBatchRowsAction extends ExportFishingOperationActionSupp private Float computeCatchRaisingfactor(CatchBatch catchBatch) { - Float totalWeight = Numbers.getValueOrComputedValue( - catchBatch.getCatchTotalWeight(), - catchBatch.getCatchTotalComputedWeight()); - - Float totalUnsortedWeight = catchBatch.getCatchTotalUnsortedComputedWeight(); - Float totalSortedWeight = catchBatch.getCatchTotalSortedComputedWeight(); + Float totalSortedSortedWeight = catchBatch.getCatchTotalSortedSortedComputedWeight(); - //FIXME tchemit 2013-07-12 J'utilise en fait la formule (Poids de la capture totale - poids du HV dans la capture totale) / (poids total capture triée) - // (Poids de la capture totale - poids du HV dans la capture totale) / (poids total capture triée - poids du HV dans la capture totale) - - Float catchRaisingFactor = totalWeight == null || totalUnsortedWeight == null || totalSortedWeight == null ? 1 : (totalWeight - totalUnsortedWeight) / totalSortedWeight; + // tchemit 2015-04-28 see http://forge.codelutin.com/issues/7021 + float catchRaisingFactor = totalSortedWeight == null || totalSortedSortedWeight == null ? 1 : totalSortedWeight / totalSortedSortedWeight; return catchRaisingFactor; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm