November 2016 - Isis-fish-data-commits - mailman.cloud.codelutin.com

r394 - tags/4.4.0/exports
by echatellier＠users.forge.codelutin.com Nov. 23, 2016

Nov. 23, 2016

Author: echatellier Date: 2016-11-23 22:19:13 +0100 (Wed, 23 Nov 2016) New Revision: 394 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/394 Log: Correction de l'export de rejet Modified: tags/4.4.0/exports/RejetsPoids.java Modified: tags/4.4.0/exports/RejetsPoids.java =================================================================== --- tags/4.4.0/exports/RejetsPoids.java 2016-11-23 21:17:35 UTC (rev 393) +++ tags/4.4.0/exports/RejetsPoids.java 2016-11-23 21:19:13 UTC (rev 394) @@ -107,17 +107,19 @@ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception { for (Population pop : simulation.getParameter().getPopulations()) { MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixDiscardsWeightPerStrMetPerZonePop.NAME); - mat = mat.sumOverDim(0); //sum on strategy - for (MatrixIterator i = mat.iterator(); i.hasNext();) { - i.next(); - Object[] sems = i.getSemanticsCoordinates(); - Metier metier = (Metier) sems[1]; - PopulationGroup group = (PopulationGroup) sems[2]; - Zone zone = (Zone) sems[3]; - - double val = i.getValue(); - out.write(step.getStep() + ";" + pop.getName() + ";" + metier.getName() + ";" - + group.getId() + ";" + zone.getName() + ";" + val + "\n"); + if (mat != null) { + mat = mat.sumOverDim(0); //sum on strategy + for (MatrixIterator i = mat.iterator(); i.hasNext();) { + i.next(); + Object[] sems = i.getSemanticsCoordinates(); + Metier metier = (Metier) sems[1]; + PopulationGroup group = (PopulationGroup) sems[2]; + Zone zone = (Zone) sems[3]; + + double val = i.getValue(); + out.write(step.getStep() + ";" + pop.getName() + ";" + metier.getName() + ";" + + group.getId() + ";" + zone.getName() + ";" + val + "\n"); + } } } }

1 0

r393 - trunk/exports
by echatellier＠users.forge.codelutin.com Nov. 23, 2016

Nov. 23, 2016

Author: echatellier Date: 2016-11-23 22:17:35 +0100 (Wed, 23 Nov 2016) New Revision: 393 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/393 Log: Correction de l'export de rejet Modified: trunk/exports/RejetsPoids.java Modified: trunk/exports/RejetsPoids.java =================================================================== --- trunk/exports/RejetsPoids.java 2016-11-23 21:15:37 UTC (rev 392) +++ trunk/exports/RejetsPoids.java 2016-11-23 21:17:35 UTC (rev 393) @@ -107,8 +107,8 @@ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception { for (Population pop : simulation.getParameter().getPopulations()) { MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixDiscardsWeightPerStrMetPerZonePop.NAME); - mat = mat.sumOverDim(0); //sum on strategy if (mat != null) { + mat = mat.sumOverDim(0); //sum on strategy for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object[] sems = i.getSemanticsCoordinates();

1 0

r392 - trunk/exports
by echatellier＠users.forge.codelutin.com Nov. 23, 2016

Nov. 23, 2016

Author: echatellier Date: 2016-11-23 22:15:37 +0100 (Wed, 23 Nov 2016) New Revision: 392 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/392 Log: Correction de l'export de rejet Modified: trunk/exports/RejetsPoids.java Modified: trunk/exports/RejetsPoids.java =================================================================== --- trunk/exports/RejetsPoids.java 2016-08-01 09:11:26 UTC (rev 391) +++ trunk/exports/RejetsPoids.java 2016-11-23 21:15:37 UTC (rev 392) @@ -108,16 +108,18 @@ for (Population pop : simulation.getParameter().getPopulations()) { MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixDiscardsWeightPerStrMetPerZonePop.NAME); mat = mat.sumOverDim(0); //sum on strategy - for (MatrixIterator i = mat.iterator(); i.hasNext();) { - i.next(); - Object[] sems = i.getSemanticsCoordinates(); - Metier metier = (Metier) sems[1]; - PopulationGroup group = (PopulationGroup) sems[2]; - Zone zone = (Zone) sems[3]; - - double val = i.getValue(); - out.write(step.getStep() + ";" + pop.getName() + ";" + metier.getName() + ";" - + group.getId() + ";" + zone.getName() + ";" + val + "\n"); + if (mat != null) { + for (MatrixIterator i = mat.iterator(); i.hasNext();) { + i.next(); + Object[] sems = i.getSemanticsCoordinates(); + Metier metier = (Metier) sems[1]; + PopulationGroup group = (PopulationGroup) sems[2]; + Zone zone = (Zone) sems[3]; + + double val = i.getValue(); + out.write(step.getStep() + ";" + pop.getName() + ";" + metier.getName() + ";" + + group.getId() + ";" + zone.getName() + ";" + val + "\n"); + } } } }

1 0