Author: chatellier Date: 2009-03-11 11:26:00 +0000 (Wed, 11 Mar 2009) New Revision: 1936 Modified: 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 Log: Update domains (visitors...) Modified: 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/ContinuousDomain.java 2009-03-11 11:13:55 UTC (rev 1935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2009-03-11 11:26:00 UTC (rev 1936) @@ -29,14 +29,14 @@ * Domaine continu. * * Composé d'un borne min et max. + * + * @param <E> type des valeurs gérées par le domaine * - * @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 $ + * Last update : $Date: 24 févr. 2009 $ + * By : $Author: chatellier $ */ public class ContinuousDomain<E extends Serializable> implements Domain<E> { @@ -62,33 +62,16 @@ /** * Constructor with bounds. * - * @param minBound - * min bound - * @param maxBound - * max bound + * @param minBound min bound + * @param maxBound max bound */ public ContinuousDomain(E minBound, E maxBound) { this(); this.minBound = minBound; this.maxBound = maxBound; } - + /** - * Constructor with bounds and cardinality. - * - * @param minBound - * min bound - * @param maxBound - * max bound - */ - public ContinuousDomain(E minBound, E maxBound, int cardinality) { - this(); - this.minBound = minBound; - this.maxBound = maxBound; - this.cardinality = cardinality; - } - - /** * @return the minBound */ public E getMinBound() { @@ -96,8 +79,7 @@ } /** - * @param minBound - * the minBound to set + * @param minBound the minBound to set */ public void setMinBound(E minBound) { this.minBound = minBound; @@ -111,8 +93,7 @@ } /** - * @param maxBound - * the maxBound to set + * @param maxBound the maxBound to set */ public void setMaxBound(E maxBound) { this.maxBound = maxBound; @@ -125,7 +106,7 @@ */ public E getValueForIdentifier(Serializable identifier) { // FIXME test cast - return (E) identifier; + return (E)identifier; } /** @@ -135,24 +116,9 @@ */ 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(); - } - /** * Get cardinality * Modified: 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/DiscreteDomain.java 2009-03-11 11:13:55 UTC (rev 1935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2009-03-11 11:26:00 UTC (rev 1936) @@ -23,8 +23,6 @@ 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; Modified: 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 2009-03-11 11:13:55 UTC (rev 1935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-03-11 11:26:00 UTC (rev 1936) @@ -20,6 +20,8 @@ import java.io.Serializable; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; + /** * Domaine continu portant sur variable pouvant prendre diférente * valeur par rapport à une valeur initiale.