August 2012 - Isis-fish-commits - mailman.cloud.codelutin.com

r3714 - in trunk/src: main/java/fr/ifremer/isisfish/simulator main/java/fr/ifremer/isisfish/util test/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com Aug. 8, 2012

Aug. 8, 2012

Author: echatellier Date: 2012-08-08 18:29:42 +0200 (Wed, 08 Aug 2012) New Revision: 3714 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3714 Log: Ajout d'un test unitaire sur l'import de matrice n dimensions Added: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-08-08 15:17:34 UTC (rev 3713) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-08-08 16:29:42 UTC (rev 3714) @@ -26,28 +26,19 @@ package fr.ifremer.isisfish.simulator; import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; -import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.entities.Variable; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; -import fr.ifremer.isisfish.types.TimeStep; /** * Keep all information on one simulation. @@ -322,7 +313,7 @@ /** * Script directory to use. * - * Used to chnage isis-database-3 directory in running simulation context. + * Used to change isis-database-3 directory in running simulation context. * * @param scriptDirectory */ Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2012-08-08 15:17:34 UTC (rev 3713) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2012-08-08 16:29:42 UTC (rev 3714) @@ -28,6 +28,7 @@ import org.nuiton.math.matrix.SemanticMapper; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.simulator.SimulationContext; @@ -64,8 +65,13 @@ try { clazz = Class.forName("fr.ifremer.isisfish.entities." + typeName); } catch (Exception ex) { - log.warn("Can't find class for " + typeName, ex); - clazz = String.class; + try { + clazz = Class.forName("fr.ifremer.isisfish.types." + typeName); + } catch (Exception ex2) { + log.warn("Can't find class for name " + typeName, ex2); + clazz = String.class; + } + } return clazz; } @@ -84,9 +90,13 @@ // In simulation context : Object value = null; try { - TopiaContext context = SimulationContext.get().getDB(); - TopiaDAO dao = IsisFishDAOHelper.getDAO(context, type); - value = dao.findByProperty("name", valueId); + if (TopiaEntity.class.isAssignableFrom(type)) { + TopiaContext context = SimulationContext.get().getDB(); + TopiaDAO dao = IsisFishDAOHelper.getDAO(context, type); + value = dao.findByProperty("name", valueId); + } else { + value = ConverterUtil.getConverter(null).convert(valueId, type); + } } catch (Exception ex) { log.warn("Can't get value for " + valueId, ex); value = valueId; Added: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java (rev 0) +++ trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-08 16:29:42 UTC (rev 3714) @@ -0,0 +1,149 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.util; + +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.net.URL; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.entities.Gear; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.Zone; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.TimeStep; + +/** + * Test que le semantic mapper est bien pris en compte lors de l'import + * de matrix nd et qu'il converti bien tous les types requis. + * + * @author echatellier + * @since 4.1.0.3 + */ +public class IsisMatrixSemanticMapperTest extends AbstractIsisFishTest { + + @Before + public void setUp() throws IOException, TopiaException { + MatrixFactory.setSemanticMapper(new IsisMatrixSemanticMapper()); + URL zipURL = this.getClass().getResource("/simulations/test-nonregression-20090203.zip"); + SimulationStorage simRef = SimulationStorage.importAndRenameZip(new File(zipURL.getFile()), "test-nonregression"); + SimulationContext.get().setSimulationStorage(simRef); + } + + /** + * Test la conversion des entités. + * @throws IOException + * @throws TopiaException + */ + @Test + public void testImportEntityImportString() throws IOException, TopiaException { + String data = "[1, 1, 1]\n" + + "String:testpopulation\n" + + "String:Testengin\n" + + "String:Zone test1\n" + + "0;0;0;42.0"; + + TopiaContext tx = SimulationContext.get().getDB(); + + List[] sems = new List[] { + Collections.singletonList(IsisFishDAOHelper.getPopulationDAO(tx).findByName("test population")), + Collections.singletonList(IsisFishDAOHelper.getGearDAO(tx).findByName("Testengin")), + Collections.singletonList(IsisFishDAOHelper.getZoneDAO(tx).findByName("Zone test1")), + }; + MatrixND m = MatrixFactory.getInstance().create(sems); + m.importCSV(new StringReader(data), null); + + Assert.assertEquals(42.0, m.getValue(0, 0, 0), 0.001); + } + + /** + * Test la conversion des entités. + * @throws IOException + * @throws TopiaException + */ + @Test + public void testImportEntity() throws IOException, TopiaException { + String data = "[1, 1, 1]\n" + + "Population:test population\n" + + "Gear:Testengin\n" + + "Zone:Zone test1\n" + + "0;0;0;42.0"; + + TopiaContext tx = SimulationContext.get().getDB(); + + List[] sems = new List[] { + Collections.singletonList(IsisFishDAOHelper.getPopulationDAO(tx).findByName("test population")), + Collections.singletonList(IsisFishDAOHelper.getGearDAO(tx).findByName("Testengin")), + Collections.singletonList(IsisFishDAOHelper.getZoneDAO(tx).findByName("Zone test1")), + }; + MatrixND m = MatrixFactory.getInstance().create(sems); + m.importCSV(new StringReader(data), null); + + Assert.assertEquals(42.0, m.getValue(0, 0, 0), 0.001); + } + + /** + * Test la conversion des entités et TimeStep + * @throws IOException + * @throws TopiaException + */ + @Test + public void testImportEntityTimeStep() throws IOException, TopiaException { + String data = "[1, 1, 2]\n" + + "Population:test population\n" + + "Gear:Testengin\n" + + "TimeStep:0,1\n" + + "0;0;0;1.0\n" + + "0;0;1;2.0"; + + TopiaContext tx = SimulationContext.get().getDB(); + + List[] sems = new List[] { + Collections.singletonList(IsisFishDAOHelper.getPopulationDAO(tx).findByName("test population")), + Collections.singletonList(IsisFishDAOHelper.getGearDAO(tx).findByName("Testengin")), + Arrays.asList(new TimeStep(0), new TimeStep(1)), + }; + MatrixND m = MatrixFactory.getInstance().create(sems); + m.importCSV(new StringReader(data), null); + + Assert.assertEquals(1.0, m.getValue(0, 0, 0), 0.001); + Assert.assertEquals(2.0, m.getValue(0, 0, 1), 0.001); + } +} Property changes on: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3713 - in trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/input/variable resources/i18n
by echatellier＠users.forge.codelutin.com Aug. 8, 2012

