Author: echatellier Date: 2013-11-21 22:33:33 +0100 (Thu, 21 Nov 2013) New Revision: 3840 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3840 Log: Uncomment setValueForIdentifier to fix compilation Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -52,13 +52,13 @@ */ public interface Domain extends Serializable, Cloneable { - /* + /** * Return value associated to identifier. * * @param identifier * @return found value or <tt>null</tt> if not found - * - Object getValueForIdentifier(Object identifier);*/ + */ + Object getValueForIdentifier(Object identifier); /** * Accept a new visitor. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -200,15 +200,15 @@ this.value = value; } - /* + /** * Set value for label. * * @param valueIdentifier new value identifier to get - * + */ public void setValueForIdentifier(Object valueIdentifier) { identifier = valueIdentifier; value = domain.getValueForIdentifier(valueIdentifier); - }*/ + } /** * Get path. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -286,18 +286,18 @@ return "FactorGroup(" + name + ")"; } - /* + /** * Set value for label. * * @param valueIdentifier new value identifier to get - * + */ @Override public void setValueForIdentifier(Object valueIdentifier) { identifier = valueIdentifier; for (Factor factor : factors) { factor.setValueForIdentifier(valueIdentifier); } - }*/ + } /** * Get the factor value for displaying (for example in R). Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -162,22 +162,22 @@ distributionParameters.put(name, value); } - /*@Override + @Override public Object getValueForIdentifier(Object identifier) { Double result = 0d; - if (isPercentageType()) { + /*if (isPercentageType()) { // since 3.4.0.0, operator is always * result = ((Double)referenceValue + (((Double)referenceValue * coefficient) * ((2 * (Double)identifier - 1)))); } else { result = ((Double)identifier * ((Double)maxBound - (Double)minBound)) + (Double)minBound; - } + }*/ return result; - }*/ + } /** * Accept a new visitor. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -98,11 +98,11 @@ return values.size(); } - /* + /** * {@inheritDoc}. * * @throws IllegalArgumentException if identifier is not a valid key - * + */ public Object getValueForIdentifier(Object identifier) throws IllegalArgumentException { @@ -112,7 +112,7 @@ } return values.get(identifier); - }*/ + } /** * Accept a new visitor.