Author: chatellier Date: 2010-01-28 09:47:57 +0000 (Thu, 28 Jan 2010) New Revision: 2953 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java Log: Domain values are no serializable anymore (only keys) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -52,7 +52,7 @@ * {@inheritDoc} */ @Override - public <E extends Serializable, F extends Serializable> void visit(Domain<E,F> domain, + public <E, F extends Serializable> void visit(Domain<E,F> domain, F label, E value) { } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -53,7 +53,7 @@ * {@inheritDoc} */ @Override - public <E extends Serializable, F extends Serializable> void visit(Domain<E,F> domain, + public <E, F extends Serializable> void visit(Domain<E,F> domain, F label, E value) { xmlBuffer.append("<value>" + value + "</value>"); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,8 +25,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.visitor.DesignPlanVisitor; /** - * Design plan contenant toutes les - * valeur de facteur possible. + * Design plan contenant toutes les valeurs de facteurs possible. * * @author chatellier * @version $Revision: 1.0 $ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -46,7 +46,7 @@ * Last update : $Date: 24 févr. 2009 $ * By : $Author: chatellier $ */ -public interface Domain<E extends Serializable, F extends Serializable> extends Serializable { +public interface Domain<E, F extends Serializable> extends Serializable { /** * Return value associated to identifier. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -38,7 +38,7 @@ * * Last update : $Date: 19 févr. 2009 $ By : $Author: chatellier $ */ -public class Factor<E extends Serializable, F extends Serializable> implements Serializable, Cloneable { +public class Factor<E, F extends Serializable> implements Serializable, Cloneable { /** serialVersionUID. */ private static final long serialVersionUID = 1643804268013964453L; @@ -59,8 +59,11 @@ * Ensemble des valeurs possibles a prendre en compte. La clé est un label * qui permet d'identifier la valeur. * - * Le domain peut etre : - discret : i.e un ensemble de valeurs - continu : - * i.e, une borne min, max + * Le domain peut etre : + * <ul> + * <li>discret : i.e un ensemble de valeurs</li> + * <li>continu : i.e, une borne min, max</li> + * </ul> * * @see ContinuousDomain * @see DiscreteDomain Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,7 +21,6 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import java.util.Map; import fr.ifremer.isisfish.simulator.sensitivity.visitor.ScenarioVisitor; @@ -63,8 +62,7 @@ */ public boolean addFactor(Factor factor) { - Factor factorCopy = (Factor) factor - .clone(); + Factor factorCopy = (Factor) factor.clone(); boolean success = factors.add(factorCopy); return success; @@ -87,7 +85,7 @@ public void setFactors(List<Factor> factors) { this.factors = factors; } - + /** * Accept a new visitor. * @@ -95,7 +93,7 @@ */ public void accept(ScenarioVisitor visitor) { visitor.start(this); - for(Factor factor : factors) { + for (Factor factor : factors) { visitor.visit(this, factor); } visitor.end(this); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -26,7 +26,7 @@ /** * Domaine continu. * - * Composé d'un borne min et max. + * Composé d'une borne min et max et d'une cardinalité. * * @param <E> type des valeurs gérées par le domaine * @param <F> type des labels @@ -37,7 +37,7 @@ * Last update : $Date: 24 févr. 2009 $ * By : $Author: chatellier $ */ -public class ContinuousDomain<E extends Serializable, F extends Serializable> implements Domain<E,F> { +public class ContinuousDomain<E, F extends Serializable> implements Domain<E, F> { /** serialVersionUID. */ private static final long serialVersionUID = -2037768174807839046L; @@ -136,7 +136,8 @@ this.cardinality = cardinality; } - public ContinuousDomain<E,F> clone(){ + @Override + public ContinuousDomain<E,F> clone() { ContinuousDomain<E,F> cloned = new ContinuousDomain<E,F>(); cloned.setCardinality(this.cardinality); cloned.setMaxBound(this.maxBound); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -40,7 +40,7 @@ * Last update : $Date: 24 févr. 2009 $ * By : $Author: chatellier $ */ -public class DiscreteDomain<E extends Serializable, F extends Serializable> implements Domain<E,F> { +public class DiscreteDomain<E, F extends Serializable> implements Domain<E, F> { /** serialVersionUID. */ private static final long serialVersionUID = -192647757737396585L; @@ -48,10 +48,10 @@ /** * Value for this domain. * - * Each "E" values is identified by a Serializable identifier. + * Each "E" values is identified by a {@link Serializable} identifier. */ protected SortedMap<F, E> values; - + /** * Constructor. */ @@ -82,15 +82,17 @@ * * @throws IllegalArgumentException if identifier is not a valid key */ - public E getValueForIdentifier(F identifier) throws IllegalArgumentException{ - - if( values == null || !values.containsKey(identifier)) { - throw new IllegalArgumentException("Can't get value for identifier " + identifier); + public E getValueForIdentifier(F 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. * @@ -98,16 +100,16 @@ */ public void accept(DomainVisitor visitor) { visitor.start(this); - for(Map.Entry<F, E> value : values.entrySet()) { + for (Map.Entry<F, E> value : values.entrySet()) { visitor.visit(this, value.getKey(), value.getValue()); } visitor.end(this); } - - public DiscreteDomain<E,F> clone(){ - DiscreteDomain<E,F> cloned = new DiscreteDomain<E,F>(); + + @Override + public DiscreteDomain<E, F> clone() { + DiscreteDomain<E, F> cloned = new DiscreteDomain<E, F>(); cloned.setValues(this.values); return cloned; - } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.simulator.sensitivity.domain; -import java.io.Serializable; - import org.nuiton.math.matrix.MapFunction; import org.nuiton.math.matrix.MatrixND; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.simulator.sensitivity.visitor; -import java.io.Serializable; - import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Factor; @@ -47,7 +45,7 @@ * @param designPlan design plan * @param factor factor */ - void visit(DesignPlan designPlan, Factor factor); + void visit(DesignPlan designPlan, Factor<?, ?> factor); /** * End. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -38,22 +38,24 @@ * * @param domain domain */ - void start(Domain<? extends Serializable, ? extends Serializable> domain); + void start(Domain<?, ?> domain); /** * Visit domain value or property. * * @param <E> domain element type + * @param <F> label element type + * * @param domain domain * @param label value label or property name * @param value value */ - <E extends Serializable, F extends Serializable> void visit(Domain<E,F> domain, F label, E value); + <E, F extends Serializable> void visit(Domain<E, F> domain, F label, E value); /** * End. * * @param domain domain */ - void end(Domain<? extends Serializable, ? extends Serializable> domain); + void end(Domain<?, ?> domain); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -39,7 +39,7 @@ * * @param factor factor */ - void start(Factor factor); + void start(Factor<?, ?> factor); /** * Visit domain. @@ -47,7 +47,7 @@ * @param factor factor * @param domain domain */ - void visit(Factor factor, Domain domain); + <E, F extends Serializable> void visit(Factor<E, F> factor, Domain<E, F> domain); /** * End.