Author: chatellier Date: 2009-03-09 16:52:41 +0000 (Mon, 09 Mar 2009) New Revision: 1922 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/ContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DiscreteDomain.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java Log: Add new domain implementation. Move domain to "domain" package. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -20,9 +20,9 @@ import java.io.Serializable; -import fr.ifremer.isisfish.simulator.sensitivity.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; /** Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/ContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/ContinuousDomain.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/ContinuousDomain.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -1,132 +0,0 @@ -/* *##% - * Copyright (C) 2009 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.simulator.sensitivity; - -import java.io.Serializable; - -import org.apache.commons.lang.builder.ToStringBuilder; - -import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; - -/** - * Domaine continu. - * - * Composé d'un borne min et max. - * - * @param <E> type des valeurs gérées par le domaine - * - * @author chatellier - * @version $Revision: 1.0 $ - * - * Last update : $Date: 24 févr. 2009 $ - * By : $Author: chatellier $ - */ -public class ContinuousDomain<E extends Serializable> implements Domain<E> { - - /** serialVersionUID. */ - private static final long serialVersionUID = -2037768174807839046L; - - /** Borne inférieure */ - protected E minBound; - - /** Borne supérieure */ - protected E maxBound; - - /** - * Empty constructor. - */ - public ContinuousDomain() { - - } - - /** - * Constructor with bounds. - * - * @param minBound min bound - * @param maxBound max bound - */ - public ContinuousDomain(E minBound, E maxBound) { - this(); - this.minBound = minBound; - this.maxBound = maxBound; - } - - /** - * @return the minBound - */ - public E getMinBound() { - return minBound; - } - - /** - * @param minBound the minBound to set - */ - public void setMinBound(E minBound) { - this.minBound = minBound; - } - - /** - * @return the maxBound - */ - public E getMaxBound() { - return maxBound; - } - - /** - * @param maxBound the maxBound to set - */ - public void setMaxBound(E maxBound) { - this.maxBound = maxBound; - } - - /** - * {@inheritDoc}. - * - * In continuous domain, just return identifier - */ - public E getValueForIdentifier(Serializable identifier) { - // FIXME test cast - return (E)identifier; - } - - /** - * Accept a new visitor. - * - * @param visitor - */ - public void accept(DomainVisitor visitor) { - visitor.start(this); - visitor.visit(this, "min", minBound); - visitor.visit(this, "max", maxBound); - visitor.end(this); - } - - /* - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - - ToStringBuilder builder = new ToStringBuilder(this); - builder.append(minBound); - builder.append(minBound); - - return builder.toString(); - } -} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.builder.ToStringBuilder; - import fr.ifremer.isisfish.simulator.sensitivity.visitor.DesignPlanVisitor; /** @@ -81,16 +79,4 @@ } visitor.end(this); } - - /* - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - - ToStringBuilder builder = new ToStringBuilder(this); - builder.append(factors); - - return builder.toString(); - } } Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DiscreteDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DiscreteDomain.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DiscreteDomain.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -1,118 +0,0 @@ -/* *##% - * Copyright (C) 2009 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.simulator.sensitivity; - -import java.io.Serializable; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; - -import org.apache.commons.lang.builder.ToStringBuilder; - -import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; - -/** - * Domain discret. - * - * Ensemble de valeurs. - * - * @param <E> type des valeurs gérées par le domaine - * - * @author chatellier - * @version $Revision: 1.0 $ - * - * Last update : $Date: 24 févr. 2009 $ - * By : $Author: chatellier $ - */ -public class DiscreteDomain<E extends Serializable> implements Domain<E> { - - /** serialVersionUID. */ - private static final long serialVersionUID = -192647757737396585L; - - /** - * Value for this domain. - * - * Each "E" values is identified by a Serializable identifier. - */ - protected SortedMap<Serializable, E> values; - - /** - * Contructor. - */ - public DiscreteDomain() { - values = new TreeMap<Serializable, E>(); - } - - /** - * Get domaine values. - * - * @return the values - */ - public SortedMap<Serializable, E> getValues() { - return values; - } - - /** - * Set domain values. - * - * @param values the values - */ - public void setValues(SortedMap<Serializable, E> values) { - this.values = values; - } - - /** - * {@inheritDoc}. - * - * @throws IllegalArgumentException if identifier is not a valid key - */ - public E getValueForIdentifier(Serializable identifier) throws IllegalArgumentException{ - - if( values == null || !values.containsKey(identifier)) { - throw new IllegalArgumentException("Can't get value for identifier " + identifier); - } - - return values.get(identifier); - } - - /** - * Accept a new visitor. - * - * @param visitor - */ - public void accept(DomainVisitor visitor) { - visitor.start(this); - for(Map.Entry<Serializable, E> value : values.entrySet()) { - visitor.visit(this, value.getKey(), value.getValue()); - } - visitor.end(this); - } - - /* - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - - ToStringBuilder builder = new ToStringBuilder(this); - builder.append(values); - - return builder.toString(); - } -} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -20,6 +20,8 @@ import java.io.Serializable; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -20,8 +20,8 @@ import java.io.Serializable; -import org.apache.commons.lang.builder.ToStringBuilder; - +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor; /** @@ -207,19 +207,4 @@ return f; } - - /** - * {@inheritDoc} - */ - @Override - public String toString() { - - ToStringBuilder builder = new ToStringBuilder(this); - builder.append(name); - builder.append(domain); - builder.append(value); - builder.append(path); - - return builder.toString(); - } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.builder.ToStringBuilder; - /** * Scenario d'execution de simulation. * @@ -86,16 +84,4 @@ public void setFactors(List<Factor<? extends Serializable>> factors) { this.factors = factors; } - - /* - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - - ToStringBuilder builder = new ToStringBuilder(this); - builder.append(factors); - - return builder.toString(); - } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.builder.ToStringBuilder; - /** * Ensemble de {@link Scenario}. * @@ -66,16 +64,4 @@ public void setScenarios(List<Scenario> scenarios) { this.scenarios = scenarios; } - - /* - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - - ToStringBuilder builder = new ToStringBuilder(this); - builder.append(scenarios); - - return builder.toString(); - } } Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java (from rev 1915, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/ContinuousDomain.java) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -0,0 +1,133 @@ +/* *##% + * Copyright (C) 2009 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.simulator.sensitivity.domain; + +import java.io.Serializable; + +import org.apache.commons.lang.builder.ToStringBuilder; + +import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; + +/** + * Domaine continu. + * + * Composé d'un borne min et max. + * + * @param <E> type des valeurs gérées par le domaine + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 24 févr. 2009 $ + * By : $Author: chatellier $ + */ +public class ContinuousDomain<E extends Serializable> implements Domain<E> { + + /** serialVersionUID. */ + private static final long serialVersionUID = -2037768174807839046L; + + /** Borne inférieure */ + protected E minBound; + + /** Borne supérieure */ + protected E maxBound; + + /** + * Empty constructor. + */ + public ContinuousDomain() { + + } + + /** + * Constructor with bounds. + * + * @param minBound min bound + * @param maxBound max bound + */ + public ContinuousDomain(E minBound, E maxBound) { + this(); + this.minBound = minBound; + this.maxBound = maxBound; + } + + /** + * @return the minBound + */ + public E getMinBound() { + return minBound; + } + + /** + * @param minBound the minBound to set + */ + public void setMinBound(E minBound) { + this.minBound = minBound; + } + + /** + * @return the maxBound + */ + public E getMaxBound() { + return maxBound; + } + + /** + * @param maxBound the maxBound to set + */ + public void setMaxBound(E maxBound) { + this.maxBound = maxBound; + } + + /** + * {@inheritDoc}. + * + * In continuous domain, just return identifier + */ + public E getValueForIdentifier(Serializable identifier) { + // FIXME test cast + return (E)identifier; + } + + /** + * Accept a new visitor. + * + * @param visitor + */ + public void accept(DomainVisitor visitor) { + visitor.start(this); + visitor.visit(this, "min", minBound); + visitor.visit(this, "max", maxBound); + visitor.end(this); + } + + /* + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + + ToStringBuilder builder = new ToStringBuilder(this); + builder.append(minBound); + builder.append(minBound); + + return builder.toString(); + } +} Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java (from rev 1915, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DiscreteDomain.java) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -0,0 +1,107 @@ +/* *##% + * Copyright (C) 2009 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.simulator.sensitivity.domain; + +import java.io.Serializable; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +import org.apache.commons.lang.builder.ToStringBuilder; + +import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; + +/** + * Domain discret. + * + * Ensemble de valeurs. + * + * @param <E> type des valeurs gérées par le domaine + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 24 févr. 2009 $ + * By : $Author: chatellier $ + */ +public class DiscreteDomain<E extends Serializable> implements Domain<E> { + + /** serialVersionUID. */ + private static final long serialVersionUID = -192647757737396585L; + + /** + * Value for this domain. + * + * Each "E" values is identified by a Serializable identifier. + */ + protected SortedMap<Serializable, E> values; + + /** + * Contructor. + */ + public DiscreteDomain() { + values = new TreeMap<Serializable, E>(); + } + + /** + * Get domaine values. + * + * @return the values + */ + public SortedMap<Serializable, E> getValues() { + return values; + } + + /** + * Set domain values. + * + * @param values the values + */ + public void setValues(SortedMap<Serializable, E> values) { + this.values = values; + } + + /** + * {@inheritDoc}. + * + * @throws IllegalArgumentException if identifier is not a valid key + */ + public E getValueForIdentifier(Serializable identifier) throws IllegalArgumentException{ + + if( values == null || !values.containsKey(identifier)) { + throw new IllegalArgumentException("Can't get value for identifier " + identifier); + } + + return values.get(identifier); + } + + /** + * Accept a new visitor. + * + * @param visitor + */ + public void accept(DomainVisitor visitor) { + visitor.start(this); + for(Map.Entry<Serializable, E> value : values.entrySet()) { + visitor.visit(this, value.getKey(), value.getValue()); + } + visitor.end(this); + } +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -0,0 +1,101 @@ +/* *##% + * Copyright (C) 2009 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.simulator.sensitivity.domain; + +import java.io.Serializable; + +/** + * Domaine continu portant sur variable pouvant prendre diférente + * valeur par rapport à une valeur initiale. + * + * Composé d'un borne min et max et d'un opération. + * + * @param <E> type des valeurs gérées par le domaine + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 24 févr. 2009 $ + * By : $Author: chatellier $ + */ +public class EquationContinuousDomain<E extends Serializable> extends ContinuousDomain<E> { + + /** serialVersionUID. */ + private static final long serialVersionUID = -2037768174807839046L; + + /** Variable name (must be java valid identifier) */ + protected String variableName; + + /** Operation. (=,+,-,/) */ + protected String operator; + + /** + * Empty constructor. + */ + public EquationContinuousDomain() { + + } + + /** + * 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; + } + + /** + * Get operator. + * + * @return the operator + */ + public String getOperator() { + return operator; + } + + /** + * Set operator. + * + * @param operator the operator to set + */ + public void setOperator(String operator) { + this.operator = operator; + } + + /** + * {@inheritDoc}. + * + * In equation continuous domain, value appear in + * continuous domain values only. + * Here : return identifier. + */ + public E getValueForIdentifier(Serializable identifier) { + return (E)identifier; + } +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -0,0 +1,100 @@ +/* *##% + * Copyright (C) 2009 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.simulator.sensitivity.domain; + +import java.io.Serializable; + +import org.codelutin.math.matrix.MatrixND; + +/** + * Domaine continu portant sur une matrice. + * + * Composé d'un borne min et max et d'une matrice. + * + * @param <E> type des valeurs gérées par le domaine + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 24 févr. 2009 $ + * By : $Author: chatellier $ + */ +public class MatrixContinuousDomain<E extends Serializable> extends ContinuousDomain<E> { + + /** serialVersionUID. */ + private static final long serialVersionUID = -2037768174807839046L; + + /** Matrix */ + protected MatrixND matrix; + + /** Operation. (=,+,-,/) */ + protected String operator; + + /** + * Empty constructor. + */ + public MatrixContinuousDomain() { + + } + + /** + * Get matrix. + * + * @return the matrix + */ + public MatrixND getMatrix() { + return matrix; + } + + /** + * Set matrix. + * + * @param matrix the matrix to set + */ + public void setMatrix(MatrixND matrix) { + this.matrix = matrix; + } + + /** + * Get operator. + * + * @return the operator + */ + public String getOperator() { + return operator; + } + + /** + * Set operator. + * + * @param operator the operator to set + */ + public void setOperator(String operator) { + this.operator = operator; + } + + /** + * {@inheritDoc}. + * + * In continuous domain, just return identifier + */ + public E getValueForIdentifier(Serializable identifier) { + return (E)identifier; + } +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -0,0 +1,5 @@ +/** + * Ensembles des implémentation de domaines. + */ +package fr.ifremer.isisfish.simulator.sensitivity.domain; + Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -24,10 +24,10 @@ import org.apache.commons.logging.LogFactory; import org.junit.Test; -import fr.ifremer.isisfish.simulator.sensitivity.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; -import fr.ifremer.isisfish.simulator.sensitivity.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; /** * TODO COMMENT ME. Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -48,10 +48,10 @@ import fr.ifremer.isisfish.entities.PopulationSeasonInfoDAO; import fr.ifremer.isisfish.entities.VesselType; import fr.ifremer.isisfish.entities.VesselTypeDAO; -import fr.ifremer.isisfish.simulator.sensitivity.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.Scenario; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.util.ConverterUtil; import freemarker.template.Configuration; import freemarker.template.Template; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -36,12 +36,12 @@ import fr.ifremer.isisfish.entities.StrategyImpl; import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.simulator.sensitivity.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; -import fr.ifremer.isisfish.simulator.sensitivity.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculatorRandomMock; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; /** * Test for {@link SimulationService}. Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -25,9 +25,9 @@ import org.junit.Assert; import org.junit.Test; -import fr.ifremer.isisfish.simulator.sensitivity.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; /** * Factors test. Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -29,11 +29,11 @@ import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Domain; -import fr.ifremer.isisfish.simulator.sensitivity.DiscreteDomain; -import fr.ifremer.isisfish.simulator.sensitivity.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; import fr.ifremer.isisfish.simulator.sensitivity.Scenario; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; /** * Implementation of SensitivityCalculator that take Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-03-09 16:50:24 UTC (rev 1921) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-03-09 16:52:41 UTC (rev 1922) @@ -38,9 +38,9 @@ import org.codelutin.math.matrix.MatrixND; import org.junit.Test; -import fr.ifremer.isisfish.simulator.sensitivity.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; /** * Sensitivity tree model test.