Aug. 8, 2012

Author: echatellier Date: 2012-08-08 17:17:34 +0200 (Wed, 08 Aug 2012) New Revision: 3713 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3713 Log: fixes #1389 : Add new variable tab for population Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2012-08-08 15:17:34 UTC (rev 3713) @@ -53,6 +53,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; @@ -230,8 +231,13 @@ config.parse(args); // to work in java webstart - I18n.init(new DefaultI18nInitializer("isis-fish-i18n"), config.getLocale()); - + try { + I18n.init(new DefaultI18nInitializer("isis-fish-i18n"), config.getLocale()); + } catch (Exception ex) { + // dev mode + I18n.init(new ClassPathI18nInitializer(), config.getLocale()); + } + // after init shutdown hook Runtime.getRuntime().addShutdownHook(new IsisQuitHook()); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2012-08-08 15:17:34 UTC (rev 3713) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -41,12 +41,6 @@ installChangeListener(populationTab); } -/*public void refresh() { - // reverse ordre is no more needed - getSaveVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, - populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); -}*/ - @Override public void setLayer(boolean active) { super.setLayer(active); @@ -59,6 +53,7 @@ populationCapturabilityUI.setLayer(active); populationMigrationUI.setLayer(active); populationPriceUI.setLayer(active); + variablesUI.setLayer(active); } @Override @@ -72,6 +67,7 @@ populationCapturabilityUI.resetChangeModel(); populationMigrationUI.resetChangeModel(); populationPriceUI.resetChangeModel(); + variablesUI.resetChangeModel(); } ]]> </script> @@ -113,6 +109,11 @@ <tab title='isisfish.populationPrice.title'> <PopulationPriceUI id='populationPriceUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> + <tab title='isisfish.variables.tabtitle'> + <fr.ifremer.isisfish.ui.input.variable.EntityVariableUI id="variablesUI" + bean="{getBean()}" active="{isActive()}" + sensitivity="{isSensitivity()}" constructorParams='this'/> + </tab> </JTabbedPane> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2012-08-08 15:17:34 UTC (rev 3713) @@ -30,6 +30,7 @@ import javax.swing.JList; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -79,6 +80,18 @@ } catch (TopiaException ex) { throw new IsisFishRuntimeException("Can't init view", ex); } + + // try to set entity name in label + try { + String name = BeanUtils.getProperty(view.getBean(), "name"); + view.getVariableEntityName().setText(name); + } catch (Exception ex) { + if (log.isWarnEnabled()) { + log.warn("Can't get entity name", ex); + } + } + } else { + view.getVariableEntityName().setText(""); } model.setEntities(variables); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-08-08 15:17:34 UTC (rev 3713) @@ -76,6 +76,16 @@ <Table border='{BorderFactory.createTitledBorder(_("isisfish.variables.variabledetail"))}'> <row> <cell fill="horizontal"> + <JLabel text="isisfish.variables.entityname" + enabled='{isActive() && getVariable() != null}'/> + </cell> + <cell fill="horizontal" weightx='1.0'> + <JLabel id="variableEntityName" + enabled='{isActive() && getVariable() != null}'/> + </cell> + </row> + <row> + <cell fill="horizontal"> <JLabel text="isisfish.variables.variablename" enabled='{isActive() && getVariable() != null}'/> </cell> Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-08-08 15:17:34 UTC (rev 3713) @@ -970,6 +970,7 @@ isisfish.variables.defaultname=VarName isisfish.variables.deletevariable=Delete isisfish.variables.double.value=Real value \: +isisfish.variables.entityname=Object name \: isisfish.variables.matrix.value=Matrix \: isisfish.variables.savevariable=Save isisfish.variables.tabtitle=Variables Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-08-08 15:17:34 UTC (rev 3713) @@ -970,6 +970,7 @@ isisfish.variables.defaultname=VarName isisfish.variables.deletevariable=Supprimer isisfish.variables.double.value=Valeur réelle \: +isisfish.variables.entityname=Nom de l'objet \: isisfish.variables.matrix.value=Matrice isisfish.variables.savevariable=Sauver isisfish.variables.tabtitle=Variables

1 0

r3712 - in trunk/src/main: java/fr/ifremer/isisfish resources/fr/ifremer/isisfish/entities
by echatellier＠users.forge.codelutin.com Aug. 8, 2012

Aug. 8, 2012

Author: echatellier Date: 2012-08-08 15:15:08 +0200 (Wed, 08 Aug 2012) New Revision: 3712 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3712 Log: fixes #1388 : Can't open database in offline mode Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java trunk/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-08-08 13:15:08 UTC (rev 3712) @@ -119,7 +119,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 1, 0, 0); + protected final static Version version = new Version(4, 1, 0, 3); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version( Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 -2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="cell"> <field-validator type="fieldexpression"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="cell"> <field-validator type="fieldexpression">

1 0

r3711 - trunk/src/site/rst/documentation
by echatellier＠users.forge.codelutin.com Aug. 8, 2012

Aug. 8, 2012

Author: echatellier Date: 2012-08-08 15:14:44 +0200 (Wed, 08 Aug 2012) New Revision: 3711 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3711 Log: Add latex presentation of last isis fish formation Added: trunk/src/site/rst/documentation/isisscript.tex Added: trunk/src/site/rst/documentation/isisscript.tex =================================================================== --- trunk/src/site/rst/documentation/isisscript.tex (rev 0) +++ trunk/src/site/rst/documentation/isisscript.tex 2012-08-08 13:14:44 UTC (rev 3711) @@ -0,0 +1,215 @@ +\documentclass[pdf,13pt]{beamer} +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage[francais]{babel} % francais +\usepackage{graphicx} % images +\usepackage{times} +\usepackage{listings} +\usepackage{color} + +% Theme beamer and color +% JuanLesPins Malmoe PaloAlto Berlin Boadilla Copenhagen Hannover Goettingen +% Montpellier Rochester Madrid Antibes Singapore Szeged Warsaw +% Ilmenau Luebeck Dresden Frankfurt* Darmstadt* +\usetheme{Frankfurt} +% albatross,beetle,crane,default,dove,fly,lily,orchid,rose,seagull +% seahorse,whale,dolphin +%\usecolortheme{sidebartab} +%\setbeamertemplate{navigation symbols}{} % supprime la navigation +\usefonttheme[onlylarge]{structurebold} +\setbeamerfont*{frametitle}{size=\normalsize,series=\bfseries} +\setbeamertemplate{navigation symbols}{} + +% Types d'images utilisees +\DeclareGraphicsExtensions{.png, .eps, .jpg} + +% Ajout du logo Code Lutin en fond +\setbeamertemplate{background}{% + \parbox[c][\paperheight]{\paperwidth}{% + \vfill + \vfill + \hfill + \includegraphics[width=0.23\paperwidth,height=0.1\paperheight]{isislogo} + \hfill +}} + + +% ######################### Document Infos ##################################### +% Infos de la page de presentation +\title{ISIS-Fish} +\subtitle{Scripts} +\author{CHATELLIER Eric + \and{} + POUSSIN Benjamin} +\institute{ + Ifremer + \and{} + Code Lutin +} +\date{6 décembre 2011} + +% ############################################################################## +\begin{document} + +\begin{frame} +\titlepage +\end{frame} + +\begin{frame} +\frametitle{Plan} +\tableofcontents +\end{frame} + +% ############################################################################## +\section{Fonctionnement} + +\subsection{Qu'est-ce qu'un script ?} +\begin{frame} +\frametitle{Qu'est-ce qu'un script ?} + + \begin{itemize} + \item Code de production de simulation + \item Code d'execution de simulation + \item Écrit en Java + \item Modifiable par l'utilisateur + \end{itemize} + +\end{frame} + +\subsection{Simulateur} +\begin{frame} +\frametitle{Simulateur} + + \begin{block}{DefaultSimulator.java} + \begin{itemize} + \item Effectifs initiaux + \item Opérations par pas de temps (mois) + \item Application de la dynamique de pêcherie (pêche, mortalité...) + \item Enregistrement des résultats + \end{itemize} + \end{block} + + \begin{block}{Modification} + \begin{itemize} + \item SimulatorEffortByCell + \item Autres scripts... + \end{itemize} + \end{block} +\end{frame} + +\subsection{Scripts} +\begin{frame} +\frametitle{Scripts} + \begin{block}{Avant la simulation} + \begin{itemize} + \item Plan de simulations + \begin{itemize} + \item Plan d'expérience + \item Calibration + \end{itemize} + \item Plan d'analyzes + \begin{itemize} + \item Expand Grid + \item Moriss + \item Sobol + \end{itemize} + \end{itemize} + \end{block} +\end{frame} + +\begin{frame} +\frametitle{Scripts} + \begin{block}{Pendant la simulation} + \begin{itemize} + \item Règles (chaque pas de temps) + \begin{itemize} + \item Fermeture de zone + \item Application de quotat + \item Taille minimum des poissons + \item ... + \end{itemize} + \end{itemize} + \end{block} +\end{frame} + +\begin{frame} +\frametitle{Scripts} + \begin{block}{Après la simulation} + \begin{itemize} + \item Exports + \begin{itemize} + \item Biomasse + \item Abondance + \item Capture + \item Rejet + \end{itemize} + \end{itemize} + \end{block} +\end{frame} + +\begin{frame} +\frametitle{Scripts} + \begin{block}{Scripts importants} + \begin{itemize} + \item ResultName (nom des résultats) + \item SiMatrix (calcul des matrices) + \item GravityModel (calcul des matrices aussi) + \end{itemize} + \end{block} +\end{frame} + +% ############################################################################## +\section{Utilisation et modification} + +\subsection{Utilisation} +\begin{frame} +\frametitle{Utilisation des scripts} + + \begin{itemize} + \item Ajout dans l'interface + \item Définition des parametres (param\_) + \item Lancement de la simulation + \end{itemize} + +\end{frame} + +\subsection{Modification} +\begin{frame} +\frametitle{Modification des scripts} + + \begin{block}{Interface et dépôt} + \begin{itemize} + \item Interface de gestion des scripts + \item Dépôt officiel + \item Dépôt communauté + \end{itemize} + \end{block} + + \begin{block}{Dépôt communauté} + \begin{itemize} + \item Creation d'un nouvelle règle + \item Modification de la régle + \item Vérification de la règle + \item Utilisation de la règle + \end{itemize} + \end{block} + +\end{frame} + + +% ############################################################################## +\section{Contribution} + +\subsection{Contribution} +\begin{frame} + \frametitle{Contribution} + + \begin{itemize} + \item Partage de scripts utilisateur + \item Droit de commit + \item Synchronisation de la communauté + \end{itemize} + +\end{frame} + +\end{document}

1 0