Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
83f43d07
by Tony CHEMIT at 2018-04-04T20:27:58Z
1 changed file:
Changes:
| ... | ... | @@ -324,12 +324,13 @@ public class Level3Action extends T3Action<Level3Configuration> { |
| 324 | 324 |
addInfoMessage(message);
|
| 325 | 325 |
Map<Species, LengthCompositionAggregateModel> compositionModels = sampleStratum.getCompositionModel();
|
| 326 | 326 |
// get all species found in catches
|
| 327 |
- Set<Species> catchSpecies = new HashSet<>(ActivityTopiaDao.getSpecies(activity.getCorrectedElementaryCatch()));
|
|
| 327 |
+ Collection<CorrectedElementaryCatch> correctedElementaryCatch = catchStratum.getCorrectedElementaryCatch(activity);
|
|
| 328 |
+ Set<Species> catchSpecies = new HashSet<>(ActivityTopiaDao.getSpecies(correctedElementaryCatch));
|
|
| 328 | 329 |
// and keep only the one to fix
|
| 329 | 330 |
catchSpecies.retainAll(inputContext.getSpecies());
|
| 330 | 331 |
// compute a linear representation of corrected catches (by species and weight category)
|
| 331 | 332 |
Map<String, CorrectedElementaryCatch> linearCorrectedCatches = new TreeMap<>();
|
| 332 |
- for (CorrectedElementaryCatch aCatch : activity.getCorrectedElementaryCatch()) {
|
|
| 333 |
+ for (CorrectedElementaryCatch aCatch : correctedElementaryCatch) {
|
|
| 333 | 334 |
String key = aCatch.getWeightCategoryTreatment().getTopiaId() + aCatch.getSpecies().getTopiaId();
|
| 334 | 335 |
linearCorrectedCatches.put(key, aCatch);
|
| 335 | 336 |
}
|