Author: chatellier Date: 2011-06-09 16:38:12 +0000 (Thu, 09 Jun 2011) New Revision: 3389 Log: Fix factor name for R Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-06-09 15:45:19 UTC (rev 3388) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-06-09 16:38:12 UTC (rev 3389) @@ -46,7 +46,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; import org.nuiton.util.MD5InputStream; -import org.nuiton.util.MD5OutputStream; import org.nuiton.util.StringUtil; import org.nuiton.util.ZipUtil; 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-09 15:45:19 UTC (rev 3388) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-09 16:38:12 UTC (rev 3389) @@ -522,6 +522,8 @@ * Explore design plan factor tree, and set factor nominal value * for each factor. * + * Also fix factor name for R (without special chars in name) + * * @param context opened database context * @param designPlan design plan */ @@ -545,6 +547,11 @@ } else { factor.setNominalValue("NaN"); } + + // also fix factor name for sensitivity calculator + String name = factor.getName(); + name = name.replaceAll("\\W", "_"); + factor.setName(name); } }