Author: bpoussin Date: 2014-07-22 22:30:17 +0200 (Tue, 22 Jul 2014) New Revision: 4056 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4056 Log: bug fixes in getDiscard now return discard, before return all time null :( (error between getValue and getKey :() Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2014-07-22 20:02:09 UTC (rev 4055) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2014-07-22 20:30:17 UTC (rev 4056) @@ -333,14 +333,14 @@ MatrixND holdCatch = holdCatchs.get(pop); if (holdCatch == null) { - holdCatch = MatrixFactory.getInstance().create(catchPerStrategyMet); + holdCatch = catchPerStrategyMet.copy(); holdCatchs.put(pop, holdCatch); } else { holdCatch.add(catchPerStrategyMet); } // compute total - for (MatrixIterator i = catchPerStrategyMet.iterator(); i.next();) { + for (MatrixIterator i = catchPerStrategyMet.iteratorNotZero(); i.next();) { this.totalHoldCatch += i.getValue(); } // this.totalHoldCatch += catchPerStrategyMet.sumAll(); @@ -402,7 +402,7 @@ // seul le discard de l'annee en cours est disponible, sinon on doit // aller le chercher dans les resultats Map.Entry<TimeStep, MatrixND> discard = discards.get(pop); - if (discard != null && discard.getValue().equals(step)) { + if (discard != null && discard.getKey().equals(step)) { result = discard.getValue(); } return result;