Author: chatellier Date: 2009-03-02 11:00:13 +0000 (Mon, 02 Mar 2009) New Revision: 1897 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java Log: Ajout d'une method sur un scenario pour ajouter une copie d'un facteur (#clone) 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-02 09:38:49 UTC (rev 1896) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2009-03-02 11:00:13 UTC (rev 1897) @@ -44,7 +44,7 @@ * Chaque facteur a la {@link Factor#value} a prendre en compte pour la simulation. */ protected List<Factor<? extends Serializable>> factors; - + /** * Constructeur. */ @@ -53,6 +53,23 @@ } /** + * Add factor. + * + * Use {@link Factor#clone()} to copy a new factor instance. + * + * @param factor to copy + * @return add success + */ + public boolean addFactor(Factor<? extends Serializable> factor) { + + Factor<? extends Serializable> factorCopy = (Factor<? extends Serializable>) factor + .clone(); + boolean success = factors.add(factorCopy); + return success; + + } + + /** * Get simulation Factors. * * @return the simulations @@ -69,16 +86,16 @@ 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/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-03-02 09:38:49 UTC (rev 1896) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-03-02 11:00:13 UTC (rev 1897) @@ -23,9 +23,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.j2r.REngine; -import org.codelutin.j2r.RException; -import org.codelutin.j2r.RProxy; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTest; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; @@ -73,20 +70,17 @@ ContinuousDomain<? extends Serializable> cDomain = (ContinuousDomain<? extends Serializable>)domain; Double minValue = (Double)cDomain.getMinBound(); Double maxValue = (Double)cDomain.getMaxBound(); - - Factor<? extends Serializable> newFactor = (Factor<? extends Serializable>)factor.clone(); - newFactor.setValueForIdentifier(minValue); - scenario.getFactors().add(newFactor); - newFactor = (Factor<? extends Serializable>)factor.clone(); - newFactor.setValueForIdentifier(maxValue); - scenario.getFactors().add(newFactor); + + factor.setValueForIdentifier(minValue); + scenario.addFactor(factor); + factor.setValueForIdentifier(maxValue); + scenario.addFactor(factor); } else { DiscreteDomain<? extends Serializable> dDomain = (DiscreteDomain<? extends Serializable>)domain; for(Serializable sValue : dDomain.getValues().keySet()) { - Factor<? extends Serializable> newFactor = (Factor<? extends Serializable>)factor.clone(); - newFactor.setValueForIdentifier(sValue); - scenario.getFactors().add(newFactor); + factor.setValueForIdentifier(sValue); + scenario.addFactor(factor); } }