Author: jcouteau Date: 2009-03-10 09:07:53 +0000 (Tue, 10 Mar 2009) New Revision: 1927 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java Log: Add cardinality to ContinuousDomain 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-10 09:03:30 UTC (rev 1926) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2009-03-10 09:07:53 UTC (rev 1927) @@ -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> { @@ -49,6 +49,9 @@ /** Borne supérieure */ protected E maxBound; + /** Cardinality */ + protected int cardinality; + /** * Empty constructor. */ @@ -59,16 +62,33 @@ /** * 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() { @@ -76,7 +96,8 @@ } /** - * @param minBound the minBound to set + * @param minBound + * the minBound to set */ public void setMinBound(E minBound) { this.minBound = minBound; @@ -90,7 +111,8 @@ } /** - * @param maxBound the maxBound to set + * @param maxBound + * the maxBound to set */ public void setMaxBound(E maxBound) { this.maxBound = maxBound; @@ -103,7 +125,7 @@ */ public E getValueForIdentifier(Serializable identifier) { // FIXME test cast - return (E)identifier; + return (E) identifier; } /** @@ -117,17 +139,35 @@ 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 + * + * @return cardinality + */ + public int getCardinality() { + return cardinality; + } + + /** + * Set cardinality + * + * @param cardinality + */ + public void setCardinality(int cardinality) { + this.cardinality = cardinality; + } }