Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: b1eda642 by Tony CHEMIT at 2018-05-04T13:56:55Z [N3] Exception multi-zone activity - Closes #318 - - - - - 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 @@ -20,7 +20,6 @@ */ package fr.ird.t3.actions.data.level3; -import com.google.common.base.Preconditions; import fr.ird.t3.actions.T3Action; import fr.ird.t3.entities.data.Activity; import fr.ird.t3.entities.data.ActivityTopiaDao; @@ -219,9 +218,9 @@ public class Level3Action extends T3Action<Level3Configuration> { int nbZones = e.getValue(); // is activity was already treated ? boolean newActivity = outputContext.addActivityId(activity.getTopiaId()); - if (!newActivity) { - Preconditions.checkState(nbZones > 1, "Only a multi-zone activity can be seen more tha once!, problem with activity: " + activity.getTopiaId()); - } +// if (!newActivity) { +// Preconditions.checkState(nbZones > 1, "Only a multi-zone activity can be seen more tha once!, problem with activity: " + activity.getTopiaId()); +// } doExecuteActivityInCatchStratum( catchStratum, sampleStratum, @@ -287,12 +286,12 @@ public class Level3Action extends T3Action<Level3Configuration> { addInfoMessage(message); // to deal with multiple-zone activities (must keep a track of what was already done) boolean activityMultiZone = nbZones > 1; - Map<String, String> previousValues; - if (activityMultiZone) { - previousValues = inputContext.getActivityWithMultiZones(activity); - } else { - previousValues = null; - } + Map<String, String> previousValues = inputContext.getActivityWithMultiZones(activity); +// if (activityMultiZone) { +// previousValues = inputContext.getActivityWithMultiZones(activity); +// } else { +// previousValues = null; +// } if (deleteOldData) { // delete old data for this activity log.debug(String.format("Delete previous level3 data of %s :: %d", activity.getTopiaId(), activity.sizeExtrapolatedAllSetSpeciesFrequency())); @@ -303,7 +302,7 @@ public class Level3Action extends T3Action<Level3Configuration> { if (activityWithSample && !useAllSamplesOfStratum) { // need only to clone back data from SetSpeciesFrequency to new table message = l(locale, "t3.level3.message.activity.with.sample.useOwn.composition"); - log.info(message); + log.debug(message); addInfoMessage(message); for (SetSpeciesFrequency setSpeciesFrequency : activity.getSetSpeciesFrequency()) { Species aSpecies = setSpeciesFrequency.getSpecies(); @@ -322,7 +321,7 @@ public class Level3Action extends T3Action<Level3Configuration> { } else { message = l(locale, "t3.level3.message.activity.with.no.sample.useSampleStratum.composition", activityStr); } - log.info(message); + log.debug(message); addInfoMessage(message); Map<Species, LengthCompositionAggregateModel> compositionModels = sampleStratum.getCompositionModel(); // get all species found in catches View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b1eda642f9669f565d576d86a2b062405... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b1eda642f9669f565d576d86a2b062405... You're receiving this email because of your account on gitlab.com.