[Isis-fish-commits] r3654 - in branches/4.0.1/src: main/java/fr/ifremer/isisfish/mexico/xml main/java/fr/ifremer/isisfish/simulator/launcher main/java/fr/ifremer/isisfish/simulator/sensitivity main/java/fr/ifremer/isisfish/simulator/sensitivity/domain main/java/fr/ifremer/isisfish/ui/sensitivity main/java/fr/ifremer/isisfish/ui/sensitivity/model main/java/fr/ifremer/isisfish/ui/sensitivity/wizard main/java/fr/ifremer/isisfish/ui/simulator main/resources/i18n test/java/fr/ifremer/isisfish/mexico test/java/fr

Author: echatellier Date: 2012-03-14 16:56:49 +0100 (Wed, 14 Mar 2012) New Revision: 3654 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3654 Log: Remove equationcontinuousdomain (now useless) Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java Removed: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/MatrixContinuousPanelUI.jaxx branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.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/java/fr/ifremer/isisfish/ui/simulator/SimulAction.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 branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -40,7 +40,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -1,57 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 1999 - 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 - * 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.mexico.xml; - -import fr.ifremer.isisfish.simulator.sensitivity.Domain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; - -/** - * XML domain visitor for Equation Continous Domain. - * - * @author chatellier - * @version $Revision: 1.0 $ - * - * Last update : $Date: 30 mars 2009 $ - * By : $Author: chatellier $ - */ -public class EquationContinuousDomainXMLVisitor extends ContinuousDomainXMLVisitor { - - /** - * {@inheritDoc} - */ - @Override - public void start(Domain domain) { - xmlBuffer.append("<domain "); - - EquationContinuousDomain eDomain = (EquationContinuousDomain)domain; - // this version add variable name - xmlBuffer.append(" variable=\"") - .append(eDomain.getVariableName()) - .append(">"); - - appendDomain(eDomain); - } -} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -29,7 +29,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor; @@ -75,9 +74,7 @@ @Override public void visit(Factor factor, Domain domain) { DomainXMLVisitor visitor = null; - if (factor.getDomain() instanceof EquationContinuousDomain) { - visitor = new EquationContinuousDomainXMLVisitor(); - } else if (factor.getDomain() instanceof ContinuousDomain) { + if (factor.getDomain() instanceof ContinuousDomain) { visitor = new ContinuousDomainXMLVisitor(); } else if (factor.getDomain() instanceof RuleDiscreteDomain) { visitor = new RuleDiscreteDomainXMLVisitor(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -43,7 +43,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.SortedMap; import java.util.TreeSet; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -54,7 +53,6 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.time.DurationFormatUtils; @@ -67,7 +65,6 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.ListenerSet; import org.nuiton.util.ObjectUtil; -import org.nuiton.util.StringUtil; import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFish; @@ -98,7 +95,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.util.CompileHelper; @@ -652,7 +649,7 @@ // cas special 3 : facteur sur les parametres des regles else if (factor.getPath().startsWith("parameters.rule.")) { // special case for rule parameter with - Pattern pattern = Pattern.compile("^parameters\\.(rule\\.\\d+\\.parameter\\.\\w+)\\..+$"); + Pattern pattern = Pattern.compile("^parameters\\.(rule\\.\\d+\\.parameter\\.\\w+)(\\..+)?$"); Matcher matcher = pattern.matcher(factor.getPath()); String paramName = null; if (matcher.matches()) { @@ -664,8 +661,8 @@ buffer.append("params.setProperty(\"").append(paramName).append("\",\"").append(stringValue).append("\");\n"); } // cas special 4 : equation - else if (factor.getDomain() instanceof EquationContinuousDomain) { - buffer.append("context.setComputeValue(\"").append(factor.getName()); + else if (StringUtils.isNotBlank(factor.getEquationVariableName())) { + buffer.append("context.setComputeValue(\"").append(factor.getName() + "." + factor.getEquationVariableName()); buffer.append("\",").append(factor.getValue()).append(");\n"); } // cas pas si special Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2009 - 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 @@ -27,8 +27,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import java.io.Serializable; import fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor; @@ -104,6 +102,9 @@ /** Cardinality */ protected int cardinality; + /** Variable name in case of equation factor (must be java valid identifier) */ + protected String equationVariableName; + /** * Constructor with name. * @@ -182,12 +183,13 @@ * @return the value */ public Object getDisplayedValue() { - if (domain instanceof EquationDiscreteDomain || + // FIXME echatellier 20120313 EquationContinuousDomain removed + /*if (domain instanceof EquationDiscreteDomain || domain instanceof EquationContinuousDomain) { return "\"" + getValue() + "\""; - } else { + } else {*/ return getValue(); - } + //} } /** @@ -240,10 +242,11 @@ } public int getCardinality() { + int result = cardinality; if (domain instanceof DiscreteDomain) { - return ((DiscreteDomain)domain).getValues().size(); + result = ((DiscreteDomain)domain).getValues().size(); } - return cardinality; + return result; } public void setCardinality(int cardinality) { @@ -251,6 +254,24 @@ } /** + * Get variable name. + * + * @return the variableName + */ + public String getEquationVariableName() { + return equationVariableName; + } + + /** + * Set variable name. + * + * @param equationVariableName the variableName to set + */ + public void setEquationVariableName(String equationVariableName) { + this.equationVariableName = equationVariableName; + } + + /** * Accept a new visitor. * * @param visitor Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -1,98 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 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 - * 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.simulator.sensitivity.domain; - -import java.util.SortedMap; - -import fr.ifremer.isisfish.simulator.sensitivity.Distribution; - -/** - * Domaine continu portant sur variable pouvant prendre différente valeur par - * rapport à une valeur initiale. - * - * @author chatellier - * @version $Revision: 1.0 $ - * - * Last update : $Date: 24 févr. 2009 $ By : $Author: chatellier $ - */ -public class EquationContinuousDomain extends ContinuousDomain { - - /** serialVersionUID. */ - private static final long serialVersionUID = -2037768174807839046L; - - /** Variable name (must be java valid identifier) */ - protected String variableName; - - /** - * Empty constructor. - */ - public EquationContinuousDomain() { - - } - - /** - * COnstructor with distribution. - * - * @param distribution distribution - * @param params parameters - */ - public EquationContinuousDomain(Distribution distribution, SortedMap<String, Object> params) { - super(distribution, params); - } - - /** - * Constructor with distribution. - * - * @param distribution distribution - */ - public EquationContinuousDomain(Distribution distribution) { - super(distribution); - } - - /** - * Get variable name. - * - * @return the variableName - */ - public String getVariableName() { - return variableName; - } - - /** - * Set variable name. - * - * @param variableName the variableName to set - */ - public void setVariableName(String variableName) { - this.variableName = variableName; - } - - @Override - public String toString() { - String result = super.toString() + ";variableName=" + variableName; - return result; - } -} Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java (from rev 3646, branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainListModel.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -0,0 +1,92 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * 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 + * 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.ui.sensitivity.model; + +import java.util.List; + +import javax.swing.DefaultListModel; + +import fr.ifremer.isisfish.simulator.sensitivity.Factor; + +/** + * Model pour la liste des {@link Factor}. + * + * Pas de selection par defaut. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FactorListModel extends DefaultListModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 2281927104735245489L; + + /** EquationContinuousDomain list */ + protected List<Factor> factors; + + /** + * Constructor with factors list. + * + * @param factors factors list + */ + public FactorListModel(List<Factor> factors) { + this.factors = factors; + } + + /** + * Change data list and fire data change event. + * + * @param factors new data list + */ + public void setFactors(List<Factor> factors) { + this.factors = factors; + fireContentsChanged(this, 0, factors.size()); + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return factors.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (factors != null) { + size = factors.size(); + } + return size; + } +} Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java (from rev 3646, branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListRenderer.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -0,0 +1,58 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * 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 + * 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.ui.sensitivity.model; + +import java.awt.Component; + +import javax.swing.JList; + +import org.jdesktop.swingx.renderer.DefaultListRenderer; + +import fr.ifremer.isisfish.simulator.sensitivity.Factor; + +/** + * Renderer for equation factor variables list. + * Renderer as variable name string. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FactorListRenderer extends DefaultListRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = -8210763862382993163L; + + @Override + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) { + + Factor factor = (Factor)value; + String stringValue = factor.getEquationVariableName(); + return super.getListCellRendererComponent(list, stringValue, index, isSelected, cellHasFocus); + } + +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -36,6 +36,7 @@ import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; +import org.apache.commons.lang3.StringUtils; import org.nuiton.util.Resource; import fr.ifremer.isisfish.simulator.sensitivity.Domain; @@ -111,6 +112,11 @@ text = factor.getName(); } + + // add equation name if any + if (StringUtils.isNotBlank(factor.getEquationVariableName())) { + text += "." + factor.getEquationVariableName(); + } } c.setIcon(iconCache.get(icon)); c.setText(text); 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 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -48,6 +48,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.Distribution; import fr.ifremer.isisfish.simulator.sensitivity.Distribution.DistributionParam; +import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; /** @@ -101,19 +102,17 @@ this.originalValue = originalValue; } - /** - * @param domain - */ @Override - public void initWithDomain(ContinuousDomain domain) { - // this fire components list modification - Distribution distrib = domain.getDistribution(); + public void initWithFactor(Factor factor) { - // can be null in creation state - if (distrib == null) { + ContinuousDomain domain = (ContinuousDomain)factor.getDomain(); + // can happen during factor creation + if (domain == null) { return; } + Distribution distrib = domain.getDistribution(); + // this fires components list modification distributionCombo.setSelectedItem(distrib); DistributionParam[] params = distrib.getDistibutionParams(); 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 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -27,7 +27,7 @@ import javax.swing.JPanel; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.Factor; /** * Common code for all continuous panels: @@ -66,6 +66,11 @@ this.continuePossible = continuePossible; firePropertyChange("continuePossible", oldValue, continuePossible); } - - public abstract void initWithDomain(ContinuousDomain domain); + + /** + * Init current panel with existing factor. + * + * @param factor + */ + public abstract void initWithFactor(Factor factor); } 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 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/EquationContinuousPanelUI.jaxx 2012-03-14 15:56:49 UTC (rev 3654) @@ -43,7 +43,7 @@ javax.swing.DefaultCellEditor javax.swing.event.CellEditorListener fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain - fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain + fr.ifremer.isisfish.simulator.sensitivity.Factor org.apache.commons.lang3.StringUtils </import> @@ -57,45 +57,47 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> - <Boolean id="selectedDomain" javaBean="false" /> + <Boolean id="selectedFactor" javaBean="false" /> - <java.util.List id="domains" genericType="EquationContinuousDomain" initializer="new ArrayList<EquationContinuousDomain>()" /> + <java.util.List id="factors" genericType="Factor" initializer="new ArrayList<Factor>()" /> <script><![CDATA[ @Override -public void initWithDomain(ContinuousDomain domain) { - addDomain((EquationContinuousDomain)domain); +public void initWithFactor(Factor factor) { + addFactor(factor); } -protected void addDomain(EquationContinuousDomain domain) { - domains.add(domain); +protected void addFactor(Factor factor) { + factors.add(factor); // fire data change - variablesListModel.setDomains(domains); + factorsListModel.setFactors(factors); } /** - * Valid selected domain. + * Valid selected factor. */ -protected void validSelectedDomain() { +protected void validSelectedFactor() { // fill selected - EquationContinuousDomain selectedDomain = (EquationContinuousDomain)variablesList.getSelectedValue(); - selectedDomain.setVariableName(variableNameField.getText().trim()); + Factor selectedFactor = (Factor)factorsList.getSelectedValue(); + selectedFactor.setEquationVariableName(variableNameField.getText().trim()); + selectedFactor.setDomain(distributionPanel.generateDomain()); - // parse equation content to replace // double xxx = 4.0; // by // double xxx = context.getValueAndCompute("myfactorname.xxx", 4.0) // if xxx is the variable name to replace - String variableName = selectedDomain.getVariableName(); + FactorWizardUI wizard = getParentContainer(FactorWizardUI.class); + String factorName = wizard.getFactorNameField().getText().trim(); + String variableName = selectedFactor.getEquationVariableName(); String[] lines = editor.getEditor().getText().split("\n"); String result = ""; for (String line : lines) { Pattern p = Pattern.compile("(^.*\\s+" + variableName + "\\s*\\=\\s*)([\\d\\.]+).*\\;$"); Matcher matcher = p.matcher(line); if (matcher.find()) { - String fullVariableName = bean.toString() + "." + StringUtils.uncapitalize(beanProperty) + "." + variableName; + String fullVariableName = factorName + "." + variableName; line = matcher.group(1) + "context.getValueAndCompute(\"" + fullVariableName + "\", " + matcher.group(2) + ");"; } result += line + "\n"; @@ -103,41 +105,44 @@ editor.getEditor().setText(result); // fire data change - variablesListModel.setDomains(domains); + factorsListModel.setFactors(factors); } protected void addNewVariable() { - EquationContinuousDomain domain = new EquationContinuousDomain(); - domain.setVariableName("X"); - addDomain(domain); + Factor factor = new Factor(""); + factor.setEquationVariableName("X"); + addFactor(factor); // auto select - variablesList.setSelectedValue(domain, true); + factorsList.setSelectedValue(factor, true); } -protected void displaySelectedDomain() { - EquationContinuousDomain selectedDomain = (EquationContinuousDomain)variablesList.getSelectedValue(); - variableNameField.setText(selectedDomain.getVariableName()); - distributionPanel.initWithDomain(selectedDomain); +protected void displaySelectedFactor() { + Factor selectedFactor = (Factor)factorsList.getSelectedValue(); + variableNameField.setText(selectedFactor.getEquationVariableName()); + distributionPanel.initWithFactor(selectedFactor); } protected void removeSelectedVariable() { - int selectedIndex = variablesList.getSelectedIndex(); - domains.remove(selectedIndex); + int selectedIndex = factorsList.getSelectedIndex(); + factors.remove(selectedIndex); // fire data change - variablesList.clearSelection(); - variablesListModel.setDomains(domains); + factorsList.clearSelection(); + factorsListModel.setFactors(factors); } @Override public boolean isFactorValid() { boolean valid = true; - for (EquationContinuousDomain domain : domains) { - if (StringUtils.isBlank(domain.getVariableName())) { + for (Factor factor : factors) { + if (StringUtils.isBlank(factor.getEquationVariableName())) { valid = false; } + if (factor.getDomain() == null) { + valid = false; + } } return valid; @@ -148,12 +153,12 @@ <row> <cell fill='both' weightx='1' weighty='1'> <JScrollPane> - <fr.ifremer.isisfish.ui.sensitivity.equation.EquationDomainListModel - id="variablesListModel" constructorParams="domains" /> - <JList id="variablesList" model="{variablesListModel}" - cellRenderer="{new fr.ifremer.isisfish.ui.sensitivity.equation.EquationDomainRenderer()}"/> - <ListSelectionModel initializer="variablesList.getSelectionModel()" - onValueChanged="displaySelectedDomain();setSelectedDomain(variablesList.getSelectedIndex() != -1)" /> + <fr.ifremer.isisfish.ui.sensitivity.model.FactorListModel + id="factorsListModel" constructorParams="factors" /> + <JList id="factorsList" model="{factorsListModel}" + cellRenderer="{new fr.ifremer.isisfish.ui.sensitivity.model.FactorListRenderer()}"/> + <ListSelectionModel initializer="factorsList.getSelectionModel()" + onValueChanged="displaySelectedFactor();setSelectedFactor(factorsList.getSelectedIndex() != -1)" /> </JScrollPane> </cell> <cell fill='both' weightx='1' weighty='1'> @@ -163,10 +168,10 @@ <Table> <row> <cell> - <JLabel text="isisfish.sensitivity.equation.variablename" enabled='{isSelectedDomain()}' /> + <JLabel text="isisfish.sensitivity.equation.variablename" enabled='{isSelectedFactor()}' /> </cell> <cell fill="horizontal" weightx='1'> - <JTextField id="variableNameField" enabled='{isSelectedDomain()}'/> + <JTextField id="variableNameField" enabled='{isSelectedFactor()}'/> </cell> </row> </Table> @@ -174,15 +179,15 @@ </row> <row> <cell fill="both" weighty='1' columns="2" weightx='1'> - <ContinuousDistributionPanel id="distributionPanel" enabled='{isSelectedDomain()}' + <ContinuousDistributionPanel id="distributionPanel" enabled='{isSelectedFactor()}' constructorParams="0.0d"/> </cell> </row> <row> <cell fill="horizontal" columns="2"> <JButton text="isisfish.sensitivity.equation.valid" - enabled='{isSelectedDomain()}' - onActionPerformed='validSelectedDomain()' /> + enabled='{isSelectedFactor()}' + onActionPerformed='validSelectedFactor()' /> </cell> </row> </Table> @@ -195,7 +200,7 @@ </cell> <cell fill='horizontal'> <JButton id='remove' text='isisfish.common.remove' - enabled='{isSelectedDomain()}' onActionPerformed='removeSelectedVariable()'/> + enabled='{isSelectedFactor()}' onActionPerformed='removeSelectedVariable()'/> </cell> </row> <row> Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/MatrixContinuousPanelUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/MatrixContinuousPanelUI.jaxx 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/MatrixContinuousPanelUI.jaxx 2012-03-14 15:56:49 UTC (rev 3654) @@ -1,154 +0,0 @@ -<!-- - #%L - IsisFish - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 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 - 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% - --> -<ContinuousPanel> - - <Boolean id="percentageTypeFactor" javaBean="true" /> - - <import> - org.apache.commons.lang3.StringUtils - org.nuiton.math.matrix.gui.MatrixPanelEditor - org.nuiton.math.matrix.MatrixND - java.awt.CardLayout - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener - fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain - </import> - - <script><![CDATA[ -public void init(MatrixND min, MatrixND max, MatrixND referenceValue, String coefficient) { - minValuePanel.setMatrix(min); - maxValuePanel.setMatrix(max); - referenceValuePanel.setMatrix(referenceValue); - coefficientField.setText(coefficient); -} - -public void initExisting(MatrixND min, MatrixND max, MatrixND referenceValue, String coefficient) { - init(min, max, referenceValue, coefficient); - setPercentageTypeFactor(StringUtils.isNotBlank(coefficient)); -} - -@Override -public boolean isFactorValid() { - boolean valid = false; - - /*try { - if (continueSelected) { - if (percentageTypeFactor) { - Double coefficient = Double.parseDouble(coefficientField.getText().trim()); - valid = coefficient != null; - } - else { - valid = true; - } - } - else { - valid = true; - } - } - catch (NumberFormatException eee) { - if (log.isWarnEnabled()) { - log.warn("Double parse error", eee); - } - }*/ - - return valid; -} - -protected void $afterCompleteSetup() { - addPropertyChangeListener(PROPERTY_PERCENTAGE_TYPE_FACTOR, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if ((Boolean)evt.getNewValue()) { - ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "percentageType"); - } else { - ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "minMaxType"); - } - } - }); -} - -@Override -public void initWithDomain(ContinuousDomain domain) { - -} - ]]></script> - <JPanel id="content"> - <Table constraints='BorderLayout.CENTER'> - <row> - <cell fill='horizontal' weightx='1'> - <JRadioButton text="isisfish.sensitivity.continuouspercentagetype" - onActionPerformed="setPercentageTypeFactor(true)" - selected="{isPercentageTypeFactor()}"/> - </cell> - <cell fill='horizontal' weightx='1'> - <JRadioButton text="isisfish.sensitivity.continuousminmaxtype" - onActionPerformed="setPercentageTypeFactor(false)" - selected="{!isPercentageTypeFactor()}"/> - </cell> - </row> - <row> - <cell fill='both' weightx='1' weighty='1' columns="2"> - <JPanel layout="{new CardLayout()}" id="hidablePanel"> - <Table constraints='"percentageType"' border='{BorderFactory.createTitledBorder("")}'> - <row> - <cell fill='horizontal' columns="2"> - <JLabel text='isisfish.sensitivity.referencevalue'/> - </cell> - </row> - <row> - <cell fill='both' weighty='1' columns="2"> - <MatrixPanelEditor id='referenceValuePanel'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.coefficient'/> - </cell> - <cell fill='horizontal' weightx='1'> - <JTextField id='coefficientField'/> - </cell> - </row> - </Table> - - <Table constraints='"minMaxType"' border='{BorderFactory.createTitledBorder("")}'> - <row> - <cell fill='both' weightx='1' weighty='1'> - <JTabbedPane> - <tab title="isisfish.sensitivity.firstValue"> - <MatrixPanelEditor id='minValuePanel'/> - </tab> - <tab title="isisfish.sensitivity.lastValue"> - <MatrixPanelEditor id='maxValuePanel'/> - </tab> - </JTabbedPane> - </cell> - </row> - </Table> - </JPanel> - </cell> - </row> - </Table> - </JPanel> -</ContinuousPanel> \ No newline at end of file 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 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -65,7 +65,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.types.Month; @@ -181,22 +180,11 @@ factorWizardUI.setFactorPath(factorPath); factorWizardUI.getComment().setText(factor.getComment()); - // dans le cas d'un facteur equation - // il faut enlever la varible du nom - // sinon, à la sauvegarde elle sera reajoutée - if (domain instanceof EquationContinuousDomain) { - EquationContinuousDomain equationDomain = (EquationContinuousDomain)domain; - String suffix = equationDomain.getVariableName(); - factorName = StringUtils.removeEnd(factorName, "." + suffix); - // can be called _xxx after char replacement for R - factorName = StringUtils.removeEnd(factorName, "_" + suffix); - } - if (domain instanceof ContinuousDomain) { ContinuousDomain cDomain = (ContinuousDomain) domain; ContinuousPanel comp = getNewContinuousComponent(factorWizardUI, factor.getPath()); - comp.initWithDomain(cDomain); + comp.initWithFactor(factor); factorWizardUI.getContinuousPanelContainer().add(comp, BorderLayout.CENTER); factorWizardUI.getContinueRadio().setSelected(true); @@ -794,10 +782,13 @@ // Save equation bean.update(); topiaContext.commitTransaction(); - - List<EquationContinuousDomain> domains = equationPanel.getDomains(); - for (EquationContinuousDomain domain : domains) { - action.addContinuousEquationFactor(name, comment, path, domain, exist); + + List<Factor> factors = equationPanel.getFactors(); + for (Factor factor : factors) { + factor.setName(name); + factor.setComment(comment); + factor.setPath(path); + action.addContinuousEquationFactor(factor, exist); } } catch (Exception ex) { if (log.isErrorEnabled()) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -94,7 +94,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.ui.SimulationUI; @@ -957,17 +956,14 @@ addFactor(f); } - public void addContinuousEquationFactor(String name, String comment, String path, - EquationContinuousDomain domain, boolean exist) { + public void addContinuousEquationFactor(Factor f, boolean exist) { // factor name need to be composed - Factor f = new Factor(name + "." + domain.getVariableName()); - f.setDomain(domain); - f.setComment(comment); - // don't modify path, need to be valid identifier - //f.setPath(path + domain.getVariableName()); - f.setPath(path); + //Factor f = new Factor(name + "." + domain.getVariableName()); + //f.setDomain(domain); + //f.setComment(comment); + //f.setPath(path); if (exist) { - removeFactor(path); + removeFactor(f.getPath()); } addFactor(f); } 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 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2012-03-14 15:56:49 UTC (rev 3654) @@ -713,11 +713,14 @@ isisfish.populationMigration.selectSeason=Select a season isisfish.populationMigration.title=Migration isisfish.populationMigration.useEquation=Use equation +isisfish.populationMigrationEmigration.coefficient= isisfish.populationMigrationEmigration.departureZone=Departure Zone isisfish.populationMigrationEmigration.title=Population emigration isisfish.populationMigrationImmigration.arrivalZone=Arrival Zone +isisfish.populationMigrationImmigration.coefficient= isisfish.populationMigrationImmigration.title=Population immigration isisfish.populationMigrationMigration.arrivalZone=Arrival zone +isisfish.populationMigrationMigration.coefficient= isisfish.populationMigrationMigration.departureZone=Departure zone isisfish.populationMigrationMigration.title=Population migration isisfish.populationPrice.title=Price 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 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-03-14 15:56:49 UTC (rev 3654) @@ -713,11 +713,14 @@ isisfish.populationMigration.selectSeason=Sélectionnez une saison isisfish.populationMigration.title=Migration isisfish.populationMigration.useEquation=Utiliser l'équation +isisfish.populationMigrationEmigration.coefficient= isisfish.populationMigrationEmigration.departureZone=Zone de départ isisfish.populationMigrationEmigration.title=Emmigration isisfish.populationMigrationImmigration.arrivalZone=Zone d'arrivée +isisfish.populationMigrationImmigration.coefficient= isisfish.populationMigrationImmigration.title=Immigration isisfish.populationMigrationMigration.arrivalZone=Zone d'arrivée +isisfish.populationMigrationMigration.coefficient= isisfish.populationMigrationMigration.departureZone=Zone de départ isisfish.populationMigrationMigration.title=Migration de population isisfish.populationPrice.title=Prix Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -71,7 +71,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.types.TimeStep; @@ -171,7 +170,8 @@ // factor 5 Factor factorEquationContinuous = new Factor("factor 5 (EquationContinuous)"); - EquationContinuousDomain domain5 = new EquationContinuousDomain(Distribution.QUNIFPC); + factorEquationContinuous.setEquationVariableName("Ktemp"); + ContinuousDomain domain5 = new ContinuousDomain(Distribution.QUNIFPC); domain5.addDistributionParam("reference", 0.1); domain5.addDistributionParam("coefficient", 45.0); factorEquationContinuous.setDomain(domain5); @@ -457,10 +457,10 @@ // factor x5 Factor factorEquationContinuous = new Factor("factor x5"); - EquationContinuousDomain domain5 = new EquationContinuousDomain(Distribution.QUNIFMM); + ContinuousDomain domain5 = new ContinuousDomain(Distribution.QUNIFMM); domain5.addDistributionParam("min", 40.0); domain5.addDistributionParam("max", 50.0); - domain5.setVariableName("Lx1"); + factorEquationContinuous.setEquationVariableName("Lx1"); factorEquationContinuous.setDomain(domain5); factorEquationContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength"); Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -67,7 +67,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysisRandomMock; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; @@ -332,10 +331,10 @@ // factor Factor factorEquation = new Factor("test.equation.name.K1"); - EquationContinuousDomain domain1 = new EquationContinuousDomain(Distribution.QUNIFPC); + ContinuousDomain domain1 = new ContinuousDomain(Distribution.QUNIFPC); domain1.addDistributionParam("reference", 10.0); domain1.addDistributionParam("coefficient", 0.1); - domain1.setVariableName("K1"); + factorEquation.setEquationVariableName("K1"); factorEquation.setDomain(domain1); factorEquation.setPath("fr.ifremer.equation1#testFactorPreScriptEquation"); factorEquation.setValueForIdentifier(0.4); Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2012-03-14 14:13:51 UTC (rev 3653) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2012-03-14 15:56:49 UTC (rev 3654) @@ -39,7 +39,6 @@ import fr.ifremer.isisfish.rule.RuleMock; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; /** @@ -267,10 +266,10 @@ // factor Factor factor = new Factor("testequation"); - EquationContinuousDomain domain = new EquationContinuousDomain(Distribution.QUNIFPC); + ContinuousDomain domain = new ContinuousDomain(Distribution.QUNIFPC); domain.addDistributionParam("reference", 3.0); domain.addDistributionParam("coefficient", 0.1); - domain.setVariableName("Linf"); + factor.setEquationVariableName("Linf"); factor.setDomain(domain); factor.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor.setValueForIdentifier(0.1); @@ -281,10 +280,10 @@ // factor 2 Factor factor2 = new Factor("testequation"); - EquationContinuousDomain domain2 = new EquationContinuousDomain(Distribution.QUNIFPC); + ContinuousDomain domain2 = new ContinuousDomain(Distribution.QUNIFPC); domain2.addDistributionParam("reference", 3.0); domain2.addDistributionParam("coefficient", 0.1); - domain2.setVariableName("Linf"); + factor2.setEquationVariableName("Linf"); factor2.setDomain(domain2); factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor2.setValueForIdentifier(0.1); @@ -295,10 +294,10 @@ // factor 3 Factor factor3 = new Factor("testequation"); - EquationContinuousDomain domain3 = new EquationContinuousDomain(Distribution.QUNIFPC); + ContinuousDomain domain3 = new ContinuousDomain(Distribution.QUNIFPC); domain3.addDistributionParam("reference", 3.0); domain3.addDistributionParam("coefficient", 0.1); - domain3.setVariableName("Linf"); + factor3.setEquationVariableName("Linf"); factor3.setDomain(domain3); factor3.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor3.setValueForIdentifier(0.2); @@ -309,10 +308,10 @@ // factor 4 Factor factor4 = new Factor("testequation"); - EquationContinuousDomain domain4 = new EquationContinuousDomain(Distribution.QUNIFPC); + ContinuousDomain domain4 = new ContinuousDomain(Distribution.QUNIFPC); domain4.addDistributionParam("reference", 3.0); domain4.addDistributionParam("coefficient", 0.05); - domain4.setVariableName("Linf"); + factor4.setEquationVariableName("Linf"); factor4.setDomain(domain4); factor4.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor4.setValueForIdentifier(0.1);