This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 79ea340dd67f62558810ce93383b1dc5e3242f60 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 14:15:47 2016 +0100 Bien tenir compte de la sous fraction dans le cas de mensurations s'il y a un sous-échantillonage (See #8014) --- .../service/genericformat/producer/CsvProducerForCatch.java | 10 ++++++++-- .../genericformat/GenericFormatExportServiceAno7992Test.java | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java index f5b81ca..8921793 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java @@ -325,7 +325,10 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { if (!withNoWeightOnFrequencies) { float computedFrequencyTotalWeight = frequencyWeights; - frequencyRows.forEach(catchRow -> catchRow.setComputedFrequencyTotalWeight(computedFrequencyTotalWeight)); + frequencyRows.forEach(catchRow -> { + catchRow.getLastSampleCategoryFilled().setSampleComputedWeight(computedFrequencyTotalWeight); + catchRow.setComputedFrequencyTotalWeight(computedFrequencyTotalWeight); + }); } } @@ -461,7 +464,10 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { if (!withNoWeightOnFrequencies) { float computedFrequencyTotalWeight = frequencyWeights; - frequencyRows.forEach(catchRow -> catchRow.setComputedFrequencyTotalWeight(computedFrequencyTotalWeight)); + frequencyRows.forEach(catchRow -> { + catchRow.getLastSampleCategoryFilled().setSampleComputedWeight(computedFrequencyTotalWeight); + catchRow.setComputedFrequencyTotalWeight(computedFrequencyTotalWeight); + }); } } diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java index dad4bdc..01ea8c0 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java @@ -57,8 +57,8 @@ public class GenericFormatExportServiceAno7992Test { = "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_Scientifique;Benthos;Lot_A_Confirmer;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Commentaire_V_HV;Class_Tri;Num_Ordre_Class_Tri_H2;Tot_Class_Tri;Ech_Class_Tri;Type_Volume_Poids_Class_Tri;Unite_Volume_Poids_Class_Tri;Commentaire_Class_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Commentaire [...] "2015;Campagne EVHOE;;A;1;1;949;NEPH-NOR;Nephrops norvegicus;N;N;Vrac;1;3.2;;Poids;kg;;NA;;;;;kg;;Male;1;2.54;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;2.54;2.519685;2.3188405;CAM-EVHOE;311;100004;NA;;300;100005;NA;;NA;;NA;;NA;;NA;\n" + "2015;Campagne EVHOE;;A;1;1;949;NEPH-NOR;Nephrops norvegicus;N;N;Vrac;1;3.2;;Poids;kg;;NA;;;;;kg;;Femelle;2;0.22;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;0.22;29.09091;2.3188405;CAM-EVHOE;311;100004;NA;;301;100006;NA;;NA;;NA;;NA;;NA;\n" + - "2015;Campagne EVHOE;;A;2;1;1662;TRAC-TRA;Trachurus trachurus;N;N;Vrac;1;100.0;;Poids;kg;;G - Gros;1;30.0;;Poids;kg;;Male;1;10.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;41;Poids déterminé par calcul - produit/lot - totale - Inconnue;10.0;1;2.0;kg;;1;N;2.0;100.0;20.0;CAM-EVHOE;311;100020;305;100021;300;100023;NA;;NA;;NA;;NA;;NA;\n" + - "2015;Campagne EVHOE;;A;2;1;1662;TRAC-TRA;Trachurus trachurus;N;N;Vrac;1;100.0;;Poids;kg;;G - Gros;1;30.0;;Poids;kg;;Male;1;10.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;41;Poids déterminé par calcul - produit/lot - totale - Inconnue;11.0;2;3.0;kg;;1;N;3.0;66.666664;13.333333;CAM-EVHOE;311;100020;305;100021;300;100023;NA;;NA;;NA;;NA;;NA;\n" + + "2015;Campagne EVHOE;;A;2;1;1662;TRAC-TRA;Trachurus trachurus;N;N;Vrac;1;100.0;;Poids;kg;;G - Gros;1;30.0;;Poids;kg;;Male;1;10.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;41;Poids déterminé par calcul - produit/lot - totale - Inconnue;10.0;1;2.0;kg;;1;N;2.0;100.0;40.0;CAM-EVHOE;311;100020;305;100021;300;100023;NA;;NA;;NA;;NA;;NA;\n" + + "2015;Campagne EVHOE;;A;2;1;1662;TRAC-TRA;Trachurus trachurus;N;N;Vrac;1;100.0;;Poids;kg;;G - Gros;1;30.0;;Poids;kg;;Male;1;10.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;41;Poids déterminé par calcul - produit/lot - totale - Inconnue;11.0;2;3.0;kg;;1;N;3.0;66.666664;26.666666;CAM-EVHOE;311;100020;305;100021;300;100023;NA;;NA;;NA;;NA;;NA;\n" + "2015;Campagne EVHOE;;A;2;1;1662;TRAC-TRA;Trachurus trachurus;N;N;Vrac;1;100.0;;Poids;kg;;G - Gros;1;30.0;;Poids;kg;;Femelle;2;5.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;5.0;40.0;8.0;CAM-EVHOE;311;100020;305;100021;301;100024;NA;;NA;;NA;;NA;;NA;\n" + "2015;Campagne EVHOE;;A;2;1;1662;TRAC-TRA;Trachurus trachurus;N;N;Vrac;1;100.0;;Poids;kg;;P - Petit;2;20.0;10.0;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;10.0;20.0;8.0;CAM-EVHOE;311;100020;307;100022;NA;;NA;;NA;;NA;;NA;;NA;\n" + "2015;Campagne EVHOE;;A;3;1;949;NEPH-NOR;Nephrops norvegicus;N;N;Vrac;1;100.0;;Poids;kg;;G - Gros;1;20.0;;Poids;kg;;Male;1;5.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;5.0;40.0;4.0;CAM-EVHOE;311;100033;305;100034;300;100036;NA;;NA;;NA;;NA;;NA;\n" + -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.