Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 83f43d07 by Tony CHEMIT at 2018-04-04T20:27:58Z Correction des captures à utiliser dans le niveau 3 (See #263) - - - - - 1 changed file: - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java @@ -324,12 +324,13 @@ public class Level3Action extends T3Action<Level3Configuration> { addInfoMessage(message); Map<Species, LengthCompositionAggregateModel> compositionModels = sampleStratum.getCompositionModel(); // get all species found in catches - Set<Species> catchSpecies = new HashSet<>(ActivityTopiaDao.getSpecies(activity.getCorrectedElementaryCatch())); + Collection<CorrectedElementaryCatch> correctedElementaryCatch = catchStratum.getCorrectedElementaryCatch(activity); + Set<Species> catchSpecies = new HashSet<>(ActivityTopiaDao.getSpecies(correctedElementaryCatch)); // and keep only the one to fix catchSpecies.retainAll(inputContext.getSpecies()); // compute a linear representation of corrected catches (by species and weight category) Map<String, CorrectedElementaryCatch> linearCorrectedCatches = new TreeMap<>(); - for (CorrectedElementaryCatch aCatch : activity.getCorrectedElementaryCatch()) { + for (CorrectedElementaryCatch aCatch : correctedElementaryCatch) { String key = aCatch.getWeightCategoryTreatment().getTopiaId() + aCatch.getSpecies().getTopiaId(); linearCorrectedCatches.put(key, aCatch); } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/83f43d07db50243d7521760b764cb023e... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/83f43d07db50243d7521760b764cb023e... You're receiving this email because of your account on gitlab.com.