branch develop-4.4.x updated (b164fdb -> c09b777)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git from b164fdb [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 4b366c3 Début de correction mais il me faut une confirmation de Vincent sur le sujet new b21bec3 Fix test values new 48ec93b Ajout de nouveaux tests sur le calcul du RF final new 79ea340 Bien tenir compte de la sous fraction dans le cas de mensurations s'il y a un sous-échantillonage (See #8014) new 5729cfd fixes #8014 Merge branch 'feature/8014' into develop-4.4.x new c09b777 Use codelutinpom 7 The 6 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 c09b7777e6fd2f1eb6cb184626f6bf2206563318 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 14:36:04 2016 +0100 Use codelutinpom 7 commit 5729cfde50679abb4ab415400313f459dc93fd2c Merge: b164fdb 79ea340 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 14:33:13 2016 +0100 fixes #8014 Merge branch 'feature/8014' into develop-4.4.x 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) commit 48ec93bb0731b47ad7ed2ee181fb43282a52a281 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 24 15:24:46 2016 +0100 Ajout de nouveaux tests sur le calcul du RF final commit b21bec34720e398dbc4f6730ab69ff05eef3b4ca Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 23 17:17:42 2016 +0100 Fix test values commit 4b366c3332a849c01ff26a82de65b38ae0bfffbc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 23 16:31:46 2016 +0100 Début de correction mais il me faut une confirmation de Vincent sur le sujet Summary of changes: README.txt => README.md | 0 pom.xml | 9 +- .../README.txt => tutti-ichtyometer/README.md | 0 tutti-persistence/{README.txt => README.md} | 0 .../README.txt => tutti-report-generator/README.md | 0 tutti-service/{README.txt => README.md} | 0 .../tutti/service/genericformat/csv/CatchRow.java | 14 ++ .../producer/CsvProducerForCatch.java | 39 ++++ .../GenericFormatExportServiceAno7992Test.java | 84 +++++++- .../resources/genericFormat/ano7992.tuttiProtocol | 227 +++++++++++++++++++++ .../README.txt => tutti-ui-swing-updater/README.md | 0 .../README.txt => tutti-ui-swing/README.md | 0 12 files changed, 364 insertions(+), 9 deletions(-) rename README.txt => README.md (100%) rename tutti-ui-swing/README.txt => tutti-ichtyometer/README.md (100%) rename tutti-persistence/{README.txt => README.md} (100%) rename tutti-ui-swing-updater/README.txt => tutti-report-generator/README.md (100%) rename tutti-service/{README.txt => README.md} (100%) rename tutti-report-generator/README.txt => tutti-ui-swing-updater/README.md (100%) rename tutti-ichtyometer/README.txt => tutti-ui-swing/README.md (100%) -- 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 4b366c3332a849c01ff26a82de65b38ae0bfffbc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 23 16:31:46 2016 +0100 Début de correction mais il me faut une confirmation de Vincent sur le sujet --- .../tutti/service/genericformat/csv/CatchRow.java | 14 ++ .../producer/CsvProducerForCatch.java | 33 +++ .../GenericFormatExportServiceAno7992Test.java | 13 +- .../resources/genericFormat/ano7992.tuttiProtocol | 227 +++++++++++++++++++++ 4 files changed, 283 insertions(+), 4 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java index f5fb734..0cd7aca 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java @@ -103,6 +103,8 @@ public class CatchRow extends RowWithOperationContextSupport { protected Float frequencyWeight; + protected Float computedFrequencyTotalWeight; + protected Integer frequencyRankOrder; public void setBenthos(boolean benthos) { @@ -129,6 +131,10 @@ public class CatchRow extends RowWithOperationContextSupport { this.batchNumberComputed = batchNumberComputed; } + public void setComputedFrequencyTotalWeight(Float computedFrequencyTotalWeight) { + this.computedFrequencyTotalWeight = computedFrequencyTotalWeight; + } + public void addSampleCategory(ExportSampleCategory sampleCategory) { int order = sampleCategory.getCategoryDef().getOrder(); while (this.sampleCategory.size() <= order) { @@ -188,6 +194,10 @@ public class CatchRow extends RowWithOperationContextSupport { return finalRaisingFactor; } + public boolean isFrequencyWithWeight() { + return frequencyLengthStepCaracteristic!=null && frequencyWeight!=null; + } + public Caracteristic getFrequencyLengthStepCaracteristic() { return frequencyLengthStepCaracteristic; } @@ -200,6 +210,10 @@ public class CatchRow extends RowWithOperationContextSupport { return frequencyWeight; } + public Float getComputedFrequencyTotalWeight() { + return computedFrequencyTotalWeight; + } + public Species getSpecies() { return species; } 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 992a40d..f5b81ca 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 @@ -46,7 +46,9 @@ import org.apache.commons.logging.LogFactory; import java.io.Serializable; import java.nio.file.Path; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; /** * Created on 2/6/15. @@ -303,19 +305,28 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { } } + float frequencyWeights = 0f; + Set<CatchRow> frequencyRows = new LinkedHashSet<>(); for (SpeciesBatchFrequency batchFrequency : speciesBatchFrequency) { CatchRow row = currentRow.copy(); row.setFrequency(batchFrequency); + frequencyRows.add(row); rows.add(row); if (!withNoWeightOnFrequencies) { // use concrete frequency weight referenceWeight = batchFrequency.getWeight(); + frequencyWeights+= referenceWeight; } setRaisingFactor(row, totalBatchWeight, referenceWeight); } + + if (!withNoWeightOnFrequencies) { + float computedFrequencyTotalWeight = frequencyWeights; + frequencyRows.forEach(catchRow -> catchRow.setComputedFrequencyTotalWeight(computedFrequencyTotalWeight)); + } } } else { @@ -430,19 +441,29 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { } } + float frequencyWeights = 0f; + Set<CatchRow> frequencyRows = new LinkedHashSet<>(); for (BenthosBatchFrequency batchFrequency : benthosBatchFrequency) { CatchRow row = currentRow.copy(); row.setFrequency(batchFrequency); + frequencyRows.add(row); rows.add(row); if (!withNoWeightOnFrequencies) { // use concrete frequency weight referenceWeight = batchFrequency.getWeight(); + frequencyWeights+=referenceWeight; } setRaisingFactor(row, totalBatchWeight, referenceWeight); } + + if (!withNoWeightOnFrequencies) { + float computedFrequencyTotalWeight = frequencyWeights; + frequencyRows.forEach(catchRow -> catchRow.setComputedFrequencyTotalWeight(computedFrequencyTotalWeight)); + } + } } else { @@ -513,6 +534,18 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { } } + if (row.isFrequencyWithWeight()) { + + Float frequencyWeight = row.getFrequencyWeight(); + Float computedFrequencyTotalWeight = row.getComputedFrequencyTotalWeight(); + float currentRate = computedFrequencyTotalWeight / frequencyWeight; + if (Weights.isNotEqualWeight(1.0f, currentRate)) { + + // the only case which can change the final rate + finalRaisingFactor *= currentRate; + } + + } return finalRaisingFactor; } 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 2455ee0..bfc1499 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 @@ -50,9 +50,13 @@ public class GenericFormatExportServiceAno7992Test { public static final ServiceDbResource dbResource = ServiceDbResource.readDb("dbAno7992"); public static final String CATCH_FILE_CONTENT - = "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;;T0696;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;;;;;;;;;;?;2.54;2.519685;2.3188405;CAM-EVHOE;311;100004;NA;;300;100005;NA;;NA;\n" - + "2015;Campagne EVHOE;;T0696;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;;;;;;;;;;?;0.22;29.09091;2.3188405;CAM-EVHOE;311;100004;NA;;301;100006;NA;;NA;\n"; + = "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;;T0696;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;;;;;;;;;;?;2.54;1.2989074;1.1953713;CAM-EVHOE;311;100004;NA;;300;100005;NA;;NA;\n" + + "2015;Campagne EVHOE;;T0696;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;;;;;;;;;;?;0.22;14.996477;1.1953713;CAM-EVHOE;311;100004;NA;;301;100006;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;;;;;;;;;;?;10.0;10.0;4.0;CAM-EVHOE;311;100020;305;100021;300;100023;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;;41;Poids déterminé par calcul - produit/lot - totale - Inconnue;10.0;1;2.0;kg;;1;N;2.0;50.0;10.0;CAM-EVHOE;311;100020;305;100021;301;100024;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;;41;Poids déterminé par calcul - produit/lot - totale - Inconnue;11.0;2;3.0;kg;;1;N;3.0;33.333332;6.6666665;CAM-EVHOE;311;100020;305;100021;301;100024;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;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;20.0;5.0;2.0;CAM-EVHOE;311;100020;307;100022;NA;;NA;;NA;\n"; protected GenericFormatExportService service; @@ -69,6 +73,7 @@ public class GenericFormatExportServiceAno7992Test { public static final String CRUISE_ID = "100000"; public static final String OPERATION_1_ID = "100000"; + public static final String OPERATION_2_ID = "100001"; @Before public void setUp() throws Exception { @@ -86,7 +91,7 @@ public class GenericFormatExportServiceAno7992Test { service = serviceContext.getService(GenericFormatExportService.class); - dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 1, OPERATION_1_ID); + dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 2, OPERATION_1_ID,OPERATION_2_ID); progressionModel = new ProgressionModel(); diff --git a/tutti-service/src/test/resources/genericFormat/ano7992.tuttiProtocol b/tutti-service/src/test/resources/genericFormat/ano7992.tuttiProtocol index 1f39308..b570c24 100644 --- a/tutti-service/src/test/resources/genericFormat/ano7992.tuttiProtocol +++ b/tutti-service/src/test/resources/genericFormat/ano7992.tuttiProtocol @@ -19,4 +19,231 @@ species: speciesReferenceTaxonId: 949 speciesSurveyCode: NEPH-NOR weightEnabled: true +- !SpeciesProtocol + calcifySampleEnabled: true + countIfNoFrequencyEnabled: true + lengthStepPmfmId: 41 + mandatorySampleCategoryId: + - 198 + - 196 + - 1682 + - 1702 + - 1478 + - 1418 + - 101 + speciesReferenceTaxonId: 1662 + speciesSurveyCode: TRAC-TRA + weightEnabled: true version: 3 +zone: !java.util.ArrayList +- !Zone + label: z + strata: !java.util.LinkedList + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57621 + name: Strate Gn1 + label: Gn1 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57622 + name: Strate Gn2 + label: Gn2 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57623 + name: Strate Gn3 + label: Gn3 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57624 + name: Strate Gn4 + label: Gn4 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57629 + name: Strate Gs2 + label: Gs2 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57608 + name: Strate Cc4 + label: Cc4 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57609 + name: Strate Cc5 + label: Cc5 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57625 + name: Strate Gn5 + label: Gn5 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57626 + name: Strate Gn6 + label: Gn6 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57627 + name: Strate Gn7 + label: Gn7 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57606 + name: Strate Cc3 + label: Cc3 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57628 + name: Strate Gs1 + label: Gs1 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57610 + name: Strate Cc6 + label: Cc6 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57632 + name: Strate Gs5 + label: Gs5 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57611 + name: Strate Cc7 + label: Cc7 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57633 + name: Strate Gs6 + label: Gs6 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57612 + name: Strate Cn2 + label: Cn2 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57634 + name: Strate Gs7 + label: Gs7 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57613 + name: Strate Cn3 + label: Cn3 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57630 + name: Strate Gs3 + label: Gs3 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57631 + name: Strate Gs4 + label: Gs4 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57618 + name: Strate Cs7 + label: Cs7 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57614 + name: Strate Cs3 + label: Cs3 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57615 + name: Strate Cs4 + label: Cs4 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57616 + name: Strate Cs5 + label: Cs5 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide + - !Strata + location: !fr.ifremer.tutti.persistence.entities.referential.TuttiLocationBean + id: 57617 + name: Strate Cs6 + label: Cs6 + status: !fr.ifremer.tutti.persistence.entities.referential.StatusBean + id: 1 + name: Valide -- 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit b21bec34720e398dbc4f6730ab69ff05eef3b4ca Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 23 17:17:42 2016 +0100 Fix test values --- .../service/genericformat/GenericFormatExportServiceAno7992Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 bfc1499..df1b1e2 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 @@ -51,8 +51,8 @@ public class GenericFormatExportServiceAno7992Test { public static final String CATCH_FILE_CONTENT = "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;;T0696;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;;;;;;;;;;?;2.54;1.2989074;1.1953713;CAM-EVHOE;311;100004;NA;;300;100005;NA;;NA;\n" + - "2015;Campagne EVHOE;;T0696;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;;;;;;;;;;?;0.22;14.996477;1.1953713;CAM-EVHOE;311;100004;NA;;301;100006;NA;;NA;\n" + + "2015;Campagne EVHOE;;T0696;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;;;;;;;;;;?;2.54;2.519685;2.3188405;CAM-EVHOE;311;100004;NA;;300;100005;NA;;NA;\n" + + "2015;Campagne EVHOE;;T0696;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;;;;;;;;;;?;0.22;29.09091;2.3188405;CAM-EVHOE;311;100004;NA;;301;100006;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;;;;;;;;;;?;10.0;10.0;4.0;CAM-EVHOE;311;100020;305;100021;300;100023;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;;41;Poids déterminé par calcul - produit/lot - totale - Inconnue;10.0;1;2.0;kg;;1;N;2.0;50.0;10.0;CAM-EVHOE;311;100020;305;100021;301;100024;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;;41;Poids déterminé par calcul - produit/lot - totale - Inconnue;11.0;2;3.0;kg;;1;N;3.0;33.333332;6.6666665;CAM-EVHOE;311;100020;305;100021;301;100024;NA;;NA;\n" + -- 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 48ec93bb0731b47ad7ed2ee181fb43282a52a281 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 24 15:24:46 2016 +0100 Ajout de nouveaux tests sur le calcul du RF final --- .../GenericFormatExportServiceAno7992Test.java | 87 ++++++++++++++++++++-- 1 file changed, 79 insertions(+), 8 deletions(-) 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 df1b1e2..dad4bdc 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 @@ -26,6 +26,8 @@ package fr.ifremer.tutti.service.genericformat; import com.google.common.io.Files; import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.model.ProgramDataModel; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.ServiceDbResource; @@ -37,6 +39,8 @@ import org.junit.Test; import java.io.File; import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; /** * Created on 9/22/14. @@ -50,13 +54,18 @@ public class GenericFormatExportServiceAno7992Test { public static final ServiceDbResource dbResource = ServiceDbResource.readDb("dbAno7992"); public static final String CATCH_FILE_CONTENT - = "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;;T0696;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;;;;;;;;;;?;2.54;2.519685;2.3188405;CAM-EVHOE;311;100004;NA;;300;100005;NA;;NA;\n" + - "2015;Campagne EVHOE;;T0696;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;;;;;;;;;;?;0.22;29.09091;2.3188405;CAM-EVHOE;311;100004;NA;;301;100006;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;;;;;;;;;;?;10.0;10.0;4.0;CAM-EVHOE;311;100020;305;100021;300;100023;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;;41;Poids déterminé par calcul - produit/lot - totale - Inconnue;10.0;1;2.0;kg;;1;N;2.0;50.0;10.0;CAM-EVHOE;311;100020;305;100021;301;100024;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;;41;Poids déterminé par calcul - produit/lot - totale - Inconnue;11.0;2;3.0;kg;;1;N;3.0;33.333332;6.6666665;CAM-EVHOE;311;100020;305;100021;301;100024;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;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;20.0;5.0;2.0;CAM-EVHOE;311;100020;307;100022;NA;;NA;;NA;\n"; + = "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;;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" + + "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;;Femelle;2;15.0;;Poids;kg;;Floches;1;5.0;;Poids;kg;;NA;;;;;kg;;DEAD - Mort;1;1.0;0.5;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;0.5;400.0;32.0;CAM-EVHOE;311;100033;305;100034;301;100037;2496;100038;NA;;2420;100042;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;;Femelle;2;15.0;;Poids;kg;;Floches;1;5.0;;Poids;kg;;NA;;;;;kg;;ALIVE - Vivant;2;1.5;0.75;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;0.75;266.66666;32.0;CAM-EVHOE;311;100033;305;100034;301;100037;2496;100038;NA;;2421;100043;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;;Femelle;2;15.0;;Poids;kg;;Cassees;2;2.5;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;2.5;80.0;8.0;CAM-EVHOE;311;100033;305;100034;301;100037;2497;100039;NA;;NA;;NA;;NA;\n" + + "2015;Campagne EVHOE;;A;3;1;949;NEPH-NOR;Nephrops norvegicus;N;N;Vrac;1;100.0;;Poids;kg;;P - Petit;2;30.0;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;30.0;6.6666665;4.0;CAM-EVHOE;311;100033;307;100035;NA;;NA;;NA;;NA;;NA;;NA;\n"; protected GenericFormatExportService service; @@ -74,6 +83,7 @@ public class GenericFormatExportServiceAno7992Test { public static final String OPERATION_1_ID = "100000"; public static final String OPERATION_2_ID = "100001"; + public static final String OPERATION_3_ID = "100002"; @Before public void setUp() throws Exception { @@ -91,7 +101,7 @@ public class GenericFormatExportServiceAno7992Test { service = serviceContext.getService(GenericFormatExportService.class); - dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 2, OPERATION_1_ID,OPERATION_2_ID); + dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3, OPERATION_1_ID,OPERATION_2_ID, OPERATION_3_ID); progressionModel = new ProgressionModel(); @@ -111,6 +121,67 @@ public class GenericFormatExportServiceAno7992Test { ProgramDataModel dataToExport = persistenceService.loadCruises(programId, true, cruiseId); + List<SampleCategoryModelEntry> categoryList = new ArrayList<>(); + + { + SampleCategoryModelEntry sampleCategoryModelEntry = new SampleCategoryModelEntry(); + sampleCategoryModelEntry.setCode("V_HV"); + sampleCategoryModelEntry.setOrder(0); + sampleCategoryModelEntry.setCategoryId(1428); + categoryList.add(sampleCategoryModelEntry); + } + { + SampleCategoryModelEntry sampleCategoryModelEntry = new SampleCategoryModelEntry(); + sampleCategoryModelEntry.setCode("Class_Tri"); + sampleCategoryModelEntry.setOrder(1); + sampleCategoryModelEntry.setCategoryId(198); + categoryList.add(sampleCategoryModelEntry); + } + { + SampleCategoryModelEntry sampleCategoryModelEntry = new SampleCategoryModelEntry(); + sampleCategoryModelEntry.setCode("Sexe"); + sampleCategoryModelEntry.setOrder(2); + sampleCategoryModelEntry.setCategoryId(196); + categoryList.add(sampleCategoryModelEntry); + } + { + SampleCategoryModelEntry sampleCategoryModelEntry = new SampleCategoryModelEntry(); + sampleCategoryModelEntry.setCode("Etat"); + sampleCategoryModelEntry.setOrder(3); + sampleCategoryModelEntry.setCategoryId(1682); + categoryList.add(sampleCategoryModelEntry); + } + { + SampleCategoryModelEntry sampleCategoryModelEntry = new SampleCategoryModelEntry(); + sampleCategoryModelEntry.setCode("Age"); + sampleCategoryModelEntry.setOrder(4); + sampleCategoryModelEntry.setCategoryId(1702); + categoryList.add(sampleCategoryModelEntry); + } + { + SampleCategoryModelEntry sampleCategoryModelEntry = new SampleCategoryModelEntry(); + sampleCategoryModelEntry.setCode("etat_sante"); + sampleCategoryModelEntry.setOrder(5); + sampleCategoryModelEntry.setCategoryId(1478); + categoryList.add(sampleCategoryModelEntry); + }{ + SampleCategoryModelEntry sampleCategoryModelEntry = new SampleCategoryModelEntry(); + sampleCategoryModelEntry.setCode("age_coquille"); + sampleCategoryModelEntry.setOrder(6); + sampleCategoryModelEntry.setCategoryId(1418); + categoryList.add(sampleCategoryModelEntry); + }{ + SampleCategoryModelEntry sampleCategoryModelEntry = new SampleCategoryModelEntry(); + sampleCategoryModelEntry.setCode("age2"); + sampleCategoryModelEntry.setOrder(7); + sampleCategoryModelEntry.setCategoryId(101); + categoryList.add(sampleCategoryModelEntry); + } + + categoryList.forEach(sampleCategoryModelEntry -> sampleCategoryModelEntry.load(persistenceService)); + + persistenceService.setSampleCategoryModel(new SampleCategoryModel(categoryList)); + GenericFormatExportConfiguration exportConfiguration = new GenericFormatExportConfiguration(); exportConfiguration.setExportFile(exportFile); exportConfiguration.setExportAttachments(false); -- 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-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>.
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 5729cfde50679abb4ab415400313f459dc93fd2c Merge: b164fdb 79ea340 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 14:33:13 2016 +0100 fixes #8014 Merge branch 'feature/8014' into develop-4.4.x .../tutti/service/genericformat/csv/CatchRow.java | 14 ++ .../producer/CsvProducerForCatch.java | 39 ++++ .../GenericFormatExportServiceAno7992Test.java | 84 +++++++- .../resources/genericFormat/ano7992.tuttiProtocol | 227 +++++++++++++++++++++ 4 files changed, 360 insertions(+), 4 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit c09b7777e6fd2f1eb6cb184626f6bf2206563318 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 14:36:04 2016 +0100 Use codelutinpom 7 --- README.txt => README.md | 0 pom.xml | 9 ++++----- tutti-ui-swing/README.txt => tutti-ichtyometer/README.md | 0 tutti-persistence/{README.txt => README.md} | 0 .../README.txt => tutti-report-generator/README.md | 0 tutti-service/{README.txt => README.md} | 0 .../README.txt => tutti-ui-swing-updater/README.md | 0 tutti-ichtyometer/README.txt => tutti-ui-swing/README.md | 0 8 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.txt b/README.md similarity index 100% rename from README.txt rename to README.md diff --git a/pom.xml b/pom.xml index d80bbd5..782db7b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>6</version> + <version>7</version> </parent> <groupId>fr.ifremer</groupId> @@ -120,6 +120,7 @@ <properties> <projectId>tutti</projectId> + <ciViewId>Tutti</ciViewId> <!-- libraries version --> <nuitonI18nVersion>3.3</nuitonI18nVersion> @@ -156,13 +157,11 @@ <launcherVersion>1.0.3</launcherVersion> <!-- Where are deployed software components --> - <distroUrl>http://nexus.nuiton.org/nexus/content/repositories/other-releases</distroUrl> + <distroUrl>https://nexus.nuiton.org/nexus/content/repositories/other-releases</distroUrl> <jgitflow.developBranchName>develop-4.4.x</jgitflow.developBranchName> <jgitflow.masterBranchName>master-4.4.x</jgitflow.masterBranchName> - <javaVersion>1.8</javaVersion> - <signatureArtifactId>java18</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> + </properties> <repositories> diff --git a/tutti-ui-swing/README.txt b/tutti-ichtyometer/README.md similarity index 100% rename from tutti-ui-swing/README.txt rename to tutti-ichtyometer/README.md diff --git a/tutti-persistence/README.txt b/tutti-persistence/README.md similarity index 100% rename from tutti-persistence/README.txt rename to tutti-persistence/README.md diff --git a/tutti-ui-swing-updater/README.txt b/tutti-report-generator/README.md similarity index 100% rename from tutti-ui-swing-updater/README.txt rename to tutti-report-generator/README.md diff --git a/tutti-service/README.txt b/tutti-service/README.md similarity index 100% rename from tutti-service/README.txt rename to tutti-service/README.md diff --git a/tutti-report-generator/README.txt b/tutti-ui-swing-updater/README.md similarity index 100% rename from tutti-report-generator/README.txt rename to tutti-ui-swing-updater/README.md diff --git a/tutti-ichtyometer/README.txt b/tutti-ui-swing/README.md similarity index 100% rename from tutti-ichtyometer/README.txt rename to tutti-ui-swing/README.md -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm