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

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

23 Nov '16

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 23 Nov '16

23 Nov '16

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 23 Nov '16

23 Nov '16

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

r391 - trunk
by echatellier＠users.forge.codelutin.com 01 Aug '16

01 Aug '16

Author: echatellier Date: 2016-08-01 11:11:26 +0200 (Mon, 01 Aug 2016) New Revision: 391 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/391 Log: Add objectives optimizations directory Added: trunk/objectives/ trunk/optimizations/

1 0

r390 - tags/4.4.0
by echatellier＠users.forge.codelutin.com 01 Aug '16

01 Aug '16

Author: echatellier Date: 2016-08-01 11:10:09 +0200 (Mon, 01 Aug 2016) New Revision: 390 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/390 Log: Add objectives optimizations directory Added: tags/4.4.0/objectives/ tags/4.4.0/optimizations/

1 0

r389 - trunk/formules
by echatellier＠users.forge.codelutin.com 10 Mar '16

10 Mar '16

Author: echatellier Date: 2016-03-10 16:31:05 +0100 (Thu, 10 Mar 2016) New Revision: 389 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/389 Log: Add missing folder for new equation types Added: trunk/formules/Capturability/ trunk/formules/FishingMortalityOtherFleets/ trunk/formules/MaturityOgive/ trunk/formules/Recruitment/ trunk/formules/ReproductionRate/ trunk/formules/Variable/

1 0

r388 - trunk
by echatellier＠users.forge.codelutin.com 10 Mar '16

10 Mar '16

Author: echatellier Date: 2016-03-10 11:56:52 +0100 (Thu, 10 Mar 2016) New Revision: 388 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/388 Log: Update plugins Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-03-10 10:30:06 UTC (rev 387) +++ trunk/pom.xml 2016-03-10 10:56:52 UTC (rev 388) @@ -36,7 +36,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> + <version>3.5.1</version> <configuration> <source>1.7</source> <target>1.7</target>

1 0

r387 - in trunk: exports rules scripts
by echatellier＠users.forge.codelutin.com 10 Mar '16

10 Mar '16

