Author: jcouteau Date: 2011-06-07 08:02:39 +0000 (Tue, 07 Jun 2011) New Revision: 3352 Log: Add getDisplayedValue on factors for proper display in R Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-06 15:21:10 UTC (rev 3351) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-07 08:02:39 UTC (rev 3352) @@ -95,7 +95,7 @@ /** * Cette classe est responsable de conservation de toutes les simulations faites * ou a faire. Pour ajouter une nouvelle simulation on appelle une des méthodes - * {@link #submit}. + * {@code submit}. * <p> * Cette classe sert aussi de modele pour le moniteur de queue * <p> @@ -534,6 +534,8 @@ log.error("An error occurred while trying to get nominal value", ex); } } + } else { + factor.setNominalValue("NaN"); } } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-06-06 15:21:10 UTC (rev 3351) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-06-07 08:02:39 UTC (rev 3352) @@ -104,7 +104,7 @@ if (factor.getDomain() instanceof ContinuousDomain) { //Continu values, binf values, bsup values and discrete factors attributes - nominalValues += factor.getNominalValue(); + nominalValues += "\"" + factor.getNominalValue() + "\""; //Continu values continuValues += "TRUE"; 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 2011-06-06 15:21:10 UTC (rev 3351) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-06-07 08:02:39 UTC (rev 3352) @@ -25,6 +25,7 @@ package fr.ifremer.isisfish.simulator.sensitivity; +import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import java.io.Serializable; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; @@ -58,6 +59,11 @@ protected String comment; /** + * The identifier used to compute value. + */ + protected Object identifier; + + /** * Domaine du facteur. * * Ensemble des valeurs possibles a prendre en compte. La clé est un label @@ -167,6 +173,19 @@ } /** + * Get the factor value for displaying (for example in R). + * + * @return the value + */ + public Object getDisplayedValue() { + if (domain instanceof MatrixContinuousDomain) { + return identifier; + } else { + return getValue(); + } + } + + /** * Set value. * * Unused (or only for test ?). @@ -183,6 +202,7 @@ * @param valueIdentifier new value identifier to get */ public void setValueForIdentifier(Object valueIdentifier) { + identifier = valueIdentifier; value = domain.getValueForIdentifier(valueIdentifier); }