branch develop updated (a9d3f6d -> 620dcaa)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from a9d3f6d reformat code new 620dcaa Amélioration algorithme de sélection d'échantillon (See #8578) 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 620dcaa802399e14911b980a6817c933e4104773 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 23 10:07:49 2016 +0100 Amélioration algorithme de sélection d'échantillon (See #8578) Summary of changes: .../src/main/java/fr/ird/observe/entities/seine/SetSeines.java | 9 +++++++++ .../service/actions/consolidate/ConsolidateDataServiceTopia.java | 6 +----- 2 files changed, 10 insertions(+), 5 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 620dcaa802399e14911b980a6817c933e4104773 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 23 10:07:49 2016 +0100 Amélioration algorithme de sélection d'échantillon (See #8578) --- .../src/main/java/fr/ird/observe/entities/seine/SetSeines.java | 9 +++++++++ .../service/actions/consolidate/ConsolidateDataServiceTopia.java | 6 +----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/persistence/src/main/java/fr/ird/observe/entities/seine/SetSeines.java b/persistence/src/main/java/fr/ird/observe/entities/seine/SetSeines.java index 7aebbcb..2212eb7 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/seine/SetSeines.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/SetSeines.java @@ -42,11 +42,20 @@ public class SetSeines { if (!setSeine.isNonTargetSampleEmpty()) { + // recherche sur le couple species/speciesFate nonTargetLengths = setSeine.getNonTargetSample().iterator().next().getNonTargetLength() .stream() .filter(l -> species.equals(l.getSpecies()) && Objects.equals(speciesFate, l.getSpeciesFate())) .collect(Collectors.toList()); + if (nonTargetLengths.isEmpty() && speciesFate != null) { + + // pas trouvé sur le couple species/speciesFate, on tente sur le couple species/null + nonTargetLengths = setSeine.getNonTargetSample().iterator().next().getNonTargetLength() + .stream() + .filter(l -> species.equals(l.getSpecies()) && l.getSpeciesFate() == null) + .collect(Collectors.toList()); + } } return nonTargetLengths; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java index 4673200..be92d30 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -281,12 +281,8 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements // répération des échantillon de cette espèce sur les calée - // on recherche sur le couple species/speciesFate + // on recherche sur le couple species/speciesFate (ou sur le couple species/null) Collection<NonTargetLength> nonTargetLengths = SetSeines.getNonTargetLengths(activityContext.getSetSeine(), species, nonTargetCatch.getSpeciesFate()); - if (CollectionUtils.isEmpty(nonTargetLengths)) { - // on recherche sur le couple species/null - nonTargetLengths = SetSeines.getNonTargetLengths(activityContext.getSetSeine(), species, null); - } if (nonTargetCatch.getCatchWeight() != null || nonTargetCatch.getTotalCount() != null) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm