Author: echatellier Date: 2014-04-02 16:40:57 +0200 (Wed, 02 Apr 2014) New Revision: 3922 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3922 Log: MatricND can't be continuous factor anymore Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/DistributionListRenderer.java Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-04-02 14:40:04 UTC (rev 3921) +++ branches/4.0.1/pom.xml 2014-04-02 14:40:57 UTC (rev 3922) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.1</version> + <version>5.0.4</version> </parent> <groupId>fr.ifremer</groupId> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java 2014-04-02 14:40:04 UTC (rev 3921) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java 2014-04-02 14:40:57 UTC (rev 3922) @@ -30,7 +30,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.types.RangeOfValues; @@ -135,8 +134,6 @@ result = true; } else if (value instanceof Equation) { result = true; - } else if (value instanceof MatrixND) { - result = true; } else if (value instanceof RangeOfValues) { RangeOfValues rangeOfValues = (RangeOfValues)value; if (rangeOfValues.getType().equals("Float")) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2014-04-02 14:40:04 UTC (rev 3921) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2014-04-02 14:40:57 UTC (rev 3922) @@ -35,7 +35,6 @@ import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixND; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.sensitivity.Distribution; @@ -184,27 +183,14 @@ // special management : % to min/max Object reference = distributionParameters.get(Distribution.QUNIFPC.getDistibutionParams()[0].getName()); double coef = (Double)distributionParameters.get(Distribution.QUNIFPC.getDistibutionParams()[1].getName()); - if (reference instanceof MatrixND) { - args.add(1.0 - coef); // min - args.add(1.0 + coef); // max - } else { - double ref = (Double)reference; - args.add(ref * (1.0 - coef)); // min - args.add(ref * (1.0 + coef)); // max - } + double ref = (Double)reference; + args.add(ref * (1.0 - coef)); // min + args.add(ref * (1.0 + coef)); // max } else if (distribution == Distribution.QUNIFMM) { Object min = distributionParameters.get(Distribution.QUNIFMM.getDistibutionParams()[0].getName()); - if (min instanceof MatrixND) { - args.add(0.0); // min - } else { - args.add(min); - } + args.add(min); Object max = distributionParameters.get(Distribution.QUNIFMM.getDistibutionParams()[1].getName()); - if (max instanceof MatrixND) { - args.add(1.0); // max - } else { - args.add(max); - } + args.add(max); } else { for (DistributionParam param : distribution.getDistibutionParams()) { String name = param.getName(); @@ -226,25 +212,7 @@ log.error("Can't invoke quantile method : args was " + args, ex); } } - - if (distribution == Distribution.QUNIFPC) { - Object reference = distributionParameters.get(Distribution.QUNIFPC.getDistibutionParams()[0].getName()); - if (reference instanceof MatrixND) { - MatrixND ref = ((MatrixND)reference).copy(); - result = ref.mults((Double)result); - } - } else if (distribution == Distribution.QUNIFMM) { - Object min = distributionParameters.get(Distribution.QUNIFMM.getDistibutionParams()[0].getName()); - Object max = distributionParameters.get(Distribution.QUNIFMM.getDistibutionParams()[1].getName()); - if (min instanceof MatrixND && max instanceof MatrixND) { - // le calcul ici est la suivant: - // result = min + (max - min) * coef; - MatrixND minm = ((MatrixND)min).copy(); - MatrixND maxm = ((MatrixND)max).copy(); - result = maxm.minus(minm).mults((Double)result).add(minm); - } - } - + return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java 2014-04-02 14:40:04 UTC (rev 3921) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java 2014-04-02 14:40:57 UTC (rev 3922) @@ -25,10 +25,9 @@ import java.awt.Component; +import javax.swing.DefaultListCellRenderer; import javax.swing.JList; -import org.jdesktop.swingx.renderer.DefaultListRenderer; - import fr.ifremer.isisfish.simulator.sensitivity.Factor; /** @@ -41,13 +40,13 @@ * Last update : $Date$ * By : $Author$ */ -public class FactorListRenderer extends DefaultListRenderer { +public class FactorListRenderer extends DefaultListCellRenderer { /** serialVersionUID. */ private static final long serialVersionUID = -8210763862382993163L; @Override - public Component getListCellRendererComponent(JList list, Object value, + public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Factor factor = (Factor)value; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java 2014-04-02 14:40:04 UTC (rev 3921) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java 2014-04-02 14:40:57 UTC (rev 3922) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012, 2013 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2012, 2014 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -25,6 +25,8 @@ package fr.ifremer.isisfish.ui.sensitivity.wizard; +import static org.nuiton.i18n.I18n.t; + import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Insets; @@ -37,14 +39,11 @@ import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JTabbedPane; import javax.swing.JTextField; import javax.swing.text.JTextComponent; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEditor; import fr.ifremer.isisfish.simulator.sensitivity.Distribution; import fr.ifremer.isisfish.simulator.sensitivity.Distribution.DistributionParam; @@ -69,7 +68,7 @@ private static final long serialVersionUID = 2289588676194644582L; /** Distribution combo. */ - protected JComboBox distributionCombo; + protected JComboBox<Distribution> distributionCombo; /** Panel that contains dynamics components. */ protected JPanel dynamicPanel; @@ -84,18 +83,25 @@ setLayout(new GridBagLayout()); + // label + JLabel distributionLabel = new JLabel(t("isisfish.sensitivity.distribution")); + add(distributionLabel, new GridBagConstraints(0, 0, 1, 1, 0, 0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + new Insets(0, 0, 0, 0), 0, 0)); + // combobox - distributionCombo = new JComboBox(Distribution.values()); + distributionCombo = new JComboBox<Distribution>(Distribution.values()); // important : for setSelectedItem to fire event distributionCombo.setSelectedItem(null); distributionCombo.addItemListener(this); - add(distributionCombo, new GridBagConstraints(0, 0, 1, 1, 0, 0, - GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, + distributionCombo.setRenderer(new DistributionListRenderer()); + add(distributionCombo, new GridBagConstraints(1, 0, 1, 1, 0, 0, + GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); // sub dynamic panel containing stuff dynamicPanel = new JPanel(new GridBagLayout()); - add(dynamicPanel, new GridBagConstraints(0, 1, 1, 1, 1, 1, + add(dynamicPanel, new GridBagConstraints(0, 1, 2, 1, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(5, 0, 0, 0), 0, 0)); @@ -121,12 +127,8 @@ Object value = domain.getDistributionParameters().get(param.getName()); if (value != null) { JComponent comp = paramComponents.get(paramComponentIndex); - - if (comp instanceof MatrixPanelEditor) { - ((MatrixPanelEditor)comp).setMatrix((MatrixND)value); - } else { - ((JTextComponent)comp).setText(value.toString()); - } + + ((JTextComponent)comp).setText(value.toString()); } else { if (log.isWarnEnabled()) { log.warn("Param " + param.getName() + " not found during init"); @@ -161,21 +163,15 @@ return; } - // pas de gros composant = liste de composants - // un seul, on gros et une liste mixé - // plusieurs gros, ui par onglet - int numberOfBigComponents = getNumberOfBigComponents(distrib); - - // rendu en liste / liste mixée - JTabbedPane tabbedPane = null; - if (numberOfBigComponents >= 2) { - tabbedPane = new JTabbedPane(); - dynamicPanel.add(tabbedPane, new GridBagConstraints(0, 0, 1, 1, 1, 1, - GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(0, 0, 0, 0), 0, 0)); - } - int index = 0; + // add label + JLabel paramDetailsLabel = new JLabel(t("isisfish.sensitivity.distribution.parameters", distrib.getDescription())); + dynamicPanel.add(paramDetailsLabel, new GridBagConstraints(0, index, 2, 1, 0, 0, + GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, + new Insets(0, 0, 0, 0), 0, 0)); + index++; + + // add others params DistributionParam[] params = distrib.getDistibutionParams(); for (DistributionParam param : params) { JLabel paramLabel = new JLabel(param.getName() + " :"); @@ -184,32 +180,15 @@ JComponent paramField = getParamField(param); paramField.setToolTipText(param.getDescription()); - // rendu en onglet - if (numberOfBigComponents >= 2) { - tabbedPane.add(param.getName(), paramField); - } - // rendu mixé - else if (isParamBigComponent(param)) { - dynamicPanel.add(paramLabel, new GridBagConstraints(0, index, 2, 1, 0, 0, - GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, - new Insets(0, 0, 0, 0), 0, 0)); - index++; - - dynamicPanel.add(paramField, new GridBagConstraints(0, index, 2, 1, 1, 1, - GridBagConstraints.NORTH, GridBagConstraints.BOTH, - new Insets(0, 0, 0, 0), 0, 0)); - index++; // rendu simple - } else { - dynamicPanel.add(paramLabel, new GridBagConstraints(0, index, 1, 1, 0, 0, - GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, - new Insets(0, 0, 0, 0), 0, 0)); + dynamicPanel.add(paramLabel, new GridBagConstraints(0, index, 1, 1, 0, 0, + GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, + new Insets(0, 0, 0, 0), 0, 0)); - dynamicPanel.add(paramField, new GridBagConstraints(1, index, 1, 1, 1, 0, - GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, - new Insets(0, 0, 0, 0), 0, 0)); - index++; - } + dynamicPanel.add(paramField, new GridBagConstraints(1, index, 1, 1, 1, 0, + GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, + new Insets(0, 0, 0, 0), 0, 0)); + index++; paramComponents.add(paramField); } @@ -232,12 +211,7 @@ JComponent result; if (param.isOriginalValue()) { - if (originalValue instanceof MatrixND) { - result = new MatrixPanelEditor(); - ((MatrixPanelEditor)result).setMatrix((MatrixND)originalValue); - } else { - result = new JTextField(originalValue.toString()); - } + result = new JTextField(originalValue.toString()); } else { result = new JTextField(); } @@ -245,37 +219,6 @@ return result; } - /** - * Return the number of big components necessary to edit - * selected distribution. - * - * @return number of big components - */ - protected int getNumberOfBigComponents(Distribution distrib) { - - int result = 0; - - DistributionParam[] params = distrib.getDistibutionParams(); - for (DistributionParam param : params) { - if (isParamBigComponent(param)) { - result++; - } - } - - return result; - } - - /** - * Param will be rendered as big ui component only a param - * allows it and current value is big rendering (matrix?). - * - * @param param param to test (with current value) - * @return - */ - protected boolean isParamBigComponent(DistributionParam param) { - return param.isOriginalValue() && originalValue instanceof MatrixND; - } - /* * @see fr.ifremer.isisfish.ui.sensitivity.wizard.ContinuousPanelContainerUI#isFactorValid() */ @@ -306,15 +249,11 @@ int paramComponentIndex = 0; for (DistributionParam param : params) { JComponent comp = paramComponents.get(paramComponentIndex); - - if (comp instanceof MatrixPanelEditor) { - domain.addDistributionParam(param.getName(), ((MatrixPanelEditor)comp).getMatrix()); - } else { - // XXX echatellier 20131201 : always double type ? - String strValue = ((JTextComponent)comp).getText().trim(); - domain.addDistributionParam(param.getName(), Double.parseDouble(strValue)); - } - + + // XXX echatellier 20131201 : always double type ? + String strValue = ((JTextComponent)comp).getText().trim(); + domain.addDistributionParam(param.getName(), Double.parseDouble(strValue)); + paramComponentIndex++; } return domain; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java 2014-04-02 14:40:04 UTC (rev 3921) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java 2014-04-02 14:40:57 UTC (rev 3922) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 Codelutin, Chatellier Eric + * Copyright (C) 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 Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/DistributionListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/DistributionListRenderer.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/DistributionListRenderer.java 2014-04-02 14:40:57 UTC (rev 3922) @@ -0,0 +1,53 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 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 + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.ui.sensitivity.wizard; + +import java.awt.Component; + +import javax.swing.DefaultListCellRenderer; +import javax.swing.JList; + +import fr.ifremer.isisfish.simulator.sensitivity.Distribution; + +/** + * Renderer qui affiche la description de la distribution. + * + * @author Eric Chatellier + */ +public class DistributionListRenderer extends DefaultListCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = -8210763862382993163L; + + @Override + public Component getListCellRendererComponent(JList<?> list, Object value, + int index, boolean isSelected, boolean cellHasFocus) { + + Distribution distribution = (Distribution)value; + String stringValue = null; + if (distribution != null) { + stringValue = distribution.getDescription(); + } + return super.getListCellRendererComponent(list, stringValue, index, isSelected, cellHasFocus); + } +} Property changes on: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/DistributionListRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx 2014-04-02 14:40:04 UTC (rev 3921) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx 2014-04-02 14:40:57 UTC (rev 3922) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 @@ -141,7 +141,7 @@ <JScrollPane> <fr.ifremer.isisfish.ui.sensitivity.model.FactorListModel id="factorsListModel" constructorParams="factors" /> - <JList id="factorsList" model="{factorsListModel}" + <JList id="factorsList" model="{factorsListModel}" genericType="Factor" cellRenderer="{new fr.ifremer.isisfish.ui.sensitivity.model.FactorListRenderer()}"/> <ListSelectionModel initializer="factorsList.getSelectionModel()" onValueChanged="displaySelectedFactor();setSelectedFactor(factorsList.getSelectedIndex() != -1)" /> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java 2014-04-02 14:40:04 UTC (rev 3921) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java 2014-04-02 14:40:57 UTC (rev 3922) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2012 - 2014 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 @@ -372,12 +372,6 @@ ui.setBeanProperty(property); ui.setBean(bean); result = ui; - } else if (value instanceof MatrixND) { - MatrixND matrix = (MatrixND)value; - //MatrixContinuousPanelUI matrixPanel = new MatrixContinuousPanelUI(); - //matrixPanel.init(matrix.clone(), matrix.clone(), matrix.clone(), null); - //result = matrixPanel; - result = new ContinuousDistributionPanel(matrix.clone()); } else if (value instanceof TimeUnit) { TimeUnit timeUnit = (TimeUnit)value; //DefaultContinuousPanelUI ui = new DefaultContinuousPanelUI(); @@ -586,12 +580,6 @@ ui.setBeanProperty(property); ui.setBean(entity); result = ui; - } else if (value instanceof MatrixND) { - MatrixND matrix = (MatrixND)value; - //MatrixContinuousPanelUI matrixPanel = new MatrixContinuousPanelUI(); - //matrixPanel.init(matrix.clone(), matrix.clone(), matrix.clone(), null); - //result = matrixPanel; - result = new ContinuousDistributionPanel(matrix.clone()); } else if (value instanceof TimeUnit) { TimeUnit timeUnit = (TimeUnit)value; //DefaultContinuousPanelUI ui = new DefaultContinuousPanelUI(); @@ -609,24 +597,7 @@ topiaContext.closeContext(); } else { - if (factorPath.startsWith("parameters.population.")) { - // la seule facon d'avoir les parametres ici est d'aller - // les chercher dans les parametres de simulation - Pattern pattern = Pattern.compile("^parameters\\.population\\.(\\w+)(\\.(.+)?)$"); - Matcher matcher = pattern.matcher(factorPath); - if (matcher.matches()) { - String populationName = matcher.group(1); - if (log.isDebugEnabled()) { - log.debug("Loading population : " + populationName); - } - TopiaContext topiaContext = getTopiaContext(factorWizardUI); - Population pop = IsisFishDAOHelper.getPopulationDAO(topiaContext).findByName(populationName); - SimulAction action = factorWizardUI.getContextValue(SimulAction.class); - MatrixND N = action.getSimulationParameter().getNumberOf(pop); - result = new ContinuousDistributionPanel(N.clone()); - topiaContext.closeContext(); - } - } else if (factorPath.startsWith("parameters.rule.")) { + if (factorPath.startsWith("parameters.rule.")) { Pattern pattern = Pattern.compile("^parameters\\.rule\\.(\\d+)\\.parameter\\.(\\w+)(\\..+)?$"); Matcher matcher = pattern.matcher(factorPath); if (matcher.matches()) { Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-02 14:40:04 UTC (rev 3921) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-02 14:40:57 UTC (rev 3922) @@ -681,15 +681,19 @@ isisfish.params.toString.fishery=Fishery\: %1$s\n\n isisfish.params.toString.lib.logger.level=Level of libraries' logger \: %1$s isisfish.params.toString.number.years=Number of years\: %1$s\n\n +isisfish.params.toString.objective= +isisfish.params.toString.optimization= isisfish.params.toString.plan=Plan\: %1$s isisfish.params.toString.plan.number=Simulation plan sequence number\: %1$s\n\n isisfish.params.toString.populations=Populations \: isisfish.params.toString.rule=Rule\: %1$s +isisfish.params.toString.script.generatedpresimulation= isisfish.params.toString.script.logger.level=Level of scripts' logger \: %1$s isisfish.params.toString.script.presimulation=Script de presimulation isisfish.params.toString.simul.logger.level=Level of simulator's logger \: %1$s isisfish.params.toString.simulation.done=Simulation done with \: %1$s isisfish.params.toString.strategies=Strategies \: +isisfish.params.toString.use.optimization= isisfish.params.usePreSimulationScript=Use pre simulation script isisfish.params.useSimulationPlan=Use simulation plan isisfish.population.capturability=Capturability @@ -895,6 +899,8 @@ isisfish.sensitivity.discret=Finite discrete factor isisfish.sensitivity.discretevaluelabel=Value %d isisfish.sensitivity.displaysecondpass=Display results +isisfish.sensitivity.distribution= +isisfish.sensitivity.distribution.parameters= isisfish.sensitivity.equation.valid=Valid variable isisfish.sensitivity.equation.variablename=Varaible name \: isisfish.sensitivity.export=Export Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-04-02 14:40:04 UTC (rev 3921) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-04-02 14:40:57 UTC (rev 3922) @@ -679,15 +679,19 @@ isisfish.params.toString.fishery=Pêcherie\: %1$s\n\n isisfish.params.toString.lib.logger.level=niveau du logger de librairies \: %1$s isisfish.params.toString.number.years=Nombre d'années \: %1$s\n\n +isisfish.params.toString.objective= +isisfish.params.toString.optimization= isisfish.params.toString.plan=Plan\: %1$s isisfish.params.toString.plan.number=Numéro de séquence dans le plan \: %1$s\n\n isisfish.params.toString.populations=Populations \: isisfish.params.toString.rule=Règle\: %1$s +isisfish.params.toString.script.generatedpresimulation= isisfish.params.toString.script.logger.level=niveau du logger de scripts \: %1$s isisfish.params.toString.script.presimulation=Script de presimulation isisfish.params.toString.simul.logger.level=niveau du logger de simulateur \: %1$s isisfish.params.toString.simulation.done=Simulation réalisée avec \: %1$s isisfish.params.toString.strategies=Stratégies d'exploitation \: +isisfish.params.toString.use.optimization= isisfish.params.usePreSimulationScript=Utiliser un script de pré-simulation isisfish.params.useSimulationPlan=Utiliser un plan de simulation isisfish.population.capturability=Capturabilité @@ -888,11 +892,13 @@ isisfish.selectivity.title=Sélectivité isisfish.sens.backParameter=Retour aux paramètres isisfish.sens.title=Plan de simulation -isisfish.sensitivity.comment=Commentaires +isisfish.sensitivity.comment=Commentaire \: isisfish.sensitivity.continue=Facteur continu isisfish.sensitivity.discret=Facteur discret fini isisfish.sensitivity.discretevaluelabel=Valeur %d isisfish.sensitivity.displaysecondpass=Afficher les résultats +isisfish.sensitivity.distribution=Distribution \: +isisfish.sensitivity.distribution.parameters=Paramètres de la distribution %s \: isisfish.sensitivity.equation.valid=Valider la variable isisfish.sensitivity.equation.variablename=Variable name \: isisfish.sensitivity.export=Export