Author: echatellier Date: 2016-03-10 11:30:06 +0100 (Thu, 10 Mar 2016) New Revision: 387 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/387 Log: Remove use of DaoHelper Modified: trunk/exports/MetierZone.java trunk/rules/Cantonnement.java trunk/rules/CantonnementPreSimu.java trunk/rules/ChangementParamControlablePresimu.java trunk/scripts/SiMatrix.java Modified: trunk/exports/MetierZone.java =================================================================== --- trunk/exports/MetierZone.java 2016-03-01 16:44:42 UTC (rev 386) +++ trunk/exports/MetierZone.java 2016-03-10 10:30:06 UTC (rev 387) @@ -28,7 +28,6 @@ import org.nuiton.math.matrix.*; -import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.export.ExportStep; import fr.ifremer.isisfish.types.TimeStep; import resultinfos.MatrixMetierZone; Modified: trunk/rules/Cantonnement.java =================================================================== --- trunk/rules/Cantonnement.java 2016-03-01 16:44:42 UTC (rev 386) +++ trunk/rules/Cantonnement.java 2016-03-10 10:30:06 UTC (rev 387) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2015 Ifremer, CodeLutin + * Copyright (C) 2006 - 2016 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -34,7 +34,6 @@ import org.nuiton.math.matrix.*; -import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.simulator.MetierMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; @@ -169,7 +168,7 @@ cellMetiers.removeAll(cells); if (cellMetiers.size() != 0) { - ZoneDAO dao = IsisFishDAOHelper.getZoneDAO(context.getDB()); + ZoneDAO dao = context.getZoneDAO(); // // Create new empty zone for cantonnement Modified: trunk/rules/CantonnementPreSimu.java =================================================================== --- trunk/rules/CantonnementPreSimu.java 2016-03-01 16:44:42 UTC (rev 386) +++ trunk/rules/CantonnementPreSimu.java 2016-03-10 10:30:06 UTC (rev 387) @@ -33,7 +33,6 @@ import org.nuiton.math.matrix.*; -import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.simulator.MetierMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; @@ -139,8 +138,8 @@ public void init(SimulationContext context) throws Exception { SiMatrix siMatrix = SiMatrix.getSiMatrix(context); - ZoneDAO zoneDao = IsisFishDAOHelper.getZoneDAO(context.getDB()); - MetierSeasonInfoDAO metierSeasonInfoDao = IsisFishDAOHelper.getMetierSeasonInfoDAO(context.getDB()); + ZoneDAO zoneDao = context.getZoneDAO(); + MetierSeasonInfoDAO metierSeasonInfoDao = context.getMetierSeasonInfoDAO(); List<Month> SaisonFermee = Month.getMonths(param_beginMonth, param_endMonth); List<Cell> maillefermee = param_zone.getCell(); Modified: trunk/rules/ChangementParamControlablePresimu.java =================================================================== --- trunk/rules/ChangementParamControlablePresimu.java 2016-03-01 16:44:42 UTC (rev 386) +++ trunk/rules/ChangementParamControlablePresimu.java 2016-03-10 10:30:06 UTC (rev 387) @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory; import scripts.SiMatrix; -import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.entities.EffortDescription; import fr.ifremer.isisfish.entities.EffortDescriptionDAO; @@ -144,9 +143,9 @@ List<Month> moisconcerne = new ArrayList<Month>(saison); moisconcerne.retainAll(SaisonFermee); - MetierDAO metierDao = IsisFishDAOHelper.getMetierDAO(context.getDB()); - MetierSeasonInfoDAO infoDao = IsisFishDAOHelper.getMetierSeasonInfoDAO(context.getDB()); - EffortDescriptionDAO effortDao = IsisFishDAOHelper.getEffortDescriptionDAO(context.getDB()); + MetierDAO metierDao = context.getMetierDAO(); + MetierSeasonInfoDAO infoDao = context.getMetierSeasonInfoDAO(); + EffortDescriptionDAO effortDao = context.getEffortDescriptionDAO(); Metier NouveauMetier = metierDao.create(); NouveauMetier.setName(metier.getName()+" Mois "+moisconcerne.get(0).getMonthNumber()+" a "+moisconcerne.get(moisconcerne.size()-1).getMonthNumber()+" ValeurParam "+nouvelleValeurParam); Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2016-03-01 16:44:42 UTC (rev 386) +++ trunk/scripts/SiMatrix.java 2016-03-10 10:30:06 UTC (rev 387) @@ -38,7 +38,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.simulator.ResultManager; @@ -117,7 +116,7 @@ * @throws TopiaException */ public List<Zone> getZones(TimeStep step) throws TopiaException { - ZoneDAO dao = IsisFishDAOHelper.getZoneDAO(db); + ZoneDAO dao = context.getZoneDAO(); List<Zone> result = dao.findAll(); return result; }

1 0

r386 - trunk
by echatellier＠users.forge.codelutin.com 01 Mar '16

01 Mar '16

Author: echatellier Date: 2016-03-01 17:44:42 +0100 (Tue, 01 Mar 2016) New Revision: 386 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/386 Log: Prepare next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-03-01 16:44:04 UTC (rev 385) +++ trunk/pom.xml 2016-03-01 16:44:42 UTC (rev 386) @@ -14,7 +14,7 @@ <packaging>jar</packaging>  - <version>4.4.0</version> + <version>4.4.1-SNAPSHOT</version>  <description>Data for Isis-fish</description> @@ -74,7 +74,7 @@ <dependency> <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.4.0.0</version> + <version>4.4.1.0-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies>

1 0

r385 - tags
by echatellier＠users.forge.codelutin.com 01 Mar '16

01 Mar '16

Author: echatellier Date: 2016-03-01 17:44:04 +0100 (Tue, 01 Mar 2016) New Revision: 385 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/385 Log: Create tag 4.4.0 Added: tags/4.4.0/

1